Allow 'today' as calendar range limit, and default to today in GET /day of empty...

[plomtask] / tests / test_days.py

diff --git a/tests/test_days.py b/tests/test_days.py
index 7daf7498214375914493cd1bab399326159772f0..e25eafdbf00856a85738d00a49907ebac2a7c642 100644 (file)
--- a/tests/test_days.py
+++ b/tests/test_days.py
@@ -6,7 +6,7 @@ from urllib.parse import urlencode
 from datetime import datetime
 from os import remove as remove_file
 from plomtask.http import TaskHandler, TaskServer
-from plomtask.days import Day
+from plomtask.days import Day, todays_date
 from plomtask.misc import HandledException
 from plomtask.db import DatabaseFile, DatabaseConnection
 
@@ -87,8 +87,11 @@ class TestsWithDB(TestCase):
                          [day1, day2, day3])
         self.assertEqual(Day.all(self.db_conn, ('', '2024-01-02')),
                          [day1, day2])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-03, 2024-01-01')),
+        self.assertEqual(Day.all(self.db_conn, ('2024-01-03', '2024-01-01')),
                          [])
+        today = Day(todays_date())
+        today.save(self.db_conn)
+        self.assertEqual(Day.all(self.db_conn, ('today', 'today')), [today])
 
     def test_Day_comment(self):
         """Test Day.by_date()."""
@@ -115,33 +118,33 @@ class TestsWithServer(TestsWithDB):
 
     def test_do_POST_day(self):
         """Test POST /day and its effect on the database."""
-        conn = HTTPConnection(*self.httpd.server_address)
+        http_conn = HTTPConnection(*self.httpd.server_address)
         form_data = {'comment': 'foo'}
         encoded_form_data = urlencode(form_data).encode('utf-8')
         headers = {'Content-Type': 'application/x-www-form-urlencoded',
                    'Content-Length': str(len(encoded_form_data))}
-        conn.request('POST', '/day?date=FOO',
-                     body=encoded_form_data, headers=headers)
-        self.assertEqual(conn.getresponse().status, 400)
+        http_conn.request('POST', '/day?date=FOO',
+                          body=encoded_form_data, headers=headers)
+        self.assertEqual(http_conn.getresponse().status, 400)
         self.assertEqual(Day.all(self.db_conn), [])
-        conn.request('POST', '/day?date=2024-01-01',
-                     body=encoded_form_data, headers=headers)
-        self.assertEqual(conn.getresponse().status, 302)
+        http_conn.request('POST', '/day?date=2024-01-01',
+                          body=encoded_form_data, headers=headers)
+        self.assertEqual(http_conn.getresponse().status, 302)
         retrieved = Day.by_date(self.db_conn, '2024-01-01')
         self.assertEqual(retrieved.comment, 'foo')
         self.assertEqual(Day.all(self.db_conn), [retrieved])
 
     def test_do_GET(self):
         """Test /day and /calendar response codes."""
-        conn = HTTPConnection(*self.httpd.server_address)
-        conn.request('GET', '/day')
-        self.assertEqual(conn.getresponse().status, 200)
-        conn.request('GET', '/day?date=3000-01-01')
-        self.assertEqual(conn.getresponse().status, 200)
-        conn.request('GET', '/day?date=FOO')
-        self.assertEqual(conn.getresponse().status, 400)
-        conn.request('GET', '/calendar')
-        self.assertEqual(conn.getresponse().status, 200)
+        http_conn = HTTPConnection(*self.httpd.server_address)
+        http_conn.request('GET', '/day')
+        self.assertEqual(http_conn.getresponse().status, 200)
+        http_conn.request('GET', '/day?date=3000-01-01')
+        self.assertEqual(http_conn.getresponse().status, 200)
+        http_conn.request('GET', '/day?date=FOO')
+        self.assertEqual(http_conn.getresponse().status, 400)
+        http_conn.request('GET', '/calendar')
+        self.assertEqual(http_conn.getresponse().status, 200)
 
     def tearDown(self):
         self.httpd.shutdown()