fix: working integration test for tutorial creation

Author: Gigaszi

mapswipe_workers/tests/integration/tear_down.py

@@ -8,7 +8,7 @@
 from mapswipe_workers import auth
 
 
-def delete_test_data(project_id: str) -> None:
+def delete_test_data(project_id: str, tutorial_id: str = None) -> None:
     """
     Delete test project indluding groups, tasks and results
     from Firebase and Postgres
@@ -38,6 +38,12 @@ def delete_test_data(project_id: str) -> None:
     ref = fb_db.reference(f"v2/users/{project_id}")
     ref.delete()
 
+    if tutorial_id is not None:
+        ref = fb_db.reference(f"v2/projects/{tutorial_id}")
+        ref.delete()
+        ref = fb_db.reference(f"v2/tutorialDrafts/{tutorial_id}")
+        ref.delete()
+
     # Clear out the user-group used in test.
     # XXX: Use a firebase simulator for running test.
     # For CI/CD, use a real firebase with scope using commit hash,

mapswipe_workers/tests/integration/test_create_tutorial.py

@@ -10,65 +10,35 @@
 class TestCreateTileClassificationProject(unittest.TestCase):
     def setUp(self):
         self.tutorial_id = set_up.create_test_tutorial_draft(
-            "tile_classification",
-            "tile_classification",
+            "street",
+            "street",
             "test_tile_classification_tutorial",
         )
 
         self.project_id = set_up.create_test_project_draft(
-            "tile_classification",
-            "tile_classification",
+            "street",
+            "street",
             "test_tile_classification_tutorial",
             tutorial_id=self.tutorial_id,
         )
         create_directories()
 
     def tearDown(self):
-        tear_down.delete_test_data(self.project_id)
+        tear_down.delete_test_data(self.project_id, self.tutorial_id)
 
     def test_create_tile_classification_project(self):
         runner = CliRunner()
+        runner.invoke(mapswipe_workers.run_create_tutorials, catch_exceptions=False)
         runner.invoke(mapswipe_workers.run_create_projects, catch_exceptions=False)
 
-        pg_db = auth.postgresDB()
-        query = "SELECT project_id FROM projects WHERE project_id = %s"
-        result = pg_db.retr_query(query, [self.project_id])[0][0]
-        self.assertEqual(result, self.project_id)
-
-        query = """
-            SELECT project_id
-            FROM projects
-            WHERE project_id = %s
-                and project_type_specifics::jsonb ? 'customOptions'
-        """
-        result = pg_db.retr_query(query, [self.project_id])[0][0]
-        self.assertEqual(result, self.project_id)
-
-        query = "SELECT count(*)  FROM groups WHERE project_id = %s"
-        result = pg_db.retr_query(query, [self.project_id])[0][0]
-        self.assertEqual(result, 20)
-
-        query = "SELECT count(*)  FROM tasks WHERE project_id = %s"
-        result = pg_db.retr_query(query, [self.project_id])[0][0]
-        self.assertEqual(result, 5040)
-
         fb_db = auth.firebaseDB()
         ref = fb_db.reference(f"/v2/projects/{self.project_id}")
-        result = ref.get(shallow=True)
-        self.assertIsNotNone(result)
+        result = ref.get()
+        self.assertEqual(result["tutorialId"], self.tutorial_id)
 
-        ref = fb_db.reference(f"/v2/groups/{self.project_id}")
+        ref = fb_db.reference(f"/v2/projects/{self.tutorial_id}")
         result = ref.get(shallow=True)
-        self.assertEqual(len(result), 20)
-
-        # Tile classification projects do not have tasks in Firebase
-        ref = fb_db.reference(f"/v2/tasks/{self.project_id}")
-        result = ref.get(shallow=True)
-        self.assertIsNone(result)
-
-        ref = fb_db.reference(f"/v2/projects/{self.project_id}/tutorialId")
-        result = ref.get(shallow=True)
-        self.assertEqual(self.tutorial_id, result)
+        self.assertIsNotNone(result)
 
 
 if __name__ == "__main__":

mapswipe_workers/tests/unittests/test_tutorial.py

@@ -1,22 +1,22 @@
 import os
 import unittest
 
-from mapswipe_workers.project_types import ClassificationTutorial
+from mapswipe_workers.project_types import StreetTutorial
 from tests.fixtures import FIXTURE_DIR, get_fixture
 
 
 class TestTutorial(unittest.TestCase):
     def test_init_tile_classification_project(self):
         tutorial_draft = get_fixture(
-            os.path.join(FIXTURE_DIR, "tutorialDrafts", "tile_classification.json")
+            os.path.join(FIXTURE_DIR, "tutorialDrafts", "street.json")
         )
-        self.assertIsNotNone(ClassificationTutorial(tutorial_draft=tutorial_draft))
+        self.assertIsNotNone(StreetTutorial(tutorial_draft=tutorial_draft))
 
     def test_create_tile_classification_tasks(self):
         tutorial_draft = get_fixture(
-            os.path.join(FIXTURE_DIR, "tutorialDrafts", "tile_classification.json")
+            os.path.join(FIXTURE_DIR, "tutorialDrafts", "street.json")
         )
-        tutorial = ClassificationTutorial(tutorial_draft=tutorial_draft)
+        tutorial = StreetTutorial(tutorial_draft=tutorial_draft)
         tutorial.create_tutorial_groups()
         tutorial.create_tutorial_tasks()
         self.assertTrue(tutorial.groups)