home · contact · privacy
Re-organize and extend POST/GET /day tests.
[plomtask] / tests / days.py
index 008fc1e658b66b7f05f78299d20ba48efd465d38..0b039bf9ae1212534ff01a02c73e302242f4f82a 100644 (file)
@@ -111,7 +111,7 @@ class TestsWithServer(TestCaseWithServer):
         return {'children': [], 'seen': False, 'todo': todo_id}
 
     @staticmethod
-    def get_day_dict(date: str) -> dict[str, object]:
+    def GET_day_dict(date: str) -> dict[str, object]:
         """Return JSON of GET /day to expect."""
         day: dict[str, object] = {'id': date, 'comment': '', 'todos': []}
         d: dict[str, object]
@@ -138,42 +138,6 @@ class TestsWithServer(TestCaseWithServer):
             redir_to = f'{target}&make_type={form_data["make_type"]}'
         self.check_post(form_data, target, status, redir_to)
 
-    def test_do_GET_day_basics(self) -> None:
-        """Test GET /day basics (no Todos)."""
-        # check undefined day
-        date = date_in_n_days(0)
-        expected = self.get_day_dict(date)
-        self.check_json_get('/day', expected)
-        # check "today", "yesterday", "tomorrow" days
-        self.check_json_get('/day?date=today', expected)
-        expected = self.get_day_dict(date_in_n_days(1))
-        self.check_json_get('/day?date=tomorrow', expected)
-        expected = self.get_day_dict(date_in_n_days(-1))
-        self.check_json_get('/day?date=yesterday', expected)
-        # check wrong day strings
-        self.check_get('/day?date=foo', 400)
-        self.check_get('/day?date=2024-02-30', 400)
-        # check defined day
-        date = '2024-01-01'
-        expected = self.get_day_dict(date)
-        assert isinstance(expected['_library'], dict)
-        self.check_json_get(f'/day?date={date}', expected)
-        # check saved day
-        post: dict[str, object] = {'day_comment': 'foo', 'make_type': ''}
-        self.post_day(f'date={date}', post)
-        expected['_library']['Day'][date]['comment'] = post['day_comment']
-        self.check_json_get(f'/day?date={date}', expected)
-        # check GET parameter to GET requests affects immediate reply, but …
-        expected['make_type'] = 'bar'
-        self.check_json_get(f'/day?date={date}&make_type=bar', expected)
-        # … not any following, …
-        expected['make_type'] = ''
-        self.check_json_get(f'/day?date={date}', expected)
-        # … not even when part of a POST request
-        post['make_type'] = 'foo'
-        self.post_day(f'date={date}', post)
-        self.check_json_get(f'/day?date={date}', expected)
-
     @staticmethod
     def post_batch(list_of_args: list[list[object]],
                    names_of_simples: list[str],
@@ -207,7 +171,7 @@ class TestsWithServer(TestCaseWithServer):
         procs_expected = self.post_batch(procs_data, [],
                                          ['title', 'description', 'effort'],
                                          self.proc_as_dict, self.post_process)
-        expected = self.get_day_dict(date)
+        expected = self.GET_day_dict(date)
         assert isinstance(expected['_library'], dict)
         expected['processes'] = self.as_id_list(procs_expected)
         expected['_library']['Process'] = self.as_refs(procs_expected)
@@ -249,7 +213,7 @@ class TestsWithServer(TestCaseWithServer):
                                          ['title', 'description', 'effort'],
                                          self.proc_as_dict, self.post_process)
         date = '2024-01-01'
-        expected = self.get_day_dict(date)
+        expected = self.GET_day_dict(date)
         assert isinstance(expected['_library'], dict)
         expected['processes'] = self.as_id_list(procs_expected)
         expected['_library']['Process'] = self.as_refs(procs_expected)
@@ -271,18 +235,112 @@ class TestsWithServer(TestCaseWithServer):
         self.post_day(f'date={date}', post_day)
         self.check_json_get(f'/day?date={date}', expected)
 
-    def test_do_GET(self) -> None:
-        """Test /day and /calendar response codes, and / redirect."""
+    def test_do_GET_calendar(self) -> None:
+        """Test /calendar response codes, and / redirect."""
         self.check_get('/calendar', 200)
         self.check_get('/calendar?start=&end=', 200)
         self.check_get('/calendar?start=today&end=today', 200)
         self.check_get('/calendar?start=2024-01-01&end=2025-01-01', 200)
         self.check_get('/calendar?start=foo', 400)
 
-    def test_do_POST_day(self) -> None:
-        """Test POST /day."""
-        form_data = {'day_comment': '', 'make_type': 'full'}
-        self.check_post(form_data, '/day', 400)
-        self.check_post(form_data, '/day?date=foo', 400)
-        self.check_post(form_data, '/day?date=2024-01-01&make_type=full', 302)
-        self.check_post({'foo': ''}, '/day?date=2024-01-01', 400)
+    def test_fail_GET_day(self) -> None:
+        """Test malformed/illegal GET /day requests."""
+        self.check_get('/day?date=foo', 400)
+        self.check_get('/day?date=2024-02-30', 400)
+
+    def test_basic_GET_day(self) -> None:
+        """Test basic (no Processes/Conditions/Todos) GET /day basics."""
+        # check undefined day
+        date = date_in_n_days(0)
+        expected = self.GET_day_dict(date)
+        self.check_json_get('/day', expected)
+        # NB: GET ?date="today"/"yesterday"/"tomorrow" in test_basic_POST_day
+        # check 'make_type' GET parameter affects immediate reply, but …
+        date = '2024-01-01'
+        expected = self.GET_day_dict(date)
+        expected['make_type'] = 'bar'
+        self.check_json_get(f'/day?date={date}&make_type=bar', expected)
+        # … not any following, …
+        expected['make_type'] = ''
+        self.check_json_get(f'/day?date={date}', expected)
+        # … not even when part of a POST request
+        post: dict[str, object] = {'day_comment': '', 'make_type': 'foo'}
+        self.post_day(f'date={date}', post)
+        self.check_json_get(f'/day?date={date}', expected)
+
+    def test_fail_POST_day(self) -> None:
+        """Test malformed/illegal POST /day requests."""
+        # check payloads lacking minimum expecteds
+        url = '/day?date=2024-01-01'
+        self.check_post({}, url, 400)
+        self.check_post({'day_comment': ''}, url, 400)
+        self.check_post({'make_type': ''}, url, 400)
+        # to next check illegal new_todo values, we need an actual Process
+        self.post_process(1)
+        # check illegal new_todo values
+        post: dict[str, object]
+        post = {'make_type': '', 'day_comment': '', 'new_todo': ['foo']}
+        self.check_post(post, url, 400)
+        post['new_todo'] = [1, 2]  # no Process of .id_=2 exists
+        # to next check illegal old_todo inputs, we need to first post Todo
+        post['new_todo'] = [1]
+        self.check_post(post, url, 302, '/day?date=2024-01-01&make_type=')
+        # check illegal old_todo inputs (equal list lengths though)
+        post = {'make_type': '', 'day_comment': '', 'comment': ['foo'],
+                'effort': [3.3], 'done': [], 'todo_id': [1]}
+        self.check_post(post, url, 302, '/day?date=2024-01-01&make_type=')
+        post['todo_id'] = [2]  # reference to non-existant Process
+        self.check_post(post, url, 404)
+        post['todo_id'] = ['a']
+        self.check_post(post, url, 400)
+        post['todo_id'] = [1]
+        post['done'] = ['foo']
+        self.check_post(post, url, 400)
+        post['done'] = [2]  # reference to non-posted todo_id
+        self.check_post(post, url, 400)
+        post['done'] = []
+        post['effort'] = ['foo']
+        self.check_post(post, url, 400)
+        post['effort'] = [None]
+        self.check_post(post, url, 400)
+        post['effort'] = [3.3]
+        # check illegal old_todo inputs: unequal list lengths
+        post['comment'] = []
+        self.check_post(post, url, 400)
+        post['comment'] = ['foo', 'foo']
+        self.check_post(post, url, 400)
+        post['comment'] = ['foo']
+        post['effort'] = []
+        self.check_post(post, url, 400)
+        post['effort'] = [3.3, 3.3]
+        self.check_post(post, url, 400)
+        post['effort'] = [3.3]
+        post['todo_id'] = [1, 1]
+        self.check_post(post, url, 400)
+        post['todo_id'] = [1]
+        # # check valid POST payload on bad paths
+        self.check_post(post, '/day', 400)
+        self.check_post(post, '/day?date=', 400)
+        self.check_post(post, '/day?date=foo', 400)
+
+    def test_basic_POST_day(self) -> None:
+        """Test basic (no Todos) POST /day.
+
+        Check POST (& GET!) requests properly parse 'today', 'tomorrow',
+        'yesterday', and actual date strings;
+        preserve 'make_type' setting in redirect even if nonsensical;
+        and store 'day_comment'
+        """
+        for name, dist, test_str in [('2024-01-01', None, 'a'),
+                                     ('today', 0, 'b'),
+                                     ('yesterday', -1, 'c'),
+                                     ('tomorrow', +1, 'd')]:
+            date = name if dist is None else date_in_n_days(dist)
+            post = {'day_comment': test_str, 'make_type': f'x:{test_str}'}
+            post_url = f'/day?date={name}'
+            redir_url = f'{post_url}&make_type={post["make_type"]}'
+            self.check_post(post, post_url, 302, redir_url)
+            expected = self.GET_day_dict(date)
+            assert isinstance(expected['_library'], dict)
+            expected['_library']['Day'][date]['comment'] = test_str
+            self.check_json_get(post_url, expected)