fix: tests

openedx · Sep 26, 2024 · ee346d4 · ee346d4
1 parent f5d3b44
commit ee346d4
Showing 1 changed file with 42 additions and 44 deletions.
diff --git a/...discovery/apps/course_metadata/management/commands/tests/test_populate_product_catalog.py b/...discovery/apps/course_metadata/management/commands/tests/test_populate_product_catalog.py
@@ -305,12 +305,53 @@ def test_populate_product_catalog_excludes_non_marketable_degrees(self):
                 # Check that the marketable degree with no language field has the default language populated
                 self.assertEqual(matching_rows[0].get("Languages"), 'en-us')
 
+    def test_populate_product_catalog_with_degrees_having_overrides(self):
+        """
+        Test that the populate_product_catalog command includes the overridden subjects and languages for degrees.
+        """
+        degree = DegreeFactory.create(
+            product_source=self.source,
+            partner=self.partner,
+            additional_metadata=None,
+            type=self.program_type,
+            status=ProgramStatus.Active,
+            marketing_slug="valid-marketing-slug",
+            title="Marketable Degree",
+            authoring_organizations=[self.organization],
+            card_image=factory.django.ImageField(),
+            primary_subject_override=SubjectFactory(name='Subject1'),
+            language_override=LanguageTag.objects.get(code='es'),
+        )
+
+        with NamedTemporaryFile() as output_csv:
+            call_command(
+                "populate_product_catalog",
+                product_type="degree",
+                output_csv=output_csv.name,
+                product_source="edx",
+                gspread_client_flag=False,
+            )
+
+            with open(output_csv.name, "r") as output_csv_file:
+                csv_reader = csv.DictReader(output_csv_file)
+                rows = list(csv_reader)
+
+                matching_rows = [
+                    row for row in rows if row["UUID"] == str(degree.uuid.hex)
+                ]
+                self.assertEqual(len(matching_rows), 1)
+
+                row = matching_rows[0]
+                self.assertEqual(row["UUID"], str(degree.uuid.hex))
+                self.assertEqual(row["Title"], degree.title)
+                self.assertIn(degree.primary_subject_override.name, row["Subjects"])
+                self.assertEqual(row["Languages"], degree.language_override.code)
+
     def test_populate_product_catalog_supports_multiple_product_sources(self):
         """
         Test that the populate_product_catalog command supports multiple product sources.
         """
         marketable_degree = DegreeFactory.create(
-            product_source=self.source,
             partner=self.partner,
             additional_metadata=None,
             type=self.program_type,
@@ -322,7 +363,6 @@ def test_populate_product_catalog_supports_multiple_product_sources(self):
             product_source=self.source,
         )
         marketable_degree_2 = DegreeFactory.create(
-            product_source=self.source,
             partner=self.partner,
             additional_metadata=None,
             type=self.program_type,
@@ -392,48 +432,6 @@ def test_populate_product_catalog_supports_multiple_product_sources(self):
                     len(matching_rows), 1, f"'{marketable_degree_2.title}' should be in the CSV",
                 )
 
-    def test_populate_product_catalog_with_degrees_having_overrides(self):
-        """
-        Test that the populate_product_catalog command includes the overridden subjects and languages for degrees.
-        """
-        degree = DegreeFactory.create(
-            product_source=self.source,
-            partner=self.partner,
-            additional_metadata=None,
-            type=self.program_type,
-            status=ProgramStatus.Active,
-            marketing_slug="valid-marketing-slug",
-            title="Marketable Degree",
-            authoring_organizations=[self.organization],
-            card_image=factory.django.ImageField(),
-            primary_subject_override=SubjectFactory(name='Subject1'),
-            language_override=LanguageTag.objects.get(code='es'),
-        )
-
-        with NamedTemporaryFile() as output_csv:
-            call_command(
-                "populate_product_catalog",
-                product_type="degree",
-                output_csv=output_csv.name,
-                product_source="edx",
-                gspread_client_flag=False,
-            )
-
-            with open(output_csv.name, "r") as output_csv_file:
-                csv_reader = csv.DictReader(output_csv_file)
-                rows = list(csv_reader)
-
-                matching_rows = [
-                    row for row in rows if row["UUID"] == str(degree.uuid.hex)
-                ]
-                self.assertEqual(len(matching_rows), 1)
-
-                row = matching_rows[0]
-                self.assertEqual(row["UUID"], str(degree.uuid.hex))
-                self.assertEqual(row["Title"], degree.title)
-                self.assertIn(degree.primary_subject_override.name, row["Subjects"])
-                self.assertEqual(row["Languages"], degree.language_override.code)
-
     @mock.patch(
         "course_discovery.apps.course_metadata.management.commands.populate_product_catalog.Command.get_products"
     )