fix: adjust api and tests for changes made on

openedx/openedx-learning#62

Author: pomegranited

openedx/features/content_tagging/api.py

@@ -18,7 +18,6 @@ def create_taxonomy(
     required=False,
     allow_multiple=False,
     allow_free_text=False,
-    system_defined=False,
     object_tag_class: Type = None,
 ) -> Taxonomy:
     """
@@ -33,7 +32,6 @@ def create_taxonomy(
         required=required,
         allow_multiple=allow_multiple,
         allow_free_text=allow_free_text,
-        system_defined=system_defined,
         object_tag_class=object_tag_class,
     )
     if org_owners:

openedx/features/content_tagging/tests/test_api.py

@@ -159,22 +159,23 @@ def test_get_taxonomies_for_org(self, org_attr, enabled, expected):
         ]
 
     @ddt.data(
-        ("taxonomy_all_orgs", "all_orgs_course_tag"),
-        ("taxonomy_all_orgs", "all_orgs_block_tag"),
-        ("taxonomy_both_orgs", "both_orgs_course_tag"),
-        ("taxonomy_both_orgs", "both_orgs_block_tag"),
-        ("taxonomy_one_org", "one_org_block_tag"),
+        ("taxonomy_all_orgs", "all_orgs_course_tag", 2),
+        ("taxonomy_all_orgs", "all_orgs_block_tag", 2),
+        ("taxonomy_both_orgs", "both_orgs_course_tag", 3),
+        ("taxonomy_both_orgs", "both_orgs_block_tag", 3),
+        ("taxonomy_one_org", "one_org_block_tag", 3),
     )
     @ddt.unpack
     def test_get_object_tags_valid_for_org(
         self,
         taxonomy_attr,
         object_tag_attr,
+        num_queries,
     ):
         taxonomy_id = getattr(self, taxonomy_attr).id
         taxonomy = api.get_taxonomy(taxonomy_id)
         object_tag = getattr(self, object_tag_attr)
-        with self.assertNumQueries(2):
+        with self.assertNumQueries(num_queries):
             valid_tags = list(
                 api.get_object_tags(
                     taxonomy=taxonomy,
@@ -183,7 +184,8 @@ def test_get_object_tags_valid_for_org(
                     valid_only=True,
                 )
             )
-        assert valid_tags == [object_tag]
+        assert len(valid_tags) == 1
+        assert valid_tags[0].id == object_tag.id
 
     @ddt.data(
         ("taxonomy_disabled", "disabled_course_tag"),
@@ -213,7 +215,8 @@ def test_get_object_tags_include_invalid(
                     valid_only=False,
                 )
             )
-        assert valid_tags == [object_tag]
+        assert len(valid_tags) == 1
+        assert valid_tags[0].id == object_tag.id
 
     def test_object_tag_not_valid_check_object(self):
         """

openedx/features/content_tagging/tests/test_rules.py

@@ -134,8 +134,8 @@ def test_system_taxonomy(self, perm):
         """Taxonomy administrators cannot edit system taxonomies"""
         system_taxonomy = api.create_taxonomy(
             name="System Languages",
-            system_defined=True,
         )
+        system_taxonomy.system_defined = True
         assert self.superuser.has_perm(perm, system_taxonomy)
         assert not self.staff.has_perm(perm, system_taxonomy)
         assert not self.user_all_orgs.has_perm(perm, system_taxonomy)