From 32bb4c505793dc8e060127aa2d4151b031cfbae8 Mon Sep 17 00:00:00 2001 From: Braden MacDonald Date: Mon, 6 Nov 2023 11:54:16 -0800 Subject: [PATCH] chore: update openedx-learning, new object tags API format (unstable) (#33651) --- .../rest_api/v1/tests/test_views.py | 32 +++++++++++++------ requirements/constraints.txt | 2 +- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 6 files changed, 27 insertions(+), 15 deletions(-) diff --git a/openedx/core/djangoapps/content_tagging/rest_api/v1/tests/test_views.py b/openedx/core/djangoapps/content_tagging/rest_api/v1/tests/test_views.py index d37b5df26c..8dc6f2f6ad 100644 --- a/openedx/core/djangoapps/content_tagging/rest_api/v1/tests/test_views.py +++ b/openedx/core/djangoapps/content_tagging/rest_api/v1/tests/test_views.py @@ -1136,13 +1136,19 @@ class TestObjectTagViewSet(TestObjectTagMixin, APITestCase): assert response.status_code == expected_status if status.is_success(expected_status): - assert len(response.data) == len(tag_values) - assert set(t["value"] for t in response.data) == set(tag_values) + tags_by_taxonomy = response.data[str(self.courseA)]["taxonomies"] + if tag_values: + response_taxonomy = tags_by_taxonomy[0] + assert response_taxonomy["name"] == taxonomy.name + response_tags = response_taxonomy["tags"] + assert [t["value"] for t in response_tags] == tag_values + else: + assert tags_by_taxonomy == [] # No tags are set from any taxonomy # Check that re-fetching the tags returns what we set - response = self.client.get(url, format="json") - assert status.is_success(response.status_code) - assert set(t["value"] for t in response.data) == set(tag_values) + new_response = self.client.get(url, format="json") + assert status.is_success(new_response.status_code) + assert new_response.data == response.data @ddt.data( "staffA", @@ -1214,13 +1220,19 @@ class TestObjectTagViewSet(TestObjectTagMixin, APITestCase): assert response.status_code == expected_status if status.is_success(expected_status): - assert len(response.data) == len(tag_values) - assert set(t["value"] for t in response.data) == set(tag_values) + tags_by_taxonomy = response.data[str(self.xblockA)]["taxonomies"] + if tag_values: + response_taxonomy = tags_by_taxonomy[0] + assert response_taxonomy["name"] == taxonomy.name + response_tags = response_taxonomy["tags"] + assert [t["value"] for t in response_tags] == tag_values + else: + assert tags_by_taxonomy == [] # No tags are set from any taxonomy # Check that re-fetching the tags returns what we set - response = self.client.get(url, format="json") - assert status.is_success(response.status_code) - assert set(t["value"] for t in response.data) == set(tag_values) + new_response = self.client.get(url, format="json") + assert status.is_success(new_response.status_code) + assert new_response.data == response.data @ddt.data( "staffA", diff --git a/requirements/constraints.txt b/requirements/constraints.txt index a6756a9a46..d0d1cc5617 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -121,7 +121,7 @@ libsass==0.10.0 click==8.1.6 # pinning this version to avoid updates while the library is being developed -openedx-learning==0.3.0 +openedx-learning==0.3.2 # lti-consumer-xblock 9.6.2 contains a breaking change that makes # existing custom parameter configurations unusable. diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 8451d0c20f..372391caaf 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -785,7 +785,7 @@ openedx-filters==1.6.0 # via # -r requirements/edx/kernel.in # lti-consumer-xblock -openedx-learning==0.3.0 +openedx-learning==0.3.2 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 65696d4f23..0e4738d9a0 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1315,7 +1315,7 @@ openedx-filters==1.6.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # lti-consumer-xblock -openedx-learning==0.3.0 +openedx-learning==0.3.2 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 78769b845e..96776ee5f3 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -925,7 +925,7 @@ openedx-filters==1.6.0 # via # -r requirements/edx/base.txt # lti-consumer-xblock -openedx-learning==0.3.0 +openedx-learning==0.3.2 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index dd79331671..a1f805ee01 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -989,7 +989,7 @@ openedx-filters==1.6.0 # via # -r requirements/edx/base.txt # lti-consumer-xblock -openedx-learning==0.3.0 +openedx-learning==0.3.2 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt