Minor tests refactoring.

[plomtask] / tests / todos.py

diff --git a/tests/todos.py b/tests/todos.py
index b85f2d105f0f09e174f13de88506b309ccfc4f3d..c6b28782bf98965fb6656dbdb7636793709d8c55 100644 (file)
--- a/tests/todos.py
+++ b/tests/todos.py
@@ -164,7 +164,7 @@ class TestsWithDB(TestCaseWithDB):
         todo_1.save(self.db_conn)
         assert isinstance(todo_1.id_, int)
         # test minimum
-        node_0 = TodoStepsNode(todo_1, True, [], False)
+        node_0 = TodoStepsNode(todo_1, True, [], False, False)
         self.assertEqual(todo_1.get_step_tree(set(), set()), node_0)
         # test non_emtpy seen_todo does something
         node_0.seen = True
@@ -174,7 +174,7 @@ class TestsWithDB(TestCaseWithDB):
         todo_2.save(self.db_conn)
         assert isinstance(todo_2.id_, int)
         todo_1.add_child(todo_2)
-        node_2 = TodoStepsNode(todo_2, True, [], False)
+        node_2 = TodoStepsNode(todo_2, True, [], False, False)
         node_0.children = [node_2]
         node_0.seen = False
         self.assertEqual(todo_1.get_step_tree(set(), set()), node_0)
@@ -183,22 +183,22 @@ class TestsWithDB(TestCaseWithDB):
         todo_3.save(self.db_conn)
         assert isinstance(todo_3.id_, int)
         todo_2.add_child(todo_3)
-        node_3 = TodoStepsNode(todo_3, True, [], False)
+        node_3 = TodoStepsNode(todo_3, True, [], False, False)
         node_2.children = [node_3]
         self.assertEqual(todo_1.get_step_tree(set(), set()), node_0)
         # test same todo can be child-ed multiple times at different locations
         todo_1.add_child(todo_3)
-        node_4 = TodoStepsNode(todo_3, True, [], True)
+        node_4 = TodoStepsNode(todo_3, True, [], True, False)
         node_0.children += [node_4]
         self.assertEqual(todo_1.get_step_tree(set(), set()), node_0)
         # test condition shows up
         todo_1.set_conditions(self.db_conn, [self.cond1.id_])
-        node_5 = TodoStepsNode(self.cond1, False, [], False)
+        node_5 = TodoStepsNode(self.cond1, False, [], False, False)
         node_0.children += [node_5]
         self.assertEqual(todo_1.get_step_tree(set(), set()), node_0)
         # test second condition shows up
         todo_2.set_conditions(self.db_conn, [self.cond2.id_])
-        node_6 = TodoStepsNode(self.cond2, False, [], False)
+        node_6 = TodoStepsNode(self.cond2, False, [], False, False)
         node_2.children += [node_6]
         self.assertEqual(todo_1.get_step_tree(set(), set()), node_0)
         # test second condition is not hidden if fulfilled by non-sibling
@@ -288,9 +288,8 @@ 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, '/process?id=1')
-        self.check_post(form_data, '/process?id=', 302, '/process?id=2')
+        self.post_process()
+        self.post_process(2)
         proc = Process.by_id(self.db_conn, 1)
         proc2 = Process.by_id(self.db_conn, 2)
         form_data = {'comment': ''}
@@ -319,8 +318,7 @@ class TestsWithServer(TestCaseWithServer):
             self.check_post(form_data, '/todo?id=1', status, redir_url)
             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, '/process?id=1')
+        self.post_process()
         form_data = {'comment': '', 'new_todo': 1}
         self.check_post(form_data, '/day?date=2024-01-01', 302)
         # test posting to bad URLs
@@ -378,10 +376,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, '/process?id=1')
+        form_data = self.post_process()
         form_data['new_top_step'] = 1
-        self.check_post(form_data, '/process', 302, '/process?id=2')
+        form_data = self.post_process(2, form_data)
         form_data = {'comment': '', 'new_todo': 1}
         self.check_post(form_data, '/day?date=2024-01-01', 302)
         form_data = {'comment': '', 'new_todo': 2}
@@ -395,8 +392,7 @@ 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, '/process?id=1')
+        self.post_process()
         form_data = {'comment': '', 'new_todo': 1}
         self.check_post(form_data, '/day?date=2024-01-01', 302)
         self.check_get('/todo', 400)