Fix failing tests and rebasing mistakes

Author: Jakoma02

contentcuration/contentcuration/tests/test_models.py

@@ -710,7 +710,7 @@ def test_filter_edit_queryset__admin(self, mock_ensure_db_exists):
         )
         self.assertQuerysetContains(queryset, pk=submission_a.id)
 
-    def test_mark_live(self):
+    def test_mark_live(self, mock_ensure_db_exists):
         submission_a = testdata.community_library_submission()
         submission_b = testdata.community_library_submission()
 

contentcuration/contentcuration/tests/viewsets/test_channel.py

@@ -547,8 +547,11 @@ def test_sync_added_to_community_library_change(self):
         self.assertEqual(len(response.json()["allowed"]), 0, response.content)
         self.assertEqual(len(response.json()["disallowed"]), 1, response.content)
 
+    @mock.patch("contentcuration.utils.publish.ensure_versioned_database_exists")
     @mock.patch("contentcuration.viewsets.channel.export_channel_to_kolibri_public")
-    def test_process_added_to_community_library_change(self, mock_export_func):
+    def test_process_added_to_community_library_change(
+        self, mock_export_func, mock_ensure_db_exists
+    ):
         # Creating the change on the backend should be supported
         self.client.force_authenticate(self.admin_user)
 

contentcuration/contentcuration/tests/viewsets/test_community_library_submission.py

@@ -44,6 +44,12 @@ def setUp(self):
         self.country1 = testdata.country(name="Country 1", code="C1")
         self.country2 = testdata.country(name="Country 2", code="C2")
 
+        # Mock to allow creating submissions without having to set up content databases
+        self.ensure_db_exists_patcher = mock.patch(
+            "contentcuration.utils.publish.ensure_versioned_database_exists"
+        )
+        self.ensure_db_exists_patcher.start()
+
         self.channel_with_submission1 = testdata.channel()
         self.channel_with_submission1.public = False
         self.channel_with_submission1.version = 1
@@ -93,6 +99,10 @@ def setUp(self):
         self.existing_submission2.countries.add(self.country1)
         self.existing_submission2.save()
 
+    def tearDown(self):
+        self.ensure_db_exists_patcher.stop()
+        super().tearDown()
+
     def test_create_submission__is_editor(self):
         self.client.force_authenticate(user=self.editor_user)
         submission = self.new_submission_metadata
@@ -463,6 +473,19 @@ class AdminViewSetTestCase(StudioAPITestCase):
     def setUp(self):
         super().setUp()
 
+        self.resolved_time = datetime.datetime(2023, 10, 1, tzinfo=pytz.utc)
+        self.datetime_patcher = mock.patch(
+            "contentcuration.viewsets.community_library_submission.timezone.now",
+            return_value=self.resolved_time,
+        )
+        self.mock_datetime = self.datetime_patcher.start()
+
+        # Mock to allow creating submissions without having to set up content databases
+        self.ensure_db_exists_patcher = mock.patch(
+            "contentcuration.utils.publish.ensure_versioned_database_exists"
+        )
+        self.ensure_db_exists_patcher.start()
+
         self.submission = testdata.community_library_submission()
         self.submission.channel.version = 3
         self.submission.channel.save()
@@ -504,15 +527,9 @@ def setUp(self):
             "internal_notes": self.internal_notes,
         }
 
-        self.resolved_time = datetime.datetime(2023, 10, 1, tzinfo=pytz.utc)
-        self.patcher = mock.patch(
-            "contentcuration.viewsets.community_library_submission.timezone.now",
-            return_value=self.resolved_time,
-        )
-        self.mock_datetime = self.patcher.start()
-
     def tearDown(self):
-        self.patcher.stop()
+        self.datetime_patcher.stop()
+        self.ensure_db_exists_patcher.stop()
         super().tearDown()
 
     def _manually_reject_submission(self):

contentcuration/kolibri_public/utils/export_channel_to_kolibri_public.py

@@ -84,7 +84,6 @@ def export_channel_to_kolibri_public(
         )
         mapper = ChannelMapper(
             channel=channel,
-            channel_version=channel_version,
             public=public,
             categories=categories,
             countries=countries,