X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=tests%2Ftodos.py;h=182bd5566bff159e152fa7156e90e42c8a3caa8d;hb=23012cd370777b60a25839788d131173d2abee91;hp=7aed5f83a0eee3e2eb50845c42de9fd57e3aee0f;hpb=696aed8a590fa9c67a6b9c723e2134b2663bd769;p=plomtask

diff --git a/tests/todos.py b/tests/todos.py
index 7aed5f8..182bd55 100644
--- a/tests/todos.py
+++ b/tests/todos.py
@@ -31,9 +31,9 @@ class TestsWithDB(TestCaseWithDB):
         todo.save(self.db_conn)
         self.assertEqual(Todo.by_id(self.db_conn, 1), todo)
         with self.assertRaises(NotFoundException):
-            self.assertEqual(Todo.by_id(self.db_conn, 0), todo)
+            Todo.by_id(self.db_conn, 0)
         with self.assertRaises(NotFoundException):
-            self.assertEqual(Todo.by_id(self.db_conn, 2), todo)
+            Todo.by_id(self.db_conn, 2)
 
     def test_Todo_by_date(self) -> None:
         """Test findability of Todos by date."""
@@ -273,15 +273,15 @@ class TestsWithServer(TestCaseWithServer):
     def test_do_POST_day(self) -> None:
         """Test Todo posting of POST /day."""
         form_data = {'title': '', 'description': '', 'effort': 1}
-        self.check_post(form_data, '/process?id=', 302, '/')
-        self.check_post(form_data, '/process?id=', 302, '/')
+        self.check_post(form_data, '/process?id=', 302, '/process?id=1')
+        self.check_post(form_data, '/process?id=', 302, '/process?id=2')
         proc = Process.by_id(self.db_conn, 1)
         proc2 = Process.by_id(self.db_conn, 2)
         form_data = {'comment': ''}
-        self.check_post(form_data, '/day?date=2024-01-01', 302, '/')
+        self.check_post(form_data, '/day?date=2024-01-01', 302)
         self.assertEqual(Todo.by_date(self.db_conn, '2024-01-01'), [])
         form_data['new_todo'] = str(proc.id_)
-        self.check_post(form_data, '/day?date=2024-01-01', 302, '/')
+        self.check_post(form_data, '/day?date=2024-01-01', 302)
         todos = Todo.by_date(self.db_conn, '2024-01-01')
         self.assertEqual(1, len(todos))
         todo1 = todos[0]
@@ -289,7 +289,7 @@ class TestsWithServer(TestCaseWithServer):
         self.assertEqual(todo1.process.id_, proc.id_)
         self.assertEqual(todo1.is_done, False)
         form_data['new_todo'] = str(proc2.id_)
-        self.check_post(form_data, '/day?date=2024-01-01', 302, '/')
+        self.check_post(form_data, '/day?date=2024-01-01', 302)
         todos = Todo.by_date(self.db_conn, '2024-01-01')
         todo1 = todos[1]
         self.assertEqual(todo1.id_, 2)
@@ -300,12 +300,11 @@ class TestsWithServer(TestCaseWithServer):
         """Test POST /todo."""
         def post_and_reload(form_data: dict[str, object],
                             status: int = 302) -> Todo:
-            self.check_post(form_data, '/todo?id=1', status, '/')
-            self.db_conn.cached_todos = {}
+            self.check_post(form_data, '/todo?id=1', status)
             return Todo.by_date(self.db_conn, '2024-01-01')[0]
         # test minimum
         form_data = {'title': '', 'description': '', 'effort': 1}
-        self.check_post(form_data, '/process', 302)
+        self.check_post(form_data, '/process', 302, '/process?id=1')
         form_data = {'comment': '', 'new_todo': 1}
         self.check_post(form_data, '/day?date=2024-01-01', 302)
         # test posting to bad URLs
@@ -361,9 +360,9 @@ class TestsWithServer(TestCaseWithServer):
     def test_do_POST_day_todo_adoption(self) -> None:
         """Test Todos posted to Day view may adopt existing Todos."""
         form_data = {'title': '', 'description': '', 'effort': 1}
-        self.check_post(form_data, '/process', 302, '/')
+        self.check_post(form_data, '/process', 302, '/process?id=1')
         form_data['new_top_step'] = 1
-        self.check_post(form_data, '/process', 302, '/')
+        self.check_post(form_data, '/process', 302, '/process?id=2')
         form_data = {'comment': '', 'new_todo': 1}
         self.check_post(form_data, '/day?date=2024-01-01', 302)
         form_data = {'comment': '', 'new_todo': 2}
@@ -378,9 +377,9 @@ class TestsWithServer(TestCaseWithServer):
     def test_do_GET_todo(self) -> None:
         """Test GET /todo response codes."""
         form_data = {'title': '', 'description': '', 'effort': 1}
-        self.check_post(form_data, '/process?id=', 302, '/')
+        self.check_post(form_data, '/process?id=', 302, '/process?id=1')
         form_data = {'comment': '', 'new_todo': 1}
-        self.check_post(form_data, '/day?date=2024-01-01', 302, '/')
+        self.check_post(form_data, '/day?date=2024-01-01', 302)
         self.check_get('/todo', 400)
         self.check_get('/todo?id=', 400)
         self.check_get('/todo?id=foo', 400)