-
- <%static:studiofrontend entry="accessibilityPolicy">
- {
- "lang": "${language_code | n, js_escaped_string}"
- }
-
-
- Test body
", - "endorsed": False, - "endorsed_by": None, - "endorsed_by_label": None, - "endorsed_at": None, - "abuse_flagged": False, - "abuse_flagged_any_user": None, - "voted": False, - "vote_count": 4, - "children": [], - "editable_fields": ["abuse_flagged", "voted"], - "child_count": 0, - "can_delete": False, - "last_edit": None, - "edit_by_label": None, - "profile_image": { - "has_image": False, - "image_url_full": "http://testserver/static/default_500.png", - "image_url_large": "http://testserver/static/default_120.png", - "image_url_medium": "http://testserver/static/default_50.png", - "image_url_small": "http://testserver/static/default_30.png", - }, - } - - assert self.serialize(comment) == expected - - @ddt.data( - *itertools.product( - [ - FORUM_ROLE_ADMINISTRATOR, - FORUM_ROLE_MODERATOR, - FORUM_ROLE_COMMUNITY_TA, - FORUM_ROLE_STUDENT, - ], - [True, False] - ) - ) - @ddt.unpack - def test_endorsed_by(self, endorser_role_name, thread_anonymous): - """ - Test correctness of the endorsed_by field. - - The endorser should be anonymous iff the thread is anonymous to the - requester, and the endorser is not a privileged user. - - endorser_role_name is the name of the endorser's role. - thread_anonymous is the value of the anonymous field in the thread. - """ - self.create_role(endorser_role_name, [self.endorser]) - serialized = self.serialize( - self.make_cs_content(with_endorsement=True), - thread_data={"anonymous": thread_anonymous} - ) - actual_endorser_anonymous = serialized["endorsed_by"] is None - expected_endorser_anonymous = endorser_role_name == FORUM_ROLE_STUDENT and thread_anonymous - assert actual_endorser_anonymous == expected_endorser_anonymous - - @ddt.data( - (FORUM_ROLE_ADMINISTRATOR, "Moderator"), - (FORUM_ROLE_MODERATOR, "Moderator"), - (FORUM_ROLE_COMMUNITY_TA, "Community TA"), - (FORUM_ROLE_STUDENT, None), - ) - @ddt.unpack - def test_endorsed_by_labels(self, role_name, expected_label): - """ - Test correctness of the endorsed_by_label field. - - The label should be "Staff", "Moderator", or "Community TA" for the - Administrator, Moderator, and Community TA roles, respectively. - - role_name is the name of the author's role. - expected_label is the expected value of the author_label field in the - API output. - """ - self.create_role(role_name, [self.endorser]) - serialized = self.serialize(self.make_cs_content(with_endorsement=True)) - assert serialized['endorsed_by_label'] == expected_label - - def test_endorsed_at(self): - serialized = self.serialize(self.make_cs_content(with_endorsement=True)) - assert serialized['endorsed_at'] == self.endorsed_at - - def test_children(self): - comment = self.make_cs_content({ - "id": "test_root", - "children": [ - self.make_cs_content({ - "id": "test_child_1", - "parent_id": "test_root", - }), - self.make_cs_content({ - "id": "test_child_2", - "parent_id": "test_root", - "children": [ - self.make_cs_content({ - "id": "test_grandchild", - "parent_id": "test_child_2" - }) - ], - }), - ], - }) - serialized = self.serialize(comment) - assert serialized['children'][0]['id'] == 'test_child_1' - assert serialized['children'][0]['parent_id'] == 'test_root' - assert serialized['children'][1]['id'] == 'test_child_2' - assert serialized['children'][1]['parent_id'] == 'test_root' - assert serialized['children'][1]['children'][0]['id'] == 'test_grandchild' - assert serialized['children'][1]['children'][0]['parent_id'] == 'test_child_2' - - -@ddt.ddt -class ThreadSerializerDeserializationTest( - ForumsEnableMixin, - CommentsServiceMockMixin, - UrlResetMixin, - SharedModuleStoreTestCase -): - """Tests for ThreadSerializer deserialization.""" - @classmethod - @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) - def setUpClass(cls): - super().setUpClass() - cls.course = CourseFactory.create() - - @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) - def setUp(self): - super().setUp() - httpretty.reset() - httpretty.enable() - self.addCleanup(httpretty.reset) - self.addCleanup(httpretty.disable) - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) - self.user = UserFactory.create() - self.register_get_user_response(self.user) - self.request = RequestFactory().get("/dummy") - self.request.user = self.user - self.minimal_data = { - "course_id": str(self.course.id), - "topic_id": "test_topic", - "type": "discussion", - "title": "Test Title", - "raw_body": "Test body", - } - self.existing_thread = Thread(**make_minimal_cs_thread({ - "id": "existing_thread", - "course_id": str(self.course.id), - "commentable_id": "original_topic", - "thread_type": "discussion", - "title": "Original Title", - "body": "Original body", - "user_id": str(self.user.id), - "username": self.user.username, - "read": "False", - "endorsed": "False" - })) - - def save_and_reserialize(self, data, instance=None): - """ - Create a serializer with the given data and (if updating) instance, - ensure that it is valid, save the result, and return the full thread - data from the serializer. - """ - serializer = ThreadSerializer( - instance, - data=data, - partial=(instance is not None), - context=get_context(self.course, self.request) - ) - assert serializer.is_valid() - serializer.save() - return serializer.data - - def test_create_missing_field(self): - for field in self.minimal_data: - data = self.minimal_data.copy() - data.pop(field) - serializer = ThreadSerializer(data=data) - assert not serializer.is_valid() - assert serializer.errors == {field: ['This field is required.']} - - @ddt.data("", " ") - def test_create_empty_string(self, value): - data = self.minimal_data.copy() - data.update({field: value for field in ["topic_id", "title", "raw_body"]}) - serializer = ThreadSerializer(data=data, context=get_context(self.course, self.request)) - assert not serializer.is_valid() - assert serializer.errors == { - field: ['This field may not be blank.'] for field in ['topic_id', 'title', 'raw_body'] - } - - def test_update_empty(self): - self.register_put_thread_response(self.existing_thread.attributes) - self.save_and_reserialize({}, self.existing_thread) - assert parsed_body(httpretty.last_request()) == { - 'course_id': [str(self.course.id)], - 'commentable_id': ['original_topic'], - 'thread_type': ['discussion'], - 'title': ['Original Title'], - 'body': ['Original body'], - 'anonymous': ['False'], - 'anonymous_to_peers': ['False'], - 'closed': ['False'], - 'pinned': ['False'], - 'user_id': [str(self.user.id)], - 'read': ['False'] - } - - @ddt.data(True, False) - def test_update_all(self, read): - self.register_put_thread_response(self.existing_thread.attributes) - data = { - "topic_id": "edited_topic", - "type": "question", - "title": "Edited Title", - "raw_body": "Edited body", - "read": read, - } - saved = self.save_and_reserialize(data, self.existing_thread) - assert parsed_body(httpretty.last_request()) == { - 'course_id': [str(self.course.id)], - 'commentable_id': ['edited_topic'], - 'thread_type': ['question'], - 'title': ['Edited Title'], - 'body': ['Edited body'], - 'anonymous': ['False'], - 'anonymous_to_peers': ['False'], - 'closed': ['False'], - 'pinned': ['False'], - 'user_id': [str(self.user.id)], - 'read': [str(read)], - 'editing_user_id': [str(self.user.id)], - } - for key in data: - assert saved[key] == data[key] - - def test_update_anonymous(self): - """ - Test that serializer correctly deserializes the anonymous field when - updating an existing thread. - """ - self.register_put_thread_response(self.existing_thread.attributes) - data = { - "anonymous": True, - } - self.save_and_reserialize(data, self.existing_thread) - assert parsed_body(httpretty.last_request())["anonymous"] == ['True'] - - def test_update_anonymous_to_peers(self): - """ - Test that serializer correctly deserializes the anonymous_to_peers - field when updating an existing thread. - """ - self.register_put_thread_response(self.existing_thread.attributes) - data = { - "anonymous_to_peers": True, - } - self.save_and_reserialize(data, self.existing_thread) - assert parsed_body(httpretty.last_request())["anonymous_to_peers"] == ['True'] - - @ddt.data("", " ") - def test_update_empty_string(self, value): - serializer = ThreadSerializer( - self.existing_thread, - data={field: value for field in ["topic_id", "title", "raw_body"]}, - partial=True, - context=get_context(self.course, self.request) - ) - assert not serializer.is_valid() - assert serializer.errors == { - field: ['This field may not be blank.'] for field in ['topic_id', 'title', 'raw_body'] - } - - def test_update_course_id(self): - serializer = ThreadSerializer( - self.existing_thread, - data={"course_id": "some/other/course"}, - partial=True, - context=get_context(self.course, self.request) - ) - assert not serializer.is_valid() - assert serializer.errors == {'course_id': ['This field is not allowed in an update.']} - - -@ddt.ddt -class CommentSerializerDeserializationTest(ForumsEnableMixin, CommentsServiceMockMixin, SharedModuleStoreTestCase): - """Tests for ThreadSerializer deserialization.""" - @classmethod - def setUpClass(cls): - super().setUpClass() - cls.course = CourseFactory.create() - - def setUp(self): - super().setUp() - httpretty.reset() - httpretty.enable() - self.addCleanup(httpretty.reset) - self.addCleanup(httpretty.disable) - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) - patcher = mock.patch( - "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment" - ) - self.mock_get_course_id_by_comment = patcher.start() - self.addCleanup(patcher.stop) - patcher = mock.patch( - "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread" - ) - self.mock_get_course_id_by_thread = patcher.start() - self.addCleanup(patcher.stop) - self.user = UserFactory.create() - self.register_get_user_response(self.user) - self.request = RequestFactory().get("/dummy") - self.request.user = self.user - self.minimal_data = { - "thread_id": "test_thread", - "raw_body": "Test body", - } - self.existing_comment = Comment(**make_minimal_cs_comment({ - "id": "existing_comment", - "thread_id": "dummy", - "body": "Original body", - "user_id": str(self.user.id), - "username": self.user.username, - "course_id": str(self.course.id), - })) - - def save_and_reserialize(self, data, instance=None): - """ - Create a serializer with the given data, ensure that it is valid, save - the result, and return the full comment data from the serializer. - """ - context = get_context( - self.course, - self.request, - make_minimal_cs_thread({"course_id": str(self.course.id)}) - ) - serializer = CommentSerializer( - instance, - data=data, - partial=(instance is not None), - context=context - ) - assert serializer.is_valid() - serializer.save() - return serializer.data - - def test_create_missing_field(self): - for field in self.minimal_data: - data = self.minimal_data.copy() - data.pop(field) - serializer = CommentSerializer( - data=data, - context=get_context(self.course, self.request, make_minimal_cs_thread()) - ) - assert not serializer.is_valid() - assert serializer.errors == {field: ['This field is required.']} - - def test_update_empty(self): - self.register_put_comment_response(self.existing_comment.attributes) - self.save_and_reserialize({}, instance=self.existing_comment) - assert parsed_body(httpretty.last_request()) == { - 'body': ['Original body'], - 'course_id': [str(self.course.id)], - 'user_id': [str(self.user.id)], - 'anonymous': ['False'], - 'anonymous_to_peers': ['False'], - 'endorsed': ['False'] - } - - def test_update_anonymous(self): - """ - Test that serializer correctly deserializes the anonymous field when - updating an existing comment. - """ - self.register_put_comment_response(self.existing_comment.attributes) - data = { - "anonymous": True, - } - self.save_and_reserialize(data, self.existing_comment) - assert parsed_body(httpretty.last_request())["anonymous"] == ['True'] - - def test_update_anonymous_to_peers(self): - """ - Test that serializer correctly deserializes the anonymous_to_peers - field when updating an existing comment. - """ - self.register_put_comment_response(self.existing_comment.attributes) - data = { - "anonymous_to_peers": True, - } - self.save_and_reserialize(data, self.existing_comment) - assert parsed_body(httpretty.last_request())["anonymous_to_peers"] == ['True'] - - @ddt.data("thread_id", "parent_id") - def test_update_non_updatable(self, field): - serializer = CommentSerializer( - self.existing_comment, - data={field: "different_value"}, - partial=True, - context=get_context(self.course, self.request) - ) - assert not serializer.is_valid() - assert serializer.errors == {field: ['This field is not allowed in an update.']} - - -class FilterSpamTest(SharedModuleStoreTestCase): - """ - Tests for the filter_spam method - """ - @override_settings(DISCUSSION_SPAM_URLS=['example.com']) - def test_filter(self): - self.assertEqual( - filter_spam_urls_from_html('')[0], - 'Test body
", + "endorsed": False, + "endorsed_by": None, + "endorsed_by_label": None, + "endorsed_at": None, + "abuse_flagged": False, + "abuse_flagged_any_user": None, + "voted": False, + "vote_count": 4, + "children": [], + "editable_fields": ["abuse_flagged", "voted"], + "child_count": 0, + "can_delete": False, + "last_edit": None, + "edit_by_label": None, + "profile_image": { + "has_image": False, + "image_url_full": "http://testserver/static/default_500.png", + "image_url_large": "http://testserver/static/default_120.png", + "image_url_medium": "http://testserver/static/default_50.png", + "image_url_small": "http://testserver/static/default_30.png", + }, + } + + assert self.serialize(comment) == expected + + @ddt.data( + *itertools.product( + [ + FORUM_ROLE_ADMINISTRATOR, + FORUM_ROLE_MODERATOR, + FORUM_ROLE_COMMUNITY_TA, + FORUM_ROLE_STUDENT, + ], + [True, False] + ) + ) + @ddt.unpack + def test_endorsed_by(self, endorser_role_name, thread_anonymous): + """ + Test correctness of the endorsed_by field. + + The endorser should be anonymous iff the thread is anonymous to the + requester, and the endorser is not a privileged user. + + endorser_role_name is the name of the endorser's role. + thread_anonymous is the value of the anonymous field in the thread. + """ + self.register_get_user_response(self.user) + self.create_role(endorser_role_name, [self.endorser]) + serialized = self.serialize( + self.make_cs_content(with_endorsement=True), + thread_data={"anonymous": thread_anonymous} + ) + actual_endorser_anonymous = serialized["endorsed_by"] is None + expected_endorser_anonymous = endorser_role_name == FORUM_ROLE_STUDENT and thread_anonymous + assert actual_endorser_anonymous == expected_endorser_anonymous + + @ddt.data( + (FORUM_ROLE_ADMINISTRATOR, "Moderator"), + (FORUM_ROLE_MODERATOR, "Moderator"), + (FORUM_ROLE_COMMUNITY_TA, "Community TA"), + (FORUM_ROLE_STUDENT, None), + ) + @ddt.unpack + def test_endorsed_by_labels(self, role_name, expected_label): + """ + Test correctness of the endorsed_by_label field. + + The label should be "Staff", "Moderator", or "Community TA" for the + Administrator, Moderator, and Community TA roles, respectively. + + role_name is the name of the author's role. + expected_label is the expected value of the author_label field in the + API output. + """ + self.register_get_user_response(self.user) + self.create_role(role_name, [self.endorser]) + serialized = self.serialize(self.make_cs_content(with_endorsement=True)) + assert serialized['endorsed_by_label'] == expected_label + + def test_endorsed_at(self): + self.register_get_user_response(self.user) + serialized = self.serialize(self.make_cs_content(with_endorsement=True)) + assert serialized['endorsed_at'] == self.endorsed_at + + def test_children(self): + self.register_get_user_response(self.user) + comment = self.make_cs_content({ + "id": "test_root", + "children": [ + self.make_cs_content({ + "id": "test_child_1", + "parent_id": "test_root", + }), + self.make_cs_content({ + "id": "test_child_2", + "parent_id": "test_root", + "children": [ + self.make_cs_content({ + "id": "test_grandchild", + "parent_id": "test_child_2" + }) + ], + }), + ], + }) + serialized = self.serialize(comment) + assert serialized['children'][0]['id'] == 'test_child_1' + assert serialized['children'][0]['parent_id'] == 'test_root' + assert serialized['children'][1]['id'] == 'test_child_2' + assert serialized['children'][1]['parent_id'] == 'test_root' + assert serialized['children'][1]['children'][0]['id'] == 'test_grandchild' + assert serialized['children'][1]['children'][0]['parent_id'] == 'test_child_2' + + +@ddt.ddt +class ThreadSerializerSerializationTest(SerializerTestMixin, SharedModuleStoreTestCase, ForumMockUtilsMixin): + """Tests for ThreadSerializer serialization.""" + + def make_cs_content(self, overrides): + """ + Create a thread with the given overrides, plus some useful test data. + """ + merged_overrides = { + "course_id": str(self.course.id), + "user_id": str(self.author.id), + "username": self.author.username, + "read": True, + "endorsed": True, + "resp_total": 0, + } + merged_overrides.update(overrides) + return make_minimal_cs_thread(merged_overrides) + + def serialize(self, thread): + """ + Create a serializer with an appropriate context and use it to serialize + the given thread, returning the result. + """ + return ThreadSerializer(thread, context=get_context(self.course, self.request)).data + + def test_basic(self): + thread = make_minimal_cs_thread({ + "id": "test_thread", + "course_id": str(self.course.id), + "commentable_id": "test_topic", + "user_id": str(self.author.id), + "username": self.author.username, + "title": "Test Title", + "body": "Test body", + "pinned": True, + "votes": {"up_count": 4}, + "comments_count": 5, + "unread_comments_count": 3, + }) + expected = self.expected_thread_data({ + "author": self.author.username, + "can_delete": False, + "vote_count": 4, + "comment_count": 6, + "unread_comment_count": 3, + "pinned": True, + "editable_fields": ["abuse_flagged", "copy_link", "following", "read", "voted"], + "abuse_flagged_count": None, + "edit_by_label": None, + "closed_by_label": None, + }) + assert self.serialize(thread) == expected + + thread["thread_type"] = "question" + expected.update({ + "type": "question", + "comment_list_url": None, + "endorsed_comment_list_url": ( + "http://testserver/api/discussion/v1/comments/?thread_id=test_thread&endorsed=True" + ), + "non_endorsed_comment_list_url": ( + "http://testserver/api/discussion/v1/comments/?thread_id=test_thread&endorsed=False" + ), + }) + assert self.serialize(thread) == expected + + def test_pinned_missing(self): + """ + Make sure that older threads in the comments service without the pinned + field do not break serialization + """ + thread_data = self.make_cs_content({}) + del thread_data["pinned"] + self.register_get_thread_response(thread_data) + serialized = self.serialize(thread_data) + assert serialized['pinned'] is False + + def test_group(self): + self.course.cohort_config = {"cohorted": True} + modulestore().update_item(self.course, ModuleStoreEnum.UserID.test) + cohort = CohortFactory.create(course_id=self.course.id) + serialized = self.serialize(self.make_cs_content({"group_id": cohort.id})) + assert serialized['group_id'] == cohort.id + assert serialized['group_name'] == cohort.name + + def test_following(self): + thread_id = "test_thread" + self.register_get_user_response(self.user, subscribed_thread_ids=[thread_id]) + serialized = self.serialize(self.make_cs_content({"id": thread_id})) + assert serialized['following'] is True + + def test_response_count(self): + thread_data = self.make_cs_content({"resp_total": 2}) + self.register_get_thread_response(thread_data) + serialized = self.serialize(thread_data) + assert serialized['response_count'] == 2 + + def test_response_count_missing(self): + thread_data = self.make_cs_content({}) + del thread_data["resp_total"] + self.register_get_thread_response(thread_data) + serialized = self.serialize(thread_data) + assert 'response_count' not in serialized + + @ddt.data( + (FORUM_ROLE_MODERATOR, True), + (FORUM_ROLE_STUDENT, False), + ("author", True), + ) + @ddt.unpack + def test_closed_by_label_field(self, role, visible): + """ + Tests if closed by field is visible to author and priviledged users + """ + moderator = UserFactory() + request_role = FORUM_ROLE_STUDENT if role == "author" else role + author = self.user if role == "author" else self.author + self.create_role(FORUM_ROLE_MODERATOR, [moderator]) + self.create_role(request_role, [self.user]) + + thread = make_minimal_cs_thread({ + "id": "test_thread", + "course_id": str(self.course.id), + "commentable_id": "test_topic", + "user_id": str(author.id), + "username": author.username, + "title": "Test Title", + "body": "Test body", + "pinned": True, + "votes": {"up_count": 4}, + "comments_count": 5, + "unread_comments_count": 3, + "closed_by": moderator + }) + closed_by_label = "Moderator" if visible else None + closed_by = moderator if visible else None + can_delete = role != FORUM_ROLE_STUDENT + editable_fields = ["abuse_flagged", "copy_link", "following", "read", "voted"] + if role == "author": + editable_fields.remove("voted") + editable_fields.extend(['anonymous', 'raw_body', 'title', 'topic_id', 'type']) + elif role == FORUM_ROLE_MODERATOR: + editable_fields.extend(['close_reason_code', 'closed', 'edit_reason_code', 'pinned', + 'raw_body', 'title', 'topic_id', 'type']) + expected = self.expected_thread_data({ + "author": author.username, + "can_delete": can_delete, + "vote_count": 4, + "comment_count": 6, + "unread_comment_count": 3, + "pinned": True, + "editable_fields": sorted(editable_fields), + "abuse_flagged_count": None, + "edit_by_label": None, + "closed_by_label": closed_by_label, + "closed_by": closed_by, + }) + assert self.serialize(thread) == expected + + @ddt.data( + (FORUM_ROLE_MODERATOR, True), + (FORUM_ROLE_STUDENT, False), + ("author", True), + ) + @ddt.unpack + def test_edit_by_label_field(self, role, visible): + """ + Tests if closed by field is visible to author and priviledged users + """ + moderator = UserFactory() + request_role = FORUM_ROLE_STUDENT if role == "author" else role + author = self.user if role == "author" else self.author + self.create_role(FORUM_ROLE_MODERATOR, [moderator]) + self.create_role(request_role, [self.user]) + + thread = make_minimal_cs_thread({ + "id": "test_thread", + "course_id": str(self.course.id), + "commentable_id": "test_topic", + "user_id": str(author.id), + "username": author.username, + "title": "Test Title", + "body": "Test body", + "pinned": True, + "votes": {"up_count": 4}, + "edit_history": [{"editor_username": moderator}], + "comments_count": 5, + "unread_comments_count": 3, + "closed_by": None + }) + edit_by_label = "Moderator" if visible else None + can_delete = role != FORUM_ROLE_STUDENT + last_edit = None if role == FORUM_ROLE_STUDENT else {"editor_username": moderator} + editable_fields = ["abuse_flagged", "copy_link", "following", "read", "voted"] + + if role == "author": + editable_fields.remove("voted") + editable_fields.extend(['anonymous', 'raw_body', 'title', 'topic_id', 'type']) + + elif role == FORUM_ROLE_MODERATOR: + editable_fields.extend(['close_reason_code', 'closed', 'edit_reason_code', 'pinned', + 'raw_body', 'title', 'topic_id', 'type']) + + expected = self.expected_thread_data({ + "author": author.username, + "can_delete": can_delete, + "vote_count": 4, + "comment_count": 6, + "unread_comment_count": 3, + "pinned": True, + "editable_fields": sorted(editable_fields), + "abuse_flagged_count": None, + "last_edit": last_edit, + "edit_by_label": edit_by_label, + "closed_by_label": None, + "closed_by": None, + }) + assert self.serialize(thread) == expected + + def test_get_preview_body(self): + """ + Test for the 'get_preview_body' method. + + This test verifies that the 'get_preview_body' method returns a cleaned + version of the thread's body that is suitable for display as a preview. + The test specifically focuses on handling the presence of multiple + spaces within the body. + """ + thread_data = self.make_cs_content( + {"body": "This is a test thread body with some text.
"} + ) + serialized = self.serialize(thread_data) + assert serialized['preview_body'] == "This is a test thread body with some text." diff --git a/lms/djangoapps/discussion/rest_api/tests/test_tasks_v2.py b/lms/djangoapps/discussion/rest_api/tests/test_tasks_v2.py index 153ba15604..09339558c4 100644 --- a/lms/djangoapps/discussion/rest_api/tests/test_tasks_v2.py +++ b/lms/djangoapps/discussion/rest_api/tests/test_tasks_v2.py @@ -60,46 +60,19 @@ class TestSendResponseNotifications(DiscussionAPIViewTestMixin, ModuleStoreTestC self.course = CourseFactory.create() - # Patch 1 - patcher1 = mock.patch( - 'openedx.core.djangoapps.django_comment_common.comment_client.thread.is_forum_v2_enabled_for_thread', - autospec=True - ) - mock_forum_v2 = patcher1.start() - mock_forum_v2.return_value = (True, str(self.course.id)) - self.addCleanup(patcher1.stop) - - # Patch 2 - patcher2 = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher2.start() - self.addCleanup(patcher2.stop) - - # Patch 3 - patcher3 = mock.patch( + patcher = mock.patch( "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread", return_value=self.course.id ) - self.mock_get_course_id_by_thread = patcher3.start() - self.addCleanup(patcher3.stop) + self.mock_get_course_id_by_thread = patcher.start() + self.addCleanup(patcher.stop) - # Patch 4 - patcher4 = mock.patch( + patcher = mock.patch( "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment", return_value=self.course.id ) - self.mock_get_course_id_by_comment = patcher4.start() - self.addCleanup(patcher4.stop) - - # Patch 5 - patcher5 = mock.patch( - "openedx.core.djangoapps.django_comment_common.comment_client.models.is_forum_v2_enabled_for_comment", - return_value=(True, str(self.course.id)) - ) - self.mock_is_forum_v2_enabled_for_comment = patcher5.start() - self.addCleanup(patcher5.stop) + self.mock_get_course_id_by_comment = patcher.start() + self.addCleanup(patcher.stop) self.user_1 = UserFactory.create() CourseEnrollment.enroll(self.user_1, self.course.id) @@ -410,20 +383,6 @@ class TestSendCommentNotification(DiscussionAPIViewTestMixin, ModuleStoreTestCas super().setUp() httpretty.reset() httpretty.enable() - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) - - patcher = mock.patch( - 'openedx.core.djangoapps.django_comment_common.comment_client.thread.is_forum_v2_enabled_for_thread', - autospec=True - ) - mock_forum_v2 = patcher.start() - mock_forum_v2.return_value = (True, str(self.course.id)) - self.addCleanup(patcher.stop) self.course = CourseFactory.create() patcher = mock.patch( @@ -439,13 +398,6 @@ class TestSendCommentNotification(DiscussionAPIViewTestMixin, ModuleStoreTestCas self.mock_get_course_id_by_comment = patcher.start() self.addCleanup(patcher.stop) - patcher = mock.patch( - "openedx.core.djangoapps.django_comment_common.comment_client.models.is_forum_v2_enabled_for_comment", - return_value=(True, str(self.course.id)) - ) - self.mock_is_forum_v2_enabled_for_comment = patcher.start() - self.addCleanup(patcher.stop) - self.user_1 = UserFactory.create() CourseEnrollment.enroll(self.user_1, self.course.id) self.user_2 = UserFactory.create() diff --git a/lms/djangoapps/discussion/rest_api/tests/test_views.py b/lms/djangoapps/discussion/rest_api/tests/test_views.py index be8a793abc..18a180b43a 100644 --- a/lms/djangoapps/discussion/rest_api/tests/test_views.py +++ b/lms/djangoapps/discussion/rest_api/tests/test_views.py @@ -2,311 +2,40 @@ Tests for Discussion API views """ - import json -import random from datetime import datetime from unittest import mock -from urllib.parse import parse_qs, urlencode, urlparse +from urllib.parse import urlencode import ddt -import httpretty -from django.core.files.uploadedfile import SimpleUploadedFile -from django.test import override_settings from django.urls import reverse -from edx_toggles.toggles.testutils import override_waffle_flag -from opaque_keys.edx.keys import CourseKey from pytz import UTC from rest_framework import status -from rest_framework.test import APIClient, APITestCase -from lms.djangoapps.discussion.toggles import ENABLE_DISCUSSIONS_MFE -from lms.djangoapps.discussion.rest_api.utils import get_usernames_from_search_string -from xmodule.modulestore import ModuleStoreEnum -from xmodule.modulestore.django import modulestore -from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, SharedModuleStoreTestCase -from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory, check_mongo_calls +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase +from xmodule.modulestore.tests.factories import CourseFactory -from common.djangoapps.course_modes.models import CourseMode -from common.djangoapps.course_modes.tests.factories import CourseModeFactory -from common.djangoapps.student.models import get_retired_username_by_username, CourseEnrollment from common.djangoapps.student.roles import CourseInstructorRole, CourseStaffRole, GlobalStaff from common.djangoapps.student.tests.factories import ( - AdminFactory, CourseEnrollmentFactory, - SuperuserFactory, UserFactory ) from common.djangoapps.util.testing import UrlResetMixin from lms.djangoapps.discussion.django_comment_client.tests.utils import ( ForumsEnableMixin, - config_course_discussions, - topic_name_to_id, ) from lms.djangoapps.discussion.rest_api.tests.utils import ( - CommentsServiceMockMixin, + ForumMockUtilsMixin, make_minimal_cs_comment, make_minimal_cs_thread, ) -from openedx.core.djangoapps.course_groups.tests.helpers import config_course_cohorts -from openedx.core.djangoapps.discussions.config.waffle import ENABLE_NEW_STRUCTURE_DISCUSSIONS -from openedx.core.djangoapps.discussions.models import DiscussionsConfiguration, DiscussionTopicLink, Provider -from openedx.core.djangoapps.discussions.tasks import update_discussions_settings_from_course_task -from openedx.core.djangoapps.django_comment_common.models import ( - CourseDiscussionSettings, - Role, -) -from openedx.core.djangoapps.django_comment_common.utils import seed_permissions_roles -from openedx.core.djangoapps.oauth_dispatch.jwt import create_jwt_for_user -from openedx.core.djangoapps.oauth_dispatch.tests.factories import AccessTokenFactory, ApplicationFactory -from openedx.core.djangoapps.user_api.models import RetirementState, UserRetirementStatus - - -class DiscussionAPIViewTestMixin(ForumsEnableMixin, CommentsServiceMockMixin, UrlResetMixin): - """ - Mixin for common code in tests of Discussion API views. This includes - creation of common structures (e.g. a course, user, and enrollment), logging - in the test client, utility functions, and a test case for unauthenticated - requests. Subclasses must set self.url in their setUp methods. - """ - - client_class = APIClient - - @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) - def setUp(self): - super().setUp() - self.maxDiff = None # pylint: disable=invalid-name - self.course = CourseFactory.create( - org="x", - course="y", - run="z", - start=datetime.now(UTC), - discussion_topics={"Test Topic": {"id": "test_topic"}} - ) - self.password = "Password1234" - self.user = UserFactory.create(password=self.password) - # Ensure that parental controls don't apply to this user - self.user.profile.year_of_birth = 1970 - self.user.profile.save() - CourseEnrollmentFactory.create(user=self.user, course_id=self.course.id) - self.client.login(username=self.user.username, password=self.password) - - def assert_response_correct(self, response, expected_status, expected_content): - """ - Assert that the response has the given status code and parsed content - """ - assert response.status_code == expected_status - parsed_content = json.loads(response.content.decode('utf-8')) - assert parsed_content == expected_content - - def register_thread(self, overrides=None): - """ - Create cs_thread with minimal fields and register response - """ - cs_thread = make_minimal_cs_thread({ - "id": "test_thread", - "course_id": str(self.course.id), - "commentable_id": "test_topic", - "username": self.user.username, - "user_id": str(self.user.id), - "thread_type": "discussion", - "title": "Test Title", - "body": "Test body", - }) - cs_thread.update(overrides or {}) - self.register_get_thread_response(cs_thread) - self.register_put_thread_response(cs_thread) - - def register_comment(self, overrides=None): - """ - Create cs_comment with minimal fields and register response - """ - cs_comment = make_minimal_cs_comment({ - "id": "test_comment", - "course_id": str(self.course.id), - "thread_id": "test_thread", - "username": self.user.username, - "user_id": str(self.user.id), - "body": "Original body", - }) - cs_comment.update(overrides or {}) - self.register_get_comment_response(cs_comment) - self.register_put_comment_response(cs_comment) - self.register_post_comment_response(cs_comment, thread_id="test_thread") - - def test_not_authenticated(self): - self.client.logout() - response = self.client.get(self.url) - self.assert_response_correct( - response, - 401, - {"developer_message": "Authentication credentials were not provided."} - ) - - def test_inactive(self): - self.user.is_active = False - self.test_basic() - - -@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) -class UploadFileViewTest(ForumsEnableMixin, CommentsServiceMockMixin, UrlResetMixin, ModuleStoreTestCase): - """ - Tests for UploadFileView. - """ - - @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) - def setUp(self): - super().setUp() - self.valid_file = { - "uploaded_file": SimpleUploadedFile( - "test.jpg", - b"test content", - content_type="image/jpeg", - ), - } - self.user = UserFactory.create(password=self.TEST_PASSWORD) - self.course = CourseFactory.create(org='a', course='b', run='c', start=datetime.now(UTC)) - self.url = reverse("upload_file", kwargs={"course_id": str(self.course.id)}) - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) - - def user_login(self): - """ - Authenticates the test client with the example user. - """ - self.client.login(username=self.user.username, password=self.TEST_PASSWORD) - - def enroll_user_in_course(self): - """ - Makes the example user enrolled to the course. - """ - CourseEnrollmentFactory.create(user=self.user, course_id=self.course.id) - - def assert_upload_success(self, response): - """ - Asserts that the upload response was successful and returned the - expected contents. - """ - assert response.status_code == status.HTTP_200_OK - assert response.content_type == "application/json" - response_data = json.loads(response.content) - assert "location" in response_data - - def test_file_upload_by_unauthenticated_user(self): - """ - Should fail if an unauthenticated user tries to upload a file. - """ - response = self.client.post(self.url, self.valid_file) - assert response.status_code == status.HTTP_401_UNAUTHORIZED - - def test_file_upload_by_unauthorized_user(self): - """ - Should fail if the user is not either staff or a student - enrolled in the course. - """ - self.user_login() - response = self.client.post(self.url, self.valid_file) - assert response.status_code == status.HTTP_403_FORBIDDEN - - def test_file_upload_by_enrolled_user(self): - """ - Should succeed when a valid file is uploaded by an authenticated - user who's enrolled in the course. - """ - self.user_login() - self.enroll_user_in_course() - response = self.client.post(self.url, self.valid_file) - self.assert_upload_success(response) - - def test_file_upload_by_global_staff(self): - """ - Should succeed when a valid file is uploaded by a global staff - member. - """ - self.user_login() - GlobalStaff().add_users(self.user) - response = self.client.post(self.url, self.valid_file) - self.assert_upload_success(response) - - def test_file_upload_by_instructor(self): - """ - Should succeed when a valid file is uploaded by a course instructor. - """ - self.user_login() - CourseInstructorRole(course_key=self.course.id).add_users(self.user) - response = self.client.post(self.url, self.valid_file) - self.assert_upload_success(response) - - def test_file_upload_by_course_staff(self): - """ - Should succeed when a valid file is uploaded by a course staff - member. - """ - self.user_login() - CourseStaffRole(course_key=self.course.id).add_users(self.user) - response = self.client.post(self.url, self.valid_file) - self.assert_upload_success(response) - - def test_file_upload_with_thread_key(self): - """ - Should contain the given thread_key in the uploaded file name. - """ - self.user_login() - self.enroll_user_in_course() - response = self.client.post(self.url, { - **self.valid_file, - "thread_key": "somethread", - }) - response_data = json.loads(response.content) - assert "/somethread/" in response_data["location"] - - def test_file_upload_with_invalid_file(self): - """ - Should fail if the uploaded file format is not allowed. - """ - self.user_login() - self.enroll_user_in_course() - invalid_file = { - "uploaded_file": SimpleUploadedFile( - "test.txt", - b"test content", - content_type="text/plain", - ), - } - response = self.client.post(self.url, invalid_file) - assert response.status_code == status.HTTP_403_FORBIDDEN - - def test_file_upload_with_invalid_course_id(self): - """ - Should fail if the course does not exist. - """ - self.user_login() - self.enroll_user_in_course() - url = reverse("upload_file", kwargs={"course_id": "d/e/f"}) - response = self.client.post(url, self.valid_file) - assert response.status_code == status.HTTP_403_FORBIDDEN - - def test_file_upload_with_no_data(self): - """ - Should fail when the user sends a request missing an - `uploaded_file` field. - """ - self.user_login() - self.enroll_user_in_course() - response = self.client.post(self.url, data={}) - assert response.status_code == status.HTTP_400_BAD_REQUEST @ddt.ddt @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) -@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_FORUM_V2": False}) class CommentViewSetListByUserTest( ForumsEnableMixin, - CommentsServiceMockMixin, + ForumMockUtilsMixin, UrlResetMixin, ModuleStoreTestCase, ): @@ -314,21 +43,20 @@ class CommentViewSetListByUserTest( Common test cases for views retrieving user-published content. """ + @classmethod + def setUpClass(cls): + super().setUpClass() + super().setUpClassAndForumMock() + + @classmethod + def tearDownClass(cls): + super().tearDownClass() + super().disposeForumMocks() + @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) def setUp(self): super().setUp() - httpretty.reset() - httpretty.enable() - self.addCleanup(httpretty.reset) - self.addCleanup(httpretty.disable) - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) - self.user = UserFactory.create(password=self.TEST_PASSWORD) self.register_get_user_response(self.user) @@ -498,1530 +226,3 @@ class CommentViewSetListByUserTest( url = self.build_url(self.user.username, self.course.id, page=2) response = self.client.get(url) assert response.status_code == status.HTTP_404_NOT_FOUND - - -@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) -@override_settings(DISCUSSION_MODERATION_EDIT_REASON_CODES={"test-edit-reason": "Test Edit Reason"}) -@override_settings(DISCUSSION_MODERATION_CLOSE_REASON_CODES={"test-close-reason": "Test Close Reason"}) -class CourseViewTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase): - """Tests for CourseView""" - - def setUp(self): - super().setUp() - self.url = reverse("discussion_course", kwargs={"course_id": str(self.course.id)}) - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) - - def test_404(self): - response = self.client.get( - reverse("course_topics", kwargs={"course_id": "non/existent/course"}) - ) - self.assert_response_correct( - response, - 404, - {"developer_message": "Course not found."} - ) - - def test_basic(self): - response = self.client.get(self.url) - self.assert_response_correct( - response, - 200, - { - "id": str(self.course.id), - "is_posting_enabled": True, - "blackouts": [], - "thread_list_url": "http://testserver/api/discussion/v1/threads/?course_id=course-v1%3Ax%2By%2Bz", - "following_thread_list_url": ( - "http://testserver/api/discussion/v1/threads/?course_id=course-v1%3Ax%2By%2Bz&following=True" - ), - "topics_url": "http://testserver/api/discussion/v1/course_topics/course-v1:x+y+z", - "enable_in_context": True, - "group_at_subsection": False, - "provider": "legacy", - "allow_anonymous": True, - "allow_anonymous_to_peers": False, - "has_bulk_delete_privileges": False, - "has_moderation_privileges": False, - 'is_course_admin': False, - 'is_course_staff': False, - "is_group_ta": False, - 'is_user_admin': False, - "user_roles": ["Student"], - "edit_reasons": [{"code": "test-edit-reason", "label": "Test Edit Reason"}], - "post_close_reasons": [{"code": "test-close-reason", "label": "Test Close Reason"}], - 'show_discussions': True, - 'is_notify_all_learners_enabled': False, - 'captcha_settings': { - 'enabled': False, - 'site_key': None, - }, - "is_email_verified": True, - "only_verified_users_can_post": False, - "content_creation_rate_limited": False - } - ) - - -@httpretty.activate -@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) -class RetireViewTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase): - """Tests for CourseView""" - - def setUp(self): - super().setUp() - RetirementState.objects.create(state_name='PENDING', state_execution_order=1) - self.retire_forums_state = RetirementState.objects.create(state_name='RETIRE_FORUMS', state_execution_order=11) - - self.retirement = UserRetirementStatus.create_retirement(self.user) - self.retirement.current_state = self.retire_forums_state - self.retirement.save() - - self.superuser = SuperuserFactory() - self.superuser_client = APIClient() - self.retired_username = get_retired_username_by_username(self.user.username) - self.url = reverse("retire_discussion_user") - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) - - def assert_response_correct(self, response, expected_status, expected_content): - """ - Assert that the response has the given status code and content - """ - assert response.status_code == expected_status - - if expected_content: - assert response.content.decode('utf-8') == expected_content - - def build_jwt_headers(self, user): - """ - Helper function for creating headers for the JWT authentication. - """ - token = create_jwt_for_user(user) - headers = {'HTTP_AUTHORIZATION': 'JWT ' + token} - return headers - - def test_basic(self): - """ - Check successful retirement case - """ - self.register_get_user_retire_response(self.user) - headers = self.build_jwt_headers(self.superuser) - data = {'username': self.user.username} - response = self.superuser_client.post(self.url, data, **headers) - self.assert_response_correct(response, 204, b"") - - def test_downstream_forums_error(self): - """ - Check that we bubble up errors from the comments service - """ - self.register_get_user_retire_response(self.user, status=500, body="Server error") - headers = self.build_jwt_headers(self.superuser) - data = {'username': self.user.username} - response = self.superuser_client.post(self.url, data, **headers) - self.assert_response_correct(response, 500, '"Server error"') - - def test_nonexistent_user(self): - """ - Check that we handle unknown users appropriately - """ - nonexistent_username = "nonexistent user" - self.retired_username = get_retired_username_by_username(nonexistent_username) - data = {'username': nonexistent_username} - headers = self.build_jwt_headers(self.superuser) - response = self.superuser_client.post(self.url, data, **headers) - self.assert_response_correct(response, 404, None) - - def test_not_authenticated(self): - """ - Override the parent implementation of this, we JWT auth for this API - """ - pass # lint-amnesty, pylint: disable=unnecessary-pass - - -@ddt.ddt -@httpretty.activate -@mock.patch('django.conf.settings.USERNAME_REPLACEMENT_WORKER', 'test_replace_username_service_worker') -@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) -class ReplaceUsernamesViewTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase): - """Tests for ReplaceUsernamesView""" - - def setUp(self): - super().setUp() - self.worker = UserFactory() - self.worker.username = "test_replace_username_service_worker" - self.worker_client = APIClient() - self.new_username = "test_username_replacement" - self.url = reverse("replace_discussion_username") - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) - - def assert_response_correct(self, response, expected_status, expected_content): - """ - Assert that the response has the given status code and content - """ - assert response.status_code == expected_status - - if expected_content: - assert str(response.content) == expected_content - - def build_jwt_headers(self, user): - """ - Helper function for creating headers for the JWT authentication. - """ - token = create_jwt_for_user(user) - headers = {'HTTP_AUTHORIZATION': 'JWT ' + token} - return headers - - def call_api(self, user, client, data): - """ Helper function to call API with data """ - data = json.dumps(data) - headers = self.build_jwt_headers(user) - return client.post(self.url, data, content_type='application/json', **headers) - - @ddt.data( - [{}, {}], - {}, - [{"test_key": "test_value", "test_key_2": "test_value_2"}] - ) - def test_bad_schema(self, mapping_data): - """ Verify the endpoint rejects bad data schema """ - data = { - "username_mappings": mapping_data - } - response = self.call_api(self.worker, self.worker_client, data) - assert response.status_code == 400 - - def test_auth(self): - """ Verify the endpoint only works with the service worker """ - data = { - "username_mappings": [ - {"test_username_1": "test_new_username_1"}, - {"test_username_2": "test_new_username_2"} - ] - } - - # Test unauthenticated - response = self.client.post(self.url, data) - assert response.status_code == 403 - - # Test non-service worker - random_user = UserFactory() - response = self.call_api(random_user, APIClient(), data) - assert response.status_code == 403 - - # Test service worker - response = self.call_api(self.worker, self.worker_client, data) - assert response.status_code == 200 - - def test_basic(self): - """ Check successful replacement """ - data = { - "username_mappings": [ - {self.user.username: self.new_username}, - ] - } - expected_response = { - 'failed_replacements': [], - 'successful_replacements': data["username_mappings"] - } - self.register_get_username_replacement_response(self.user) - response = self.call_api(self.worker, self.worker_client, data) - assert response.status_code == 200 - assert response.data == expected_response - - def test_not_authenticated(self): - """ - Override the parent implementation of this, we JWT auth for this API - """ - pass # lint-amnesty, pylint: disable=unnecessary-pass - - -@ddt.ddt -@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) -class CourseTopicsViewTest(DiscussionAPIViewTestMixin, CommentsServiceMockMixin, ModuleStoreTestCase): - """ - Tests for CourseTopicsView - """ - - def setUp(self): - httpretty.reset() - httpretty.enable() - self.addCleanup(httpretty.reset) - self.addCleanup(httpretty.disable) - super().setUp() - self.url = reverse("course_topics", kwargs={"course_id": str(self.course.id)}) - self.thread_counts_map = { - "courseware-1": {"discussion": 2, "question": 3}, - "courseware-2": {"discussion": 4, "question": 5}, - "courseware-3": {"discussion": 7, "question": 2}, - } - self.register_get_course_commentable_counts_response(self.course.id, self.thread_counts_map) - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) - - def create_course(self, blocks_count, module_store, topics): - """ - Create a course in a specified module store with discussion xblocks and topics - """ - course = CourseFactory.create( - org="a", - course="b", - run="c", - start=datetime.now(UTC), - default_store=module_store, - discussion_topics=topics - ) - CourseEnrollmentFactory.create(user=self.user, course_id=course.id) - course_url = reverse("course_topics", kwargs={"course_id": str(course.id)}) - # add some discussion xblocks - for i in range(blocks_count): - BlockFactory.create( - parent_location=course.location, - category='discussion', - discussion_id=f'id_module_{i}', - discussion_category=f'Category {i}', - discussion_target=f'Discussion {i}', - publish_item=False, - ) - return course_url, course.id - - def make_discussion_xblock(self, topic_id, category, subcategory, **kwargs): - """ - Build a discussion xblock in self.course - """ - BlockFactory.create( - parent_location=self.course.location, - category="discussion", - discussion_id=topic_id, - discussion_category=category, - discussion_target=subcategory, - **kwargs - ) - - def test_404(self): - response = self.client.get( - reverse("course_topics", kwargs={"course_id": "non/existent/course"}) - ) - self.assert_response_correct( - response, - 404, - {"developer_message": "Course not found."} - ) - - def test_basic(self): - response = self.client.get(self.url) - self.assert_response_correct( - response, - 200, - { - "courseware_topics": [], - "non_courseware_topics": [{ - "id": "test_topic", - "name": "Test Topic", - "children": [], - "thread_list_url": 'http://testserver/api/discussion/v1/threads/' - '?course_id=course-v1%3Ax%2By%2Bz&topic_id=test_topic', - "thread_counts": {"discussion": 0, "question": 0}, - }], - } - ) - - @ddt.data( - (2, ModuleStoreEnum.Type.split, 2, {"Test Topic 1": {"id": "test_topic_1"}}), - (2, ModuleStoreEnum.Type.split, 2, - {"Test Topic 1": {"id": "test_topic_1"}, "Test Topic 2": {"id": "test_topic_2"}}), - (10, ModuleStoreEnum.Type.split, 2, {"Test Topic 1": {"id": "test_topic_1"}}), - ) - @ddt.unpack - def test_bulk_response(self, blocks_count, module_store, mongo_calls, topics): - course_url, course_id = self.create_course(blocks_count, module_store, topics) - self.register_get_course_commentable_counts_response(course_id, {}) - with check_mongo_calls(mongo_calls): - with modulestore().default_store(module_store): - self.client.get(course_url) - - def test_discussion_topic_404(self): - """ - Tests discussion topic does not exist for the given topic id. - """ - topic_id = "courseware-topic-id" - self.make_discussion_xblock(topic_id, "test_category", "test_target") - url = f"{self.url}?topic_id=invalid_topic_id" - response = self.client.get(url) - self.assert_response_correct( - response, - 404, - {"developer_message": "Discussion not found for 'invalid_topic_id'."} - ) - - def test_topic_id(self): - """ - Tests discussion topic details against a requested topic id - """ - topic_id_1 = "topic_id_1" - topic_id_2 = "topic_id_2" - self.make_discussion_xblock(topic_id_1, "test_category_1", "test_target_1") - self.make_discussion_xblock(topic_id_2, "test_category_2", "test_target_2") - url = f"{self.url}?topic_id=topic_id_1,topic_id_2" - response = self.client.get(url) - self.assert_response_correct( - response, - 200, - { - "non_courseware_topics": [], - "courseware_topics": [ - { - "children": [{ - "children": [], - "id": "topic_id_1", - "thread_list_url": "http://testserver/api/discussion/v1/threads/?" - "course_id=course-v1%3Ax%2By%2Bz&topic_id=topic_id_1", - "name": "test_target_1", - "thread_counts": {"discussion": 0, "question": 0}, - }], - "id": None, - "thread_list_url": "http://testserver/api/discussion/v1/threads/?" - "course_id=course-v1%3Ax%2By%2Bz&topic_id=topic_id_1", - "name": "test_category_1", - "thread_counts": None, - }, - { - "children": - [{ - "children": [], - "id": "topic_id_2", - "thread_list_url": "http://testserver/api/discussion/v1/threads/?" - "course_id=course-v1%3Ax%2By%2Bz&topic_id=topic_id_2", - "name": "test_target_2", - "thread_counts": {"discussion": 0, "question": 0}, - }], - "id": None, - "thread_list_url": "http://testserver/api/discussion/v1/threads/?" - "course_id=course-v1%3Ax%2By%2Bz&topic_id=topic_id_2", - "name": "test_category_2", - "thread_counts": None, - } - ] - } - ) - - @override_waffle_flag(ENABLE_NEW_STRUCTURE_DISCUSSIONS, True) - def test_new_course_structure_response(self): - """ - Tests whether the new structure is available on old topics API - (For mobile compatibility) - """ - chapter = BlockFactory.create( - parent_location=self.course.location, - category='chapter', - display_name="Week 1", - start=datetime(2015, 3, 1, tzinfo=UTC), - ) - sequential = BlockFactory.create( - parent_location=chapter.location, - category='sequential', - display_name="Lesson 1", - start=datetime(2015, 3, 1, tzinfo=UTC), - ) - BlockFactory.create( - parent_location=sequential.location, - category='vertical', - display_name='vertical', - start=datetime(2015, 4, 1, tzinfo=UTC), - ) - DiscussionsConfiguration.objects.create( - context_key=self.course.id, - provider_type=Provider.OPEN_EDX - ) - update_discussions_settings_from_course_task(str(self.course.id)) - response = json.loads(self.client.get(self.url).content.decode()) - keys = ['children', 'id', 'name', 'thread_counts', 'thread_list_url'] - assert list(response.keys()) == ['courseware_topics', 'non_courseware_topics'] - assert len(response['courseware_topics']) == 1 - courseware_keys = list(response['courseware_topics'][0].keys()) - courseware_keys.sort() - assert courseware_keys == keys - assert len(response['non_courseware_topics']) == 1 - non_courseware_keys = list(response['non_courseware_topics'][0].keys()) - non_courseware_keys.sort() - assert non_courseware_keys == keys - - -@ddt.ddt -@mock.patch('lms.djangoapps.discussion.rest_api.api._get_course', mock.Mock()) -@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) -@override_waffle_flag(ENABLE_NEW_STRUCTURE_DISCUSSIONS, True) -class CourseTopicsViewV3Test(DiscussionAPIViewTestMixin, CommentsServiceMockMixin, ModuleStoreTestCase): - """ - Tests for CourseTopicsViewV3 - """ - - def setUp(self) -> None: - super().setUp() - self.password = self.TEST_PASSWORD - self.user = UserFactory.create(password=self.password) - self.client.login(username=self.user.username, password=self.password) - self.staff = AdminFactory.create() - self.course = CourseFactory.create( - start=datetime(2020, 1, 1), - end=datetime(2028, 1, 1), - enrollment_start=datetime(2020, 1, 1), - enrollment_end=datetime(2028, 1, 1), - discussion_topics={"Course Wide Topic": { - "id": 'course-wide-topic', - "usage_key": None, - }} - ) - self.chapter = BlockFactory.create( - parent_location=self.course.location, - category='chapter', - display_name="Week 1", - start=datetime(2015, 3, 1, tzinfo=UTC), - ) - self.sequential = BlockFactory.create( - parent_location=self.chapter.location, - category='sequential', - display_name="Lesson 1", - start=datetime(2015, 3, 1, tzinfo=UTC), - ) - self.verticals = [ - BlockFactory.create( - parent_location=self.sequential.location, - category='vertical', - display_name='vertical', - start=datetime(2015, 4, 1, tzinfo=UTC), - ) - ] - course_key = self.course.id - self.config = DiscussionsConfiguration.objects.create(context_key=course_key, provider_type=Provider.OPEN_EDX) - topic_links = [] - update_discussions_settings_from_course_task(str(course_key)) - topic_id_query = DiscussionTopicLink.objects.filter(context_key=course_key).values_list( - 'external_id', flat=True, - ) - topic_ids = list(topic_id_query.order_by('ordering')) - DiscussionTopicLink.objects.bulk_create(topic_links) - self.topic_stats = { - **{topic_id: dict(discussion=random.randint(0, 10), question=random.randint(0, 10)) - for topic_id in set(topic_ids)}, - topic_ids[0]: dict(discussion=0, question=0), - } - patcher = mock.patch( - 'lms.djangoapps.discussion.rest_api.api.get_course_commentable_counts', - mock.Mock(return_value=self.topic_stats), - ) - patcher.start() - self.addCleanup(patcher.stop) - self.url = reverse("course_topics_v3", kwargs={"course_id": str(self.course.id)}) - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) - - def test_basic(self): - response = self.client.get(self.url) - data = json.loads(response.content.decode()) - expected_non_courseware_keys = [ - 'id', 'usage_key', 'name', 'thread_counts', 'enabled_in_context', - 'courseware' - ] - expected_courseware_keys = [ - 'id', 'block_id', 'lms_web_url', 'legacy_web_url', 'student_view_url', - 'type', 'display_name', 'children', 'courseware' - ] - assert response.status_code == 200 - assert len(data) == 2 - non_courseware_topic_keys = list(data[0].keys()) - assert non_courseware_topic_keys == expected_non_courseware_keys - courseware_topic_keys = list(data[1].keys()) - assert courseware_topic_keys == expected_courseware_keys - expected_courseware_keys.remove('courseware') - sequential_keys = list(data[1]['children'][0].keys()) - assert sequential_keys == (expected_courseware_keys + ['thread_counts']) - expected_non_courseware_keys.remove('courseware') - vertical_keys = list(data[1]['children'][0]['children'][0].keys()) - assert vertical_keys == expected_non_courseware_keys - - -@ddt.ddt -@httpretty.activate -@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) -class LearnerThreadViewAPITest(DiscussionAPIViewTestMixin, ModuleStoreTestCase): - """Tests for LearnerThreadView list""" - - def setUp(self): - """ - Sets up the test case - """ - super().setUp() - self.author = self.user - self.remove_keys = [ - "abuse_flaggers", - "body", - "children", - "commentable_id", - "endorsed", - "last_activity_at", - "resp_total", - "thread_type", - "user_id", - "username", - "votes", - ] - self.replace_keys = [ - {"from": "unread_comments_count", "to": "unread_comment_count"}, - {"from": "comments_count", "to": "comment_count"}, - ] - self.add_keys = [ - {"key": "author", "value": self.author.username}, - {"key": "abuse_flagged", "value": False}, - {"key": "author_label", "value": None}, - {"key": "can_delete", "value": True}, - {"key": "close_reason", "value": None}, - { - "key": "comment_list_url", - "value": "http://testserver/api/discussion/v1/comments/?thread_id=test_thread" - }, - { - "key": "editable_fields", - "value": [ - 'abuse_flagged', 'anonymous', 'copy_link', 'following', 'raw_body', - 'read', 'title', 'topic_id', 'type' - ] - }, - {"key": "endorsed_comment_list_url", "value": None}, - {"key": "following", "value": False}, - {"key": "group_name", "value": None}, - {"key": "has_endorsed", "value": False}, - {"key": "last_edit", "value": None}, - {"key": "non_endorsed_comment_list_url", "value": None}, - {"key": "preview_body", "value": "Test body"}, - {"key": "raw_body", "value": "Test body"}, - - {"key": "rendered_body", "value": "Test body
"}, - {"key": "response_count", "value": 0}, - {"key": "topic_id", "value": "test_topic"}, - {"key": "type", "value": "discussion"}, - {"key": "users", "value": { - self.user.username: { - "profile": { - "image": { - "has_image": False, - "image_url_full": "http://testserver/static/default_500.png", - "image_url_large": "http://testserver/static/default_120.png", - "image_url_medium": "http://testserver/static/default_50.png", - "image_url_small": "http://testserver/static/default_30.png", - } - } - } - }}, - {"key": "vote_count", "value": 4}, - {"key": "voted", "value": False}, - - ] - self.url = reverse("discussion_learner_threads", kwargs={'course_id': str(self.course.id)}) - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) - - def update_thread(self, thread): - """ - This function updates the thread by adding and remove some keys. - Value of these keys has been defined in setUp function - """ - for element in self.add_keys: - thread[element['key']] = element['value'] - for pair in self.replace_keys: - thread[pair['to']] = thread.pop(pair['from']) - for key in self.remove_keys: - thread.pop(key) - thread['comment_count'] += 1 - return thread - - def test_basic(self): - """ - Tests the data is fetched correctly - - Note: test_basic is required as the name because DiscussionAPIViewTestMixin - calls this test case automatically - """ - self.register_get_user_response(self.user) - expected_cs_comments_response = { - "collection": [make_minimal_cs_thread({ - "id": "test_thread", - "course_id": str(self.course.id), - "commentable_id": "test_topic", - "user_id": str(self.user.id), - "username": self.user.username, - "created_at": "2015-04-28T00:00:00Z", - "updated_at": "2015-04-28T11:11:11Z", - "title": "Test Title", - "body": "Test body", - "votes": {"up_count": 4}, - "comments_count": 5, - "unread_comments_count": 3, - "closed_by_label": None, - "edit_by_label": None, - })], - "page": 1, - "num_pages": 1, - } - self.register_user_active_threads(self.user.id, expected_cs_comments_response) - self.url += f"?username={self.user.username}" - response = self.client.get(self.url) - assert response.status_code == 200 - response_data = json.loads(response.content.decode('utf-8')) - expected_api_response = expected_cs_comments_response['collection'] - - for thread in expected_api_response: - self.update_thread(thread) - - assert response_data['results'] == expected_api_response - assert response_data['pagination'] == { - "next": None, - "previous": None, - "count": 1, - "num_pages": 1, - } - - def test_no_username_given(self): - """ - Tests that 404 response is returned when no username is passed - """ - response = self.client.get(self.url) - assert response.status_code == 404 - - def test_not_authenticated(self): - """ - This test is called by DiscussionAPIViewTestMixin and is not required in - our case - """ - assert True - - @ddt.data("None", "discussion", "question") - def test_thread_type_by(self, thread_type): - """ - Tests the thread_type parameter - - Arguments: - thread_type (str): Value of thread_type can be 'None', - 'discussion' and 'question' - """ - threads = [make_minimal_cs_thread({ - "id": "test_thread", - "course_id": str(self.course.id), - "commentable_id": "test_topic", - "user_id": str(self.user.id), - "username": self.user.username, - "created_at": "2015-04-28T00:00:00Z", - "updated_at": "2015-04-28T11:11:11Z", - "title": "Test Title", - "body": "Test body", - "votes": {"up_count": 4}, - "comments_count": 5, - "unread_comments_count": 3, - })] - expected_cs_comments_response = { - "collection": threads, - "page": 1, - "num_pages": 1, - } - self.register_get_user_response(self.user) - self.register_user_active_threads(self.user.id, expected_cs_comments_response) - response = self.client.get( - self.url, - { - "course_id": str(self.course.id), - "username": self.user.username, - "thread_type": thread_type, - } - ) - assert response.status_code == 200 - self.assert_last_query_params({ - "user_id": [str(self.user.id)], - "course_id": [str(self.course.id)], - "page": ["1"], - "per_page": ["10"], - "thread_type": [thread_type], - "sort_key": ['activity'], - "count_flagged": ["False"] - }) - - @ddt.data( - ("last_activity_at", "activity"), - ("comment_count", "comments"), - ("vote_count", "votes") - ) - @ddt.unpack - def test_order_by(self, http_query, cc_query): - """ - Tests the order_by parameter for active threads - - Arguments: - http_query (str): Query string sent in the http request - cc_query (str): Query string used for the comments client service - """ - threads = [make_minimal_cs_thread({ - "id": "test_thread", - "course_id": str(self.course.id), - "commentable_id": "test_topic", - "user_id": str(self.user.id), - "username": self.user.username, - "created_at": "2015-04-28T00:00:00Z", - "updated_at": "2015-04-28T11:11:11Z", - "title": "Test Title", - "body": "Test body", - "votes": {"up_count": 4}, - "comments_count": 5, - "unread_comments_count": 3, - })] - expected_cs_comments_response = { - "collection": threads, - "page": 1, - "num_pages": 1, - } - self.register_get_user_response(self.user) - self.register_user_active_threads(self.user.id, expected_cs_comments_response) - response = self.client.get( - self.url, - { - "course_id": str(self.course.id), - "username": self.user.username, - "order_by": http_query, - } - ) - assert response.status_code == 200 - self.assert_last_query_params({ - "user_id": [str(self.user.id)], - "course_id": [str(self.course.id)], - "page": ["1"], - "per_page": ["10"], - "sort_key": [cc_query], - "count_flagged": ["False"] - }) - - @ddt.data("flagged", "unanswered", "unread", "unresponded") - def test_status_by(self, post_status): - """ - Tests the post_status parameter - - Arguments: - post_status (str): Value of post_status can be 'flagged', - 'unanswered' and 'unread' - """ - threads = [make_minimal_cs_thread({ - "id": "test_thread", - "course_id": str(self.course.id), - "commentable_id": "test_topic", - "user_id": str(self.user.id), - "username": self.user.username, - "created_at": "2015-04-28T00:00:00Z", - "updated_at": "2015-04-28T11:11:11Z", - "title": "Test Title", - "body": "Test body", - "votes": {"up_count": 4}, - "comments_count": 5, - "unread_comments_count": 3, - })] - expected_cs_comments_response = { - "collection": threads, - "page": 1, - "num_pages": 1, - } - self.register_get_user_response(self.user) - self.register_user_active_threads(self.user.id, expected_cs_comments_response) - response = self.client.get( - self.url, - { - "course_id": str(self.course.id), - "username": self.user.username, - "status": post_status, - } - ) - if post_status == "flagged": - assert response.status_code == 403 - else: - assert response.status_code == 200 - self.assert_last_query_params({ - "user_id": [str(self.user.id)], - "course_id": [str(self.course.id)], - "page": ["1"], - "per_page": ["10"], - post_status: ['True'], - "sort_key": ['activity'], - "count_flagged": ["False"] - }) - - -@ddt.ddt -class CourseDiscussionSettingsAPIViewTest(APITestCase, UrlResetMixin, ModuleStoreTestCase): - """ - Test the course discussion settings handler API endpoint. - """ - @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) - def setUp(self): - super().setUp() - self.course = CourseFactory.create( - org="x", - course="y", - run="z", - start=datetime.now(UTC), - discussion_topics={"Test Topic": {"id": "test_topic"}} - ) - self.path = reverse('discussion_course_settings', kwargs={'course_id': str(self.course.id)}) - self.password = self.TEST_PASSWORD - self.user = UserFactory(username='staff', password=self.password, is_staff=True) - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) - - def _get_oauth_headers(self, user): - """Return the OAuth headers for testing OAuth authentication""" - access_token = AccessTokenFactory.create(user=user, application=ApplicationFactory()).token - headers = { - 'HTTP_AUTHORIZATION': 'Bearer ' + access_token - } - return headers - - def _login_as_staff(self): - """Log the client in as the staff.""" - self.client.login(username=self.user.username, password=self.password) - - def _login_as_discussion_staff(self): - user = UserFactory(username='abc', password='abc') - role = Role.objects.create(name='Administrator', course_id=self.course.id) - role.users.set([user]) - self.client.login(username=user.username, password='abc') - - def _create_divided_discussions(self): - """Create some divided discussions for testing.""" - divided_inline_discussions = ['Topic A', ] - divided_course_wide_discussions = ['Topic B', ] - divided_discussions = divided_inline_discussions + divided_course_wide_discussions - - BlockFactory.create( - parent=self.course, - category='discussion', - discussion_id=topic_name_to_id(self.course, 'Topic A'), - discussion_category='Chapter', - discussion_target='Discussion', - start=datetime.now() - ) - discussion_topics = { - "Topic B": {"id": "Topic B"}, - } - config_course_cohorts(self.course, is_cohorted=True) - config_course_discussions( - self.course, - discussion_topics=discussion_topics, - divided_discussions=divided_discussions - ) - return divided_inline_discussions, divided_course_wide_discussions - - def _get_expected_response(self): - """Return the default expected response before any changes to the discussion settings.""" - return { - 'always_divide_inline_discussions': False, - 'divided_inline_discussions': [], - 'divided_course_wide_discussions': [], - 'id': 1, - 'division_scheme': 'cohort', - 'available_division_schemes': ['cohort'], - 'reported_content_email_notifications': False, - } - - def patch_request(self, data, headers=None): - headers = headers if headers else {} - return self.client.patch(self.path, json.dumps(data), content_type='application/merge-patch+json', **headers) - - def _assert_current_settings(self, expected_response): - """Validate the current discussion settings against the expected response.""" - response = self.client.get(self.path) - assert response.status_code == 200 - content = json.loads(response.content.decode('utf-8')) - assert content == expected_response - - def _assert_patched_settings(self, data, expected_response): - """Validate the patched settings against the expected response.""" - response = self.patch_request(data) - assert response.status_code == 204 - self._assert_current_settings(expected_response) - - @ddt.data('get', 'patch') - def test_authentication_required(self, method): - """Test and verify that authentication is required for this endpoint.""" - self.client.logout() - response = getattr(self.client, method)(self.path) - assert response.status_code == 401 - - @ddt.data( - {'is_staff': False, 'get_status': 403, 'put_status': 403}, - {'is_staff': True, 'get_status': 200, 'put_status': 204}, - ) - @ddt.unpack - def test_oauth(self, is_staff, get_status, put_status): - """Test that OAuth authentication works for this endpoint.""" - user = UserFactory(is_staff=is_staff) - headers = self._get_oauth_headers(user) - self.client.logout() - - response = self.client.get(self.path, **headers) - assert response.status_code == get_status - - response = self.patch_request( - {'always_divide_inline_discussions': True}, headers - ) - assert response.status_code == put_status - - def test_non_existent_course_id(self): - """Test the response when this endpoint is passed a non-existent course id.""" - self._login_as_staff() - response = self.client.get( - reverse('discussion_course_settings', kwargs={ - 'course_id': 'course-v1:a+b+c' - }) - ) - assert response.status_code == 404 - - def test_patch_request_by_discussion_staff(self): - """Test the response when patch request is sent by a user with discussions staff role.""" - self._login_as_discussion_staff() - response = self.patch_request( - {'always_divide_inline_discussions': True} - ) - assert response.status_code == 403 - - def test_get_request_by_discussion_staff(self): - """Test the response when get request is sent by a user with discussions staff role.""" - self._login_as_discussion_staff() - divided_inline_discussions, divided_course_wide_discussions = self._create_divided_discussions() - response = self.client.get(self.path) - assert response.status_code == 200 - expected_response = self._get_expected_response() - expected_response['divided_course_wide_discussions'] = [ - topic_name_to_id(self.course, name) for name in divided_course_wide_discussions - ] - expected_response['divided_inline_discussions'] = [ - topic_name_to_id(self.course, name) for name in divided_inline_discussions - ] - content = json.loads(response.content.decode('utf-8')) - assert content == expected_response - - def test_get_request_by_non_staff_user(self): - """Test the response when get request is sent by a regular user with no staff role.""" - user = UserFactory(username='abc', password='abc') - self.client.login(username=user.username, password='abc') - response = self.client.get(self.path) - assert response.status_code == 403 - - def test_patch_request_by_non_staff_user(self): - """Test the response when patch request is sent by a regular user with no staff role.""" - user = UserFactory(username='abc', password='abc') - self.client.login(username=user.username, password='abc') - response = self.patch_request( - {'always_divide_inline_discussions': True} - ) - assert response.status_code == 403 - - def test_get_settings(self): - """Test the current discussion settings against the expected response.""" - divided_inline_discussions, divided_course_wide_discussions = self._create_divided_discussions() - self._login_as_staff() - response = self.client.get(self.path) - assert response.status_code == 200 - expected_response = self._get_expected_response() - expected_response['divided_course_wide_discussions'] = [ - topic_name_to_id(self.course, name) for name in divided_course_wide_discussions - ] - expected_response['divided_inline_discussions'] = [ - topic_name_to_id(self.course, name) for name in divided_inline_discussions - ] - content = json.loads(response.content.decode('utf-8')) - assert content == expected_response - - def test_available_schemes(self): - """Test the available division schemes against the expected response.""" - config_course_cohorts(self.course, is_cohorted=False) - self._login_as_staff() - expected_response = self._get_expected_response() - expected_response['available_division_schemes'] = [] - self._assert_current_settings(expected_response) - - CourseModeFactory.create(course_id=self.course.id, mode_slug=CourseMode.AUDIT) - CourseModeFactory.create(course_id=self.course.id, mode_slug=CourseMode.VERIFIED) - - expected_response['available_division_schemes'] = [CourseDiscussionSettings.ENROLLMENT_TRACK] - self._assert_current_settings(expected_response) - - config_course_cohorts(self.course, is_cohorted=True) - expected_response['available_division_schemes'] = [ - CourseDiscussionSettings.COHORT, CourseDiscussionSettings.ENROLLMENT_TRACK - ] - self._assert_current_settings(expected_response) - - def test_empty_body_patch_request(self): - """Test the response status code on sending a PATCH request with an empty body or missing fields.""" - self._login_as_staff() - response = self.patch_request("") - assert response.status_code == 400 - - response = self.patch_request({}) - assert response.status_code == 400 - - @ddt.data( - {'abc': 123}, - {'divided_course_wide_discussions': 3}, - {'divided_inline_discussions': 'a'}, - {'always_divide_inline_discussions': ['a']}, - {'division_scheme': True} - ) - def test_invalid_body_parameters(self, body): - """Test the response status code on sending a PATCH request with parameters having incorrect types.""" - self._login_as_staff() - response = self.patch_request(body) - assert response.status_code == 400 - - def test_update_always_divide_inline_discussion_settings(self): - """Test whether the 'always_divide_inline_discussions' setting is updated.""" - config_course_cohorts(self.course, is_cohorted=True) - self._login_as_staff() - expected_response = self._get_expected_response() - self._assert_current_settings(expected_response) - expected_response['always_divide_inline_discussions'] = True - - self._assert_patched_settings({'always_divide_inline_discussions': True}, expected_response) - - def test_update_course_wide_discussion_settings(self): - """Test whether the 'divided_course_wide_discussions' setting is updated.""" - discussion_topics = { - 'Topic B': {'id': 'Topic B'} - } - config_course_cohorts(self.course, is_cohorted=True) - config_course_discussions(self.course, discussion_topics=discussion_topics) - expected_response = self._get_expected_response() - self._login_as_staff() - self._assert_current_settings(expected_response) - expected_response['divided_course_wide_discussions'] = [ - topic_name_to_id(self.course, "Topic B") - ] - self._assert_patched_settings( - {'divided_course_wide_discussions': [topic_name_to_id(self.course, "Topic B")]}, - expected_response - ) - expected_response['divided_course_wide_discussions'] = [] - self._assert_patched_settings( - {'divided_course_wide_discussions': []}, - expected_response - ) - - def test_update_inline_discussion_settings(self): - """Test whether the 'divided_inline_discussions' setting is updated.""" - config_course_cohorts(self.course, is_cohorted=True) - self._login_as_staff() - expected_response = self._get_expected_response() - self._assert_current_settings(expected_response) - - now = datetime.now() - BlockFactory.create( - parent_location=self.course.location, - category='discussion', - discussion_id='Topic_A', - discussion_category='Chapter', - discussion_target='Discussion', - start=now - ) - expected_response['divided_inline_discussions'] = ['Topic_A', ] - self._assert_patched_settings({'divided_inline_discussions': ['Topic_A']}, expected_response) - - expected_response['divided_inline_discussions'] = [] - self._assert_patched_settings({'divided_inline_discussions': []}, expected_response) - - def test_update_division_scheme(self): - """Test whether the 'division_scheme' setting is updated.""" - config_course_cohorts(self.course, is_cohorted=True) - self._login_as_staff() - expected_response = self._get_expected_response() - self._assert_current_settings(expected_response) - expected_response['division_scheme'] = 'none' - self._assert_patched_settings({'division_scheme': 'none'}, expected_response) - - def test_update_reported_content_email_notifications(self): - """Test whether the 'reported_content_email_notifications' setting is updated.""" - config_course_cohorts(self.course, is_cohorted=True) - config_course_discussions(self.course, reported_content_email_notifications=True) - expected_response = self._get_expected_response() - expected_response['reported_content_email_notifications'] = True - self._login_as_staff() - self._assert_current_settings(expected_response) - - -@ddt.ddt -class CourseDiscussionRolesAPIViewTest(APITestCase, UrlResetMixin, ModuleStoreTestCase): - """ - Test the course discussion roles management endpoint. - """ - @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) - def setUp(self): - super().setUp() - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) - self.course = CourseFactory.create( - org="x", - course="y", - run="z", - start=datetime.now(UTC), - ) - self.password = self.TEST_PASSWORD - self.user = UserFactory(username='staff', password=self.password, is_staff=True) - course_key = CourseKey.from_string('course-v1:x+y+z') - seed_permissions_roles(course_key) - - @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) - def path(self, course_id=None, role=None): - """Return the URL path to the endpoint based on the provided arguments.""" - course_id = str(self.course.id) if course_id is None else course_id - role = 'Moderator' if role is None else role - return reverse( - 'discussion_course_roles', - kwargs={'course_id': course_id, 'rolename': role} - ) - - def _get_oauth_headers(self, user): - """Return the OAuth headers for testing OAuth authentication.""" - access_token = AccessTokenFactory.create(user=user, application=ApplicationFactory()).token - headers = { - 'HTTP_AUTHORIZATION': 'Bearer ' + access_token - } - return headers - - def _login_as_staff(self): - """Log the client is as the staff user.""" - self.client.login(username=self.user.username, password=self.password) - - def _create_and_enroll_users(self, count): - """Create 'count' number of users and enroll them in self.course.""" - users = [] - for _ in range(count): - user = UserFactory() - CourseEnrollmentFactory.create(user=user, course_id=self.course.id) - users.append(user) - return users - - def _add_users_to_role(self, users, rolename): - """Add the given users to the given role.""" - role = Role.objects.get(name=rolename, course_id=self.course.id) - for user in users: - role.users.add(user) - - def post(self, role, user_id, action): - """Make a POST request to the endpoint using the provided parameters.""" - self._login_as_staff() - return self.client.post(self.path(role=role), {'user_id': user_id, 'action': action}) - - @ddt.data('get', 'post') - def test_authentication_required(self, method): - """Test and verify that authentication is required for this endpoint.""" - self.client.logout() - response = getattr(self.client, method)(self.path()) - assert response.status_code == 401 - - def test_oauth(self): - """Test that OAuth authentication works for this endpoint.""" - oauth_headers = self._get_oauth_headers(self.user) - self.client.logout() - response = self.client.get(self.path(), **oauth_headers) - assert response.status_code == 200 - body = {'user_id': 'staff', 'action': 'allow'} - response = self.client.post(self.path(), body, format='json', **oauth_headers) - assert response.status_code == 200 - - @ddt.data( - {'username': 'u1', 'is_staff': False, 'expected_status': 403}, - {'username': 'u2', 'is_staff': True, 'expected_status': 200}, - ) - @ddt.unpack - def test_staff_permission_required(self, username, is_staff, expected_status): - """Test and verify that only users with staff permission can access this endpoint.""" - UserFactory(username=username, password='edx', is_staff=is_staff) - self.client.login(username=username, password='edx') - response = self.client.get(self.path()) - assert response.status_code == expected_status - - response = self.client.post(self.path(), {'user_id': username, 'action': 'allow'}, format='json') - assert response.status_code == expected_status - - def test_non_existent_course_id(self): - """Test the response when the endpoint URL contains a non-existent course id.""" - self._login_as_staff() - path = self.path(course_id='course-v1:a+b+c') - response = self.client.get(path) - - assert response.status_code == 404 - - response = self.client.post(path) - assert response.status_code == 404 - - def test_non_existent_course_role(self): - """Test the response when the endpoint URL contains a non-existent role.""" - self._login_as_staff() - path = self.path(role='A') - response = self.client.get(path) - - assert response.status_code == 400 - - response = self.client.post(path) - assert response.status_code == 400 - - @ddt.data( - {'role': 'Moderator', 'count': 0}, - {'role': 'Moderator', 'count': 1}, - {'role': 'Group Moderator', 'count': 2}, - {'role': 'Community TA', 'count': 3}, - ) - @ddt.unpack - def test_get_role_members(self, role, count): - """Test the get role members endpoint response.""" - config_course_cohorts(self.course, is_cohorted=True) - users = self._create_and_enroll_users(count=count) - - self._add_users_to_role(users, role) - self._login_as_staff() - response = self.client.get(self.path(role=role)) - - assert response.status_code == 200 - - content = json.loads(response.content.decode('utf-8')) - assert content['course_id'] == 'course-v1:x+y+z' - assert len(content['results']) == count - expected_fields = ('username', 'email', 'first_name', 'last_name', 'group_name') - for item in content['results']: - for expected_field in expected_fields: - assert expected_field in item - assert content['division_scheme'] == 'cohort' - - def test_post_missing_body(self): - """Test the response with a POST request without a body.""" - self._login_as_staff() - response = self.client.post(self.path()) - assert response.status_code == 400 - - @ddt.data( - {'a': 1}, - {'user_id': 'xyz', 'action': 'allow'}, - {'user_id': 'staff', 'action': 123}, - ) - def test_missing_or_invalid_parameters(self, body): - """ - Test the response when the POST request has missing required parameters or - invalid values for the required parameters. - """ - self._login_as_staff() - response = self.client.post(self.path(), body) - assert response.status_code == 400 - - response = self.client.post(self.path(), body, format='json') - assert response.status_code == 400 - - @ddt.data( - {'action': 'allow', 'user_in_role': False}, - {'action': 'allow', 'user_in_role': True}, - {'action': 'revoke', 'user_in_role': False}, - {'action': 'revoke', 'user_in_role': True} - ) - @ddt.unpack - def test_post_update_user_role(self, action, user_in_role): - """Test the response when updating the user's role""" - users = self._create_and_enroll_users(count=1) - user = users[0] - role = 'Moderator' - if user_in_role: - self._add_users_to_role(users, role) - - response = self.post(role, user.username, action) - assert response.status_code == 200 - content = json.loads(response.content.decode('utf-8')) - assertion = self.assertTrue if action == 'allow' else self.assertFalse - assertion(any(user.username in x['username'] for x in content['results'])) - - -@ddt.ddt -@httpretty.activate -@override_waffle_flag(ENABLE_DISCUSSIONS_MFE, True) -class CourseActivityStatsTest(ForumsEnableMixin, UrlResetMixin, CommentsServiceMockMixin, APITestCase, - SharedModuleStoreTestCase): - """ - Tests for the course stats endpoint - """ - - @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) - def setUp(self) -> None: - super().setUp() - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) - self.course = CourseFactory.create() - self.course_key = str(self.course.id) - seed_permissions_roles(self.course.id) - self.user = UserFactory(username='user') - self.moderator = UserFactory(username='moderator') - moderator_role = Role.objects.get(name="Moderator", course_id=self.course.id) - moderator_role.users.add(self.moderator) - self.stats = [ - { - "active_flags": random.randint(0, 3), - "inactive_flags": random.randint(0, 2), - "replies": random.randint(0, 30), - "responses": random.randint(0, 100), - "threads": random.randint(0, 10), - "username": f"user-{idx}" - } - for idx in range(10) - ] - - for stat in self.stats: - user = UserFactory.create( - username=stat['username'], - email=f"{stat['username']}@example.com", - password=self.TEST_PASSWORD - ) - CourseEnrollment.enroll(user, self.course.id, mode='audit') - - CourseEnrollment.enroll(self.moderator, self.course.id, mode='audit') - self.stats_without_flags = [{**stat, "active_flags": None, "inactive_flags": None} for stat in self.stats] - self.register_course_stats_response(self.course_key, self.stats, 1, 3) - self.url = reverse("discussion_course_activity_stats", kwargs={"course_key_string": self.course_key}) - - @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) - def test_regular_user(self): - """ - Tests that for a regular user stats are returned without flag counts - """ - self.client.login(username=self.user.username, password=self.TEST_PASSWORD) - response = self.client.get(self.url) - data = response.json() - assert data["results"] == self.stats_without_flags - - @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) - def test_moderator_user(self): - """ - Tests that for a moderator user stats are returned with flag counts - """ - self.client.login(username=self.moderator.username, password=self.TEST_PASSWORD) - response = self.client.get(self.url) - data = response.json() - assert data["results"] == self.stats - - @ddt.data( - ("moderator", "flagged", "flagged"), - ("moderator", "activity", "activity"), - ("moderator", "recency", "recency"), - ("moderator", None, "flagged"), - ("user", None, "activity"), - ("user", "activity", "activity"), - ("user", "recency", "recency"), - ) - @ddt.unpack - @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) - def test_sorting(self, username, ordering_requested, ordering_performed): - """ - Test valid sorting options and defaults - """ - self.client.login(username=username, password=self.TEST_PASSWORD) - params = {} - if ordering_requested: - params = {"order_by": ordering_requested} - self.client.get(self.url, params) - assert urlparse( - httpretty.last_request().path # lint-amnesty, pylint: disable=no-member - ).path == f"/api/v1/users/{self.course_key}/stats" - assert parse_qs( - urlparse(httpretty.last_request().path).query # lint-amnesty, pylint: disable=no-member - ).get("sort_key", None) == [ordering_performed] - - @ddt.data("flagged", "xyz") - @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) - def test_sorting_error_regular_user(self, order_by): - """ - Test for invalid sorting options for regular users. - """ - self.client.login(username=self.user.username, password=self.TEST_PASSWORD) - response = self.client.get(self.url, {"order_by": order_by}) - assert "order_by" in response.json()["field_errors"] - - @ddt.data( - ('user', 'user-0,user-1,user-2,user-3,user-4,user-5,user-6,user-7,user-8,user-9'), - ('moderator', 'moderator'), - ) - @ddt.unpack - @mock.patch.dict("django.conf.settings.FEATURES", {'ENABLE_DISCUSSION_SERVICE': True}) - def test_with_username_param(self, username_search_string, comma_separated_usernames): - """ - Test for endpoint with username param. - """ - params = {'username': username_search_string} - self.client.login(username=self.moderator.username, password=self.TEST_PASSWORD) - self.client.get(self.url, params) - assert urlparse( - httpretty.last_request().path # lint-amnesty, pylint: disable=no-member - ).path == f'/api/v1/users/{self.course_key}/stats' - assert parse_qs( - urlparse(httpretty.last_request().path).query # lint-amnesty, pylint: disable=no-member - ).get('usernames', [None]) == [comma_separated_usernames] - - @mock.patch.dict("django.conf.settings.FEATURES", {'ENABLE_DISCUSSION_SERVICE': True}) - def test_with_username_param_with_no_matches(self): - """ - Test for endpoint with username param with no matches. - """ - params = {'username': 'unknown'} - self.client.login(username=self.moderator.username, password=self.TEST_PASSWORD) - response = self.client.get(self.url, params) - data = response.json() - self.assertFalse(data['results']) - assert data['pagination']['count'] == 0 - - @ddt.data( - 'user-0', - 'USER-1', - 'User-2', - 'UsEr-3' - ) - @mock.patch.dict("django.conf.settings.FEATURES", {'ENABLE_DISCUSSION_SERVICE': True}) - def test_with_username_param_case(self, username_search_string): - """ - Test user search function is case-insensitive. - """ - response = get_usernames_from_search_string(self.course_key, username_search_string, 1, 1) - assert response == (username_search_string.lower(), 1, 1) diff --git a/lms/djangoapps/discussion/rest_api/tests/test_views_v2.py b/lms/djangoapps/discussion/rest_api/tests/test_views_v2.py index 4247cbcab0..40b2ca9154 100644 --- a/lms/djangoapps/discussion/rest_api/tests/test_views_v2.py +++ b/lms/djangoapps/discussion/rest_api/tests/test_views_v2.py @@ -1,4 +1,3 @@ -# pylint: skip-file """ Tests for the external REST API endpoints of the Discussion API (views_v2.py). @@ -8,44 +7,68 @@ and integration with the underlying discussion service. These tests ensure that various user roles, input data, and edge cases, and that they return appropriate HTTP status codes and response bodies. """ - import json +import random from datetime import datetime from unittest import mock import ddt -from forum.backends.mongodb.comments import Comment -from forum.backends.mongodb.threads import CommentThread import httpretty +from django.core.files.uploadedfile import SimpleUploadedFile +from django.test import override_settings from django.urls import reverse +from edx_toggles.toggles.testutils import override_waffle_flag +from opaque_keys.edx.keys import CourseKey from pytz import UTC from rest_framework import status from rest_framework.parsers import JSONParser -from rest_framework.test import APIClient +from rest_framework.test import APIClient, APITestCase -from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase -from xmodule.modulestore.tests.factories import CourseFactory -from common.djangoapps.student.tests.factories import ( - CourseEnrollmentFactory, - UserFactory, +from lms.djangoapps.discussion.django_comment_client.tests.utils import ( + ForumsEnableMixin, + config_course_discussions, + topic_name_to_id, ) -from common.djangoapps.util.testing import PatchMediaTypeMixin, UrlResetMixin -from common.test.utils import disable_signal -from lms.djangoapps.discussion.tests.utils import ( - make_minimal_cs_comment, - make_minimal_cs_thread, -) -from lms.djangoapps.discussion.django_comment_client.tests.utils import ForumsEnableMixin from lms.djangoapps.discussion.rest_api import api from lms.djangoapps.discussion.rest_api.tests.utils import ( + CommentsServiceMockMixin, ForumMockUtilsMixin, ProfileImageTestMixin, make_paginated_api_response, + make_minimal_cs_comment, + make_minimal_cs_thread, ) +from lms.djangoapps.discussion.rest_api.utils import get_usernames_from_search_string +from lms.djangoapps.discussion.toggles import ENABLE_DISCUSSIONS_MFE +from xmodule.modulestore import ModuleStoreEnum +from xmodule.modulestore.django import modulestore +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, SharedModuleStoreTestCase +from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory, check_mongo_calls + +from common.djangoapps.course_modes.models import CourseMode +from common.djangoapps.course_modes.tests.factories import CourseModeFactory +from common.djangoapps.student.tests.factories import ( + AdminFactory, + CourseEnrollmentFactory, + SuperuserFactory, + UserFactory +) +from common.djangoapps.student.models import get_retired_username_by_username, CourseEnrollment +from common.djangoapps.student.roles import CourseInstructorRole, CourseStaffRole, GlobalStaff +from common.djangoapps.util.testing import PatchMediaTypeMixin, UrlResetMixin +from common.test.utils import disable_signal + +from openedx.core.djangoapps.course_groups.tests.helpers import config_course_cohorts +from openedx.core.djangoapps.discussions.models import DiscussionsConfiguration, DiscussionTopicLink, Provider +from openedx.core.djangoapps.discussions.tasks import update_discussions_settings_from_course_task +from openedx.core.djangoapps.oauth_dispatch.jwt import create_jwt_for_user +from openedx.core.djangoapps.oauth_dispatch.tests.factories import AccessTokenFactory, ApplicationFactory +from openedx.core.djangoapps.user_api.models import RetirementState, UserRetirementStatus from openedx.core.djangoapps.django_comment_common.models import ( - FORUM_ROLE_ADMINISTRATOR, FORUM_ROLE_COMMUNITY_TA, FORUM_ROLE_MODERATOR, FORUM_ROLE_STUDENT, - assign_role + CourseDiscussionSettings, Role ) +from openedx.core.djangoapps.django_comment_common.utils import seed_permissions_roles +from openedx.core.djangoapps.discussions.config.waffle import ENABLE_NEW_STRUCTURE_DISCUSSIONS from openedx.core.djangoapps.user_api.accounts.image_helpers import get_profile_image_storage @@ -657,7 +680,7 @@ class ThreadViewSetListTest( @ddt.data(True, "true", "1") def test_following_true(self, following): self.register_get_user_response(self.user) - self.register_subscribed_threads_response(self.user, [], page=1, num_pages=0) + self.register_subscribed_threads_response(self.user, [], page=1, num_pages=1) response = self.client.get( self.url, { @@ -667,7 +690,7 @@ class ThreadViewSetListTest( ) expected_response = make_paginated_api_response( - results=[], count=0, num_pages=0, next_link=None, previous_link=None + results=[], count=0, num_pages=1, next_link=None, previous_link=None ) expected_response.update({"text_search_rewrite": None}) self.assert_response_correct(response, 200, expected_response) @@ -868,81 +891,1780 @@ class BulkDeleteUserPostsTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase): Tests for the BulkDeleteUserPostsViewSet """ - def setUp(self): + @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) + def setUp(self) -> None: super().setUp() - self.url = reverse("bulk_delete_user_posts", kwargs={"course_id": str(self.course.id)}) - self.user2 = UserFactory.create(password=self.password) - CourseEnrollmentFactory.create(user=self.user2, course_id=self.course.id) + self.course = CourseFactory.create() + self.course_key = str(self.course.id) + seed_permissions_roles(self.course.id) + self.user = UserFactory(username='user') + self.moderator = UserFactory(username='moderator') + moderator_role = Role.objects.get(name="Moderator", course_id=self.course.id) + moderator_role.users.add(self.moderator) + self.stats = [ + { + "active_flags": random.randint(0, 3), + "inactive_flags": random.randint(0, 2), + "replies": random.randint(0, 30), + "responses": random.randint(0, 100), + "threads": random.randint(0, 10), + "username": f"user-{idx}" + } + for idx in range(10) + ] + + for stat in self.stats: + user = UserFactory.create( + username=stat['username'], + email=f"{stat['username']}@example.com", + password=self.TEST_PASSWORD + ) + CourseEnrollment.enroll(user, self.course.id, mode='audit') + + CourseEnrollment.enroll(self.moderator, self.course.id, mode='audit') + self.stats_without_flags = [{**stat, "active_flags": None, "inactive_flags": None} for stat in self.stats] + self.register_course_stats_response(self.course_key, self.stats, 1, 3) + self.url = reverse("discussion_course_activity_stats", kwargs={"course_key_string": self.course_key}) + + @classmethod + def setUpClass(cls): + super().setUpClass() + super().setUpClassAndForumMock() + + @classmethod + def tearDownClass(cls): + super().tearDownClass() + super().disposeForumMocks() + + @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) + def test_regular_user(self): + """ + Tests that for a regular user stats are returned without flag counts + """ + self.client.login(username=self.user.username, password=self.TEST_PASSWORD) + response = self.client.get(self.url) + data = response.json() + assert data["results"] == self.stats_without_flags + + @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) + def test_moderator_user(self): + """ + Tests that for a moderator user stats are returned with flag counts + """ + self.client.login(username=self.moderator.username, password=self.TEST_PASSWORD) + response = self.client.get(self.url) + data = response.json() + assert data["results"] == self.stats + + @ddt.data( + ("moderator", "flagged", "flagged"), + ("moderator", "activity", "activity"), + ("moderator", "recency", "recency"), + ("moderator", None, "flagged"), + ("user", None, "activity"), + ("user", "activity", "activity"), + ("user", "recency", "recency"), + ) + @ddt.unpack + @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) + def test_sorting(self, username, ordering_requested, ordering_performed): + """ + Test valid sorting options and defaults + """ + self.client.login(username=username, password=self.TEST_PASSWORD) + params = {} + if ordering_requested: + params = {"order_by": ordering_requested} + self.client.get(self.url, params) + self.check_mock_called("get_user_course_stats") + params = self.get_mock_func_calls("get_user_course_stats")[-1][1] + assert params["sort_key"] == ordering_performed + + @ddt.data("flagged", "xyz") + @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) + def test_sorting_error_regular_user(self, order_by): + """ + Test for invalid sorting options for regular users. + """ + self.client.login(username=self.user.username, password=self.TEST_PASSWORD) + response = self.client.get(self.url, {"order_by": order_by}) + assert "order_by" in response.json()["field_errors"] + + @ddt.data( + ('user', 'user-0,user-1,user-2,user-3,user-4,user-5,user-6,user-7,user-8,user-9'), + ('moderator', 'moderator'), + ) + @ddt.unpack + @mock.patch.dict("django.conf.settings.FEATURES", {'ENABLE_DISCUSSION_SERVICE': True}) + def test_with_username_param(self, username_search_string, comma_separated_usernames): + """ + Test for endpoint with username param. + """ + params = {'username': username_search_string} + self.client.login(username=self.moderator.username, password=self.TEST_PASSWORD) + self.client.get(self.url, params) + self.check_mock_called("get_user_course_stats") + params = self.get_mock_func_calls("get_user_course_stats")[-1][1] + assert params["usernames"] == comma_separated_usernames + + @mock.patch.dict("django.conf.settings.FEATURES", {'ENABLE_DISCUSSION_SERVICE': True}) + def test_with_username_param_with_no_matches(self): + """ + Test for endpoint with username param with no matches. + """ + params = {'username': 'unknown'} + self.client.login(username=self.moderator.username, password=self.TEST_PASSWORD) + response = self.client.get(self.url, params) + data = response.json() + self.assertFalse(data['results']) + assert data['pagination']['count'] == 0 + + @ddt.data( + 'user-0', + 'USER-1', + 'User-2', + 'UsEr-3' + ) + @mock.patch.dict("django.conf.settings.FEATURES", {'ENABLE_DISCUSSION_SERVICE': True}) + def test_with_username_param_case(self, username_search_string): + """ + Test user search function is case-insensitive. + """ + response = get_usernames_from_search_string(self.course_key, username_search_string, 1, 1) + assert response == (username_search_string.lower(), 1, 1) def test_basic(self): """ - Intentionally left empty because this test case is inherited from parent + Basic test method required by DiscussionAPIViewTestMixin """ - def mock_comment_and_thread_count(self, comment_count=1, thread_count=1): + def user_login(self): """ - Patches count_documents() for Comment and CommentThread._collection. + Authenticates the test client with the example user. """ - thread_collection = mock.MagicMock() - thread_collection.count_documents.return_value = thread_count - patch_thread = mock.patch.object( - CommentThread, "_collection", new_callable=mock.PropertyMock, return_value=thread_collection + self.client.login(username=self.user.username, password=self.TEST_PASSWORD) + + +@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) +@override_settings(DISCUSSION_MODERATION_EDIT_REASON_CODES={"test-edit-reason": "Test Edit Reason"}) +@override_settings(DISCUSSION_MODERATION_CLOSE_REASON_CODES={"test-close-reason": "Test Close Reason"}) +class CourseViewTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase): + """Tests for CourseView""" + + def setUp(self): + super().setUp() + self.url = reverse("discussion_course", kwargs={"course_id": str(self.course.id)}) + + def test_404(self): + response = self.client.get( + reverse("course_topics", kwargs={"course_id": "non/existent/course"}) + ) + self.assert_response_correct( + response, + 404, + {"developer_message": "Course not found."} ) - comment_collection = mock.MagicMock() - comment_collection.count_documents.return_value = comment_count - patch_comment = mock.patch.object( - Comment, "_collection", new_callable=mock.PropertyMock, return_value=comment_collection + def test_basic(self): + response = self.client.get(self.url) + self.assert_response_correct( + response, + 200, + { + "id": str(self.course.id), + "is_posting_enabled": True, + "blackouts": [], + "thread_list_url": "http://testserver/api/discussion/v1/threads/?course_id=course-v1%3Ax%2By%2Bz", + "following_thread_list_url": ( + "http://testserver/api/discussion/v1/threads/?course_id=course-v1%3Ax%2By%2Bz&following=True" + ), + "topics_url": "http://testserver/api/discussion/v1/course_topics/course-v1:x+y+z", + "enable_in_context": True, + "group_at_subsection": False, + "provider": "legacy", + "allow_anonymous": True, + "allow_anonymous_to_peers": False, + "has_moderation_privileges": False, + 'is_course_admin': False, + 'is_course_staff': False, + "is_group_ta": False, + 'is_user_admin': False, + "user_roles": ["Student"], + "edit_reasons": [{"code": "test-edit-reason", "label": "Test Edit Reason"}], + "post_close_reasons": [{"code": "test-close-reason", "label": "Test Close Reason"}], + 'show_discussions': True, + 'has_bulk_delete_privileges': False, + 'is_notify_all_learners_enabled': False, + 'captcha_settings': {'enabled': False, 'site_key': None}, + 'is_email_verified': True, + 'only_verified_users_can_post': False, + 'content_creation_rate_limited': False, + } ) - thread_mock = patch_thread.start() - comment_mock = patch_comment.start() - self.addCleanup(patch_comment.stop) - self.addCleanup(patch_thread.stop) - return thread_mock, comment_mock +@ddt.ddt +@httpretty.activate +@mock.patch('django.conf.settings.USERNAME_REPLACEMENT_WORKER', 'test_replace_username_service_worker') +@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) +class ReplaceUsernamesViewTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase): + """Tests for ReplaceUsernamesView""" - @ddt.data(FORUM_ROLE_COMMUNITY_TA, FORUM_ROLE_STUDENT) - def test_bulk_delete_denied_for_discussion_roles(self, role): + def setUp(self): + super().setUp() + self.worker = UserFactory() + self.worker.username = "test_replace_username_service_worker" + self.worker_client = APIClient() + self.new_username = "test_username_replacement" + self.url = reverse("replace_discussion_username") + + def assert_response_correct(self, response, expected_status, expected_content): """ - Test bulk delete user posts denied with discussion roles. + Assert that the response has the given status code and content """ - thread_mock, comment_mock = self.mock_comment_and_thread_count(comment_count=1, thread_count=1) - assign_role(self.course.id, self.user, role) - response = self.client.post( - f"{self.url}?username={self.user2.username}", - format="json", + assert response.status_code == expected_status + + if expected_content: + assert str(response.content) == expected_content + + def build_jwt_headers(self, user): + """ + Helper function for creating headers for the JWT authentication. + """ + token = create_jwt_for_user(user) + headers = {'HTTP_AUTHORIZATION': 'JWT ' + token} + return headers + + def call_api(self, user, client, data): + """ Helper function to call API with data """ + data = json.dumps(data) + headers = self.build_jwt_headers(user) + return client.post(self.url, data, content_type='application/json', **headers) + + @ddt.data( + [{}, {}], + {}, + [{"test_key": "test_value", "test_key_2": "test_value_2"}] + ) + def test_bad_schema(self, mapping_data): + """ Verify the endpoint rejects bad data schema """ + data = { + "username_mappings": mapping_data + } + response = self.call_api(self.worker, self.worker_client, data) + assert response.status_code == 400 + + def test_auth(self): + """ Verify the endpoint only works with the service worker """ + data = { + "username_mappings": [ + {"test_username_1": "test_new_username_1"}, + {"test_username_2": "test_new_username_2"} + ] + } + + # Test unauthenticated + response = self.client.post(self.url, data) + assert response.status_code == 403 + + # Test non-service worker + random_user = UserFactory() + response = self.call_api(random_user, APIClient(), data) + assert response.status_code == 403 + + # Test service worker + response = self.call_api(self.worker, self.worker_client, data) + assert response.status_code == 200 + + def test_basic(self): + """ Check successful replacement """ + data = { + "username_mappings": [ + {self.user.username: self.new_username}, + ] + } + expected_response = { + 'failed_replacements': [], + 'successful_replacements': data["username_mappings"] + } + self.register_get_username_replacement_response(self.user) + response = self.call_api(self.worker, self.worker_client, data) + assert response.status_code == 200 + assert response.data == expected_response + + def test_not_authenticated(self): + """ + Override the parent implementation of this, we JWT auth for this API + """ + pass # lint-amnesty, pylint: disable=unnecessary-pass + + +@ddt.ddt +@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) +class CourseTopicsViewTest(DiscussionAPIViewTestMixin, CommentsServiceMockMixin, ModuleStoreTestCase): + """ + Tests for CourseTopicsView + """ + + def setUp(self): + httpretty.reset() + httpretty.enable() + self.addCleanup(httpretty.reset) + self.addCleanup(httpretty.disable) + super().setUp() + self.url = reverse("course_topics", kwargs={"course_id": str(self.course.id)}) + self.thread_counts_map = { + "courseware-1": {"discussion": 2, "question": 3}, + "courseware-2": {"discussion": 4, "question": 5}, + "courseware-3": {"discussion": 7, "question": 2}, + } + self.register_get_course_commentable_counts_response(self.course.id, self.thread_counts_map) + + def create_course(self, blocks_count, module_store, topics): + """ + Create a course in a specified module store with discussion xblocks and topics + """ + course = CourseFactory.create( + org="a", + course="b", + run="c", + start=datetime.now(UTC), + default_store=module_store, + discussion_topics=topics ) + CourseEnrollmentFactory.create(user=self.user, course_id=course.id) + course_url = reverse("course_topics", kwargs={"course_id": str(course.id)}) + # add some discussion xblocks + for i in range(blocks_count): + BlockFactory.create( + parent_location=course.location, + category='discussion', + discussion_id=f'id_module_{i}', + discussion_category=f'Category {i}', + discussion_target=f'Discussion {i}', + publish_item=False, + ) + return course_url, course.id + + def make_discussion_xblock(self, topic_id, category, subcategory, **kwargs): + """ + Build a discussion xblock in self.course + """ + BlockFactory.create( + parent_location=self.course.location, + category="discussion", + discussion_id=topic_id, + discussion_category=category, + discussion_target=subcategory, + **kwargs + ) + + def test_404(self): + response = self.client.get( + reverse("course_topics", kwargs={"course_id": "non/existent/course"}) + ) + self.assert_response_correct( + response, + 404, + {"developer_message": "Course not found."} + ) + + def test_basic(self): + response = self.client.get(self.url) + self.assert_response_correct( + response, + 200, + { + "courseware_topics": [], + "non_courseware_topics": [{ + "id": "test_topic", + "name": "Test Topic", + "children": [], + "thread_list_url": 'http://testserver/api/discussion/v1/threads/' + '?course_id=course-v1%3Ax%2By%2Bz&topic_id=test_topic', + "thread_counts": {"discussion": 0, "question": 0}, + }], + } + ) + + @ddt.data( + (2, ModuleStoreEnum.Type.split, 2, {"Test Topic 1": {"id": "test_topic_1"}}), + (2, ModuleStoreEnum.Type.split, 2, + {"Test Topic 1": {"id": "test_topic_1"}, "Test Topic 2": {"id": "test_topic_2"}}), + (10, ModuleStoreEnum.Type.split, 2, {"Test Topic 1": {"id": "test_topic_1"}}), + ) + @ddt.unpack + def test_bulk_response(self, blocks_count, module_store, mongo_calls, topics): + course_url, course_id = self.create_course(blocks_count, module_store, topics) + self.register_get_course_commentable_counts_response(course_id, {}) + with check_mongo_calls(mongo_calls): + with modulestore().default_store(module_store): + self.client.get(course_url) + + def test_discussion_topic_404(self): + """ + Tests discussion topic does not exist for the given topic id. + """ + topic_id = "courseware-topic-id" + self.make_discussion_xblock(topic_id, "test_category", "test_target") + url = f"{self.url}?topic_id=invalid_topic_id" + response = self.client.get(url) + self.assert_response_correct( + response, + 404, + {"developer_message": "Discussion not found for 'invalid_topic_id'."} + ) + + def test_topic_id(self): + """ + Tests discussion topic details against a requested topic id + """ + topic_id_1 = "topic_id_1" + topic_id_2 = "topic_id_2" + self.make_discussion_xblock(topic_id_1, "test_category_1", "test_target_1") + self.make_discussion_xblock(topic_id_2, "test_category_2", "test_target_2") + url = f"{self.url}?topic_id=topic_id_1,topic_id_2" + response = self.client.get(url) + self.assert_response_correct( + response, + 200, + { + "non_courseware_topics": [], + "courseware_topics": [ + { + "children": [{ + "children": [], + "id": "topic_id_1", + "thread_list_url": "http://testserver/api/discussion/v1/threads/?" + "course_id=course-v1%3Ax%2By%2Bz&topic_id=topic_id_1", + "name": "test_target_1", + "thread_counts": {"discussion": 0, "question": 0}, + }], + "id": None, + "thread_list_url": "http://testserver/api/discussion/v1/threads/?" + "course_id=course-v1%3Ax%2By%2Bz&topic_id=topic_id_1", + "name": "test_category_1", + "thread_counts": None, + }, + { + "children": + [{ + "children": [], + "id": "topic_id_2", + "thread_list_url": "http://testserver/api/discussion/v1/threads/?" + "course_id=course-v1%3Ax%2By%2Bz&topic_id=topic_id_2", + "name": "test_target_2", + "thread_counts": {"discussion": 0, "question": 0}, + }], + "id": None, + "thread_list_url": "http://testserver/api/discussion/v1/threads/?" + "course_id=course-v1%3Ax%2By%2Bz&topic_id=topic_id_2", + "name": "test_category_2", + "thread_counts": None, + } + ] + } + ) + + @override_waffle_flag(ENABLE_NEW_STRUCTURE_DISCUSSIONS, True) + def test_new_course_structure_response(self): + """ + Tests whether the new structure is available on old topics API + (For mobile compatibility) + """ + chapter = BlockFactory.create( + parent_location=self.course.location, + category='chapter', + display_name="Week 1", + start=datetime(2015, 3, 1, tzinfo=UTC), + ) + sequential = BlockFactory.create( + parent_location=chapter.location, + category='sequential', + display_name="Lesson 1", + start=datetime(2015, 3, 1, tzinfo=UTC), + ) + BlockFactory.create( + parent_location=sequential.location, + category='vertical', + display_name='vertical', + start=datetime(2015, 4, 1, tzinfo=UTC), + ) + DiscussionsConfiguration.objects.create( + context_key=self.course.id, + provider_type=Provider.OPEN_EDX + ) + update_discussions_settings_from_course_task(str(self.course.id)) + response = json.loads(self.client.get(self.url).content.decode()) + keys = ['children', 'id', 'name', 'thread_counts', 'thread_list_url'] + assert list(response.keys()) == ['courseware_topics', 'non_courseware_topics'] + assert len(response['courseware_topics']) == 1 + courseware_keys = list(response['courseware_topics'][0].keys()) + courseware_keys.sort() + assert courseware_keys == keys + assert len(response['non_courseware_topics']) == 1 + non_courseware_keys = list(response['non_courseware_topics'][0].keys()) + non_courseware_keys.sort() + assert non_courseware_keys == keys + + +@ddt.ddt +@mock.patch('lms.djangoapps.discussion.rest_api.api._get_course', mock.Mock()) +@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) +@override_waffle_flag(ENABLE_NEW_STRUCTURE_DISCUSSIONS, True) +class CourseTopicsViewV3Test(DiscussionAPIViewTestMixin, ModuleStoreTestCase): + """ + Tests for CourseTopicsViewV3 + """ + + def setUp(self) -> None: + super().setUp() + self.password = self.TEST_PASSWORD + self.user = UserFactory.create(password=self.password) + self.client.login(username=self.user.username, password=self.password) + self.staff = AdminFactory.create() + self.course = CourseFactory.create( + start=datetime(2020, 1, 1), + end=datetime(2028, 1, 1), + enrollment_start=datetime(2020, 1, 1), + enrollment_end=datetime(2028, 1, 1), + discussion_topics={"Course Wide Topic": { + "id": 'course-wide-topic', + "usage_key": None, + }} + ) + self.chapter = BlockFactory.create( + parent_location=self.course.location, + category='chapter', + display_name="Week 1", + start=datetime(2015, 3, 1, tzinfo=UTC), + ) + self.sequential = BlockFactory.create( + parent_location=self.chapter.location, + category='sequential', + display_name="Lesson 1", + start=datetime(2015, 3, 1, tzinfo=UTC), + ) + self.verticals = [ + BlockFactory.create( + parent_location=self.sequential.location, + category='vertical', + display_name='vertical', + start=datetime(2015, 4, 1, tzinfo=UTC), + ) + ] + course_key = self.course.id + self.config = DiscussionsConfiguration.objects.create(context_key=course_key, provider_type=Provider.OPEN_EDX) + topic_links = [] + update_discussions_settings_from_course_task(str(course_key)) + topic_id_query = DiscussionTopicLink.objects.filter(context_key=course_key).values_list( + 'external_id', flat=True, + ) + topic_ids = list(topic_id_query.order_by('ordering')) + DiscussionTopicLink.objects.bulk_create(topic_links) + self.topic_stats = { + **{topic_id: dict(discussion=random.randint(0, 10), question=random.randint(0, 10)) + for topic_id in set(topic_ids)}, + topic_ids[0]: dict(discussion=0, question=0), + } + patcher = mock.patch( + 'lms.djangoapps.discussion.rest_api.api.get_course_commentable_counts', + mock.Mock(return_value=self.topic_stats), + ) + patcher.start() + self.addCleanup(patcher.stop) + self.url = reverse("course_topics_v3", kwargs={"course_id": str(self.course.id)}) + + def test_basic(self): + response = self.client.get(self.url) + data = json.loads(response.content.decode()) + expected_non_courseware_keys = [ + 'id', 'usage_key', 'name', 'thread_counts', 'enabled_in_context', + 'courseware' + ] + expected_courseware_keys = [ + 'id', 'block_id', 'lms_web_url', 'legacy_web_url', 'student_view_url', + 'type', 'display_name', 'children', 'courseware' + ] + assert response.status_code == 200 + assert len(data) == 2 + non_courseware_topic_keys = list(data[0].keys()) + assert non_courseware_topic_keys == expected_non_courseware_keys + courseware_topic_keys = list(data[1].keys()) + assert courseware_topic_keys == expected_courseware_keys + expected_courseware_keys.remove('courseware') + sequential_keys = list(data[1]['children'][0].keys()) + assert sequential_keys == (expected_courseware_keys + ['thread_counts']) + expected_non_courseware_keys.remove('courseware') + vertical_keys = list(data[1]['children'][0]['children'][0].keys()) + assert vertical_keys == expected_non_courseware_keys + + +@ddt.ddt +@httpretty.activate +@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) +class LearnerThreadViewAPITest(DiscussionAPIViewTestMixin, ModuleStoreTestCase): + """Tests for LearnerThreadView list""" + + def setUp(self): + """ + Sets up the test case + """ + super().setUp() + self.author = self.user + self.remove_keys = [ + "abuse_flaggers", + "body", + "children", + "commentable_id", + "endorsed", + "last_activity_at", + "resp_total", + "thread_type", + "user_id", + "username", + "votes", + ] + self.replace_keys = [ + {"from": "unread_comments_count", "to": "unread_comment_count"}, + {"from": "comments_count", "to": "comment_count"}, + ] + self.add_keys = [ + {"key": "author", "value": self.author.username}, + {"key": "abuse_flagged", "value": False}, + {"key": "author_label", "value": None}, + {"key": "can_delete", "value": True}, + {"key": "close_reason", "value": None}, + { + "key": "comment_list_url", + "value": "http://testserver/api/discussion/v1/comments/?thread_id=test_thread" + }, + { + "key": "editable_fields", + "value": [ + 'abuse_flagged', 'anonymous', 'copy_link', 'following', 'raw_body', + 'read', 'title', 'topic_id', 'type' + ] + }, + {"key": "endorsed_comment_list_url", "value": None}, + {"key": "following", "value": False}, + {"key": "group_name", "value": None}, + {"key": "has_endorsed", "value": False}, + {"key": "last_edit", "value": None}, + {"key": "non_endorsed_comment_list_url", "value": None}, + {"key": "preview_body", "value": "Test body"}, + {"key": "raw_body", "value": "Test body"}, + + {"key": "rendered_body", "value": "Test body
"}, + {"key": "response_count", "value": 0}, + {"key": "topic_id", "value": "test_topic"}, + {"key": "type", "value": "discussion"}, + {"key": "users", "value": { + self.user.username: { + "profile": { + "image": { + "has_image": False, + "image_url_full": "http://testserver/static/default_500.png", + "image_url_large": "http://testserver/static/default_120.png", + "image_url_medium": "http://testserver/static/default_50.png", + "image_url_small": "http://testserver/static/default_30.png", + } + } + } + }}, + {"key": "vote_count", "value": 4}, + {"key": "voted", "value": False}, + + ] + self.url = reverse("discussion_learner_threads", kwargs={'course_id': str(self.course.id)}) + + def update_thread(self, thread): + """ + This function updates the thread by adding and remove some keys. + Value of these keys has been defined in setUp function + """ + for element in self.add_keys: + thread[element['key']] = element['value'] + for pair in self.replace_keys: + thread[pair['to']] = thread.pop(pair['from']) + for key in self.remove_keys: + thread.pop(key) + thread['comment_count'] += 1 + return thread + + def test_basic(self): + """ + Tests the data is fetched correctly + + Note: test_basic is required as the name because DiscussionAPIViewTestMixin + calls this test case automatically + """ + self.register_get_user_response(self.user) + expected_cs_comments_response = { + "collection": [make_minimal_cs_thread({ + "id": "test_thread", + "course_id": str(self.course.id), + "commentable_id": "test_topic", + "user_id": str(self.user.id), + "username": self.user.username, + "created_at": "2015-04-28T00:00:00Z", + "updated_at": "2015-04-28T11:11:11Z", + "title": "Test Title", + "body": "Test body", + "votes": {"up_count": 4}, + "comments_count": 5, + "unread_comments_count": 3, + "closed_by_label": None, + "edit_by_label": None, + })], + "page": 1, + "num_pages": 1, + } + self.register_user_active_threads(self.user.id, expected_cs_comments_response) + self.url += f"?username={self.user.username}" + response = self.client.get(self.url) + assert response.status_code == 200 + response_data = json.loads(response.content.decode('utf-8')) + expected_api_response = expected_cs_comments_response['collection'] + + for thread in expected_api_response: + self.update_thread(thread) + + assert response_data['results'] == expected_api_response + assert response_data['pagination'] == { + "next": None, + "previous": None, + "count": 1, + "num_pages": 1, + } + + def test_no_username_given(self): + """ + Tests that 404 response is returned when no username is passed + """ + response = self.client.get(self.url) + assert response.status_code == 404 + + def test_not_authenticated(self): + """ + This test is called by DiscussionAPIViewTestMixin and is not required in + our case + """ + assert True + + @ddt.data("None", "discussion", "question") + def test_thread_type_by(self, thread_type): + """ + Tests the thread_type parameter + + Arguments: + thread_type (str): Value of thread_type can be 'None', + 'discussion' and 'question' + """ + threads = [make_minimal_cs_thread({ + "id": "test_thread", + "course_id": str(self.course.id), + "commentable_id": "test_topic", + "user_id": str(self.user.id), + "username": self.user.username, + "created_at": "2015-04-28T00:00:00Z", + "updated_at": "2015-04-28T11:11:11Z", + "title": "Test Title", + "body": "Test body", + "votes": {"up_count": 4}, + "comments_count": 5, + "unread_comments_count": 3, + })] + expected_cs_comments_response = { + "collection": threads, + "page": 1, + "num_pages": 1, + } + self.register_get_user_response(self.user) + self.register_user_active_threads(self.user.id, expected_cs_comments_response) + response = self.client.get( + self.url, + { + "course_id": str(self.course.id), + "username": self.user.username, + "thread_type": thread_type, + } + ) + assert response.status_code == 200 + params = { + "user_id": str(self.user.id), + "course_id": str(self.course.id), + "page": 1, + "per_page": 10, + "thread_type": thread_type, + "sort_key": 'activity', + "count_flagged": False + } + + self.check_mock_called_with("get_user_active_threads", -1, **params) + + @ddt.data( + ("last_activity_at", "activity"), + ("comment_count", "comments"), + ("vote_count", "votes") + ) + @ddt.unpack + def test_order_by(self, http_query, cc_query): + """ + Tests the order_by parameter for active threads + + Arguments: + http_query (str): Query string sent in the http request + cc_query (str): Query string used for the comments client service + """ + threads = [make_minimal_cs_thread({ + "id": "test_thread", + "course_id": str(self.course.id), + "commentable_id": "test_topic", + "user_id": str(self.user.id), + "username": self.user.username, + "created_at": "2015-04-28T00:00:00Z", + "updated_at": "2015-04-28T11:11:11Z", + "title": "Test Title", + "body": "Test body", + "votes": {"up_count": 4}, + "comments_count": 5, + "unread_comments_count": 3, + })] + expected_cs_comments_response = { + "collection": threads, + "page": 1, + "num_pages": 1, + } + self.register_get_user_response(self.user) + self.register_user_active_threads(self.user.id, expected_cs_comments_response) + response = self.client.get( + self.url, + { + "course_id": str(self.course.id), + "username": self.user.username, + "order_by": http_query, + } + ) + assert response.status_code == 200 + params = { + "user_id": str(self.user.id), + "course_id": str(self.course.id), + "page": 1, + "per_page": 10, + "sort_key": cc_query, + "count_flagged": False + } + self.check_mock_called_with("get_user_active_threads", -1, **params) + + @ddt.data("flagged", "unanswered", "unread", "unresponded") + def test_status_by(self, post_status): + """ + Tests the post_status parameter + + Arguments: + post_status (str): Value of post_status can be 'flagged', + 'unanswered' and 'unread' + """ + threads = [make_minimal_cs_thread({ + "id": "test_thread", + "course_id": str(self.course.id), + "commentable_id": "test_topic", + "user_id": str(self.user.id), + "username": self.user.username, + "created_at": "2015-04-28T00:00:00Z", + "updated_at": "2015-04-28T11:11:11Z", + "title": "Test Title", + "body": "Test body", + "votes": {"up_count": 4}, + "comments_count": 5, + "unread_comments_count": 3, + })] + expected_cs_comments_response = { + "collection": threads, + "page": 1, + "num_pages": 1, + } + self.register_get_user_response(self.user) + self.register_user_active_threads(self.user.id, expected_cs_comments_response) + response = self.client.get( + self.url, + { + "course_id": str(self.course.id), + "username": self.user.username, + "status": post_status, + } + ) + if post_status == "flagged": + assert response.status_code == 403 + else: + assert response.status_code == 200 + params = { + "user_id": str(self.user.id), + "course_id": str(self.course.id), + "page": 1, + "per_page": 10, + post_status: True, + "sort_key": 'activity', + "count_flagged": False + } + self.check_mock_called_with("get_user_active_threads", -1, **params) + + +@ddt.ddt +@httpretty.activate +@override_waffle_flag(ENABLE_DISCUSSIONS_MFE, True) +class CourseActivityStatsTest(ForumsEnableMixin, UrlResetMixin, ForumMockUtilsMixin, APITestCase, + SharedModuleStoreTestCase): + """ + Tests for the course stats endpoint + """ + + @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) + def setUp(self) -> None: + super().setUp() + self.course = CourseFactory.create() + self.course_key = str(self.course.id) + seed_permissions_roles(self.course.id) + self.user = UserFactory(username='user') + self.moderator = UserFactory(username='moderator') + moderator_role = Role.objects.get(name="Moderator", course_id=self.course.id) + moderator_role.users.add(self.moderator) + self.stats = [ + { + "active_flags": random.randint(0, 3), + "inactive_flags": random.randint(0, 2), + "replies": random.randint(0, 30), + "responses": random.randint(0, 100), + "threads": random.randint(0, 10), + "username": f"user-{idx}" + } + for idx in range(10) + ] + + for stat in self.stats: + user = UserFactory.create( + username=stat['username'], + email=f"{stat['username']}@example.com", + password=self.TEST_PASSWORD + ) + CourseEnrollment.enroll(user, self.course.id, mode='audit') + + CourseEnrollment.enroll(self.moderator, self.course.id, mode='audit') + self.stats_without_flags = [{**stat, "active_flags": None, "inactive_flags": None} for stat in self.stats] + self.register_course_stats_response(self.course_key, self.stats, 1, 3) + self.url = reverse("discussion_course_activity_stats", kwargs={"course_key_string": self.course_key}) + + @classmethod + def setUpClass(cls): + super().setUpClass() + super().setUpClassAndForumMock() + + @classmethod + def tearDownClass(cls): + super().tearDownClass() + super().disposeForumMocks() + + @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) + def test_regular_user(self): + """ + Tests that for a regular user stats are returned without flag counts + """ + self.client.login(username=self.user.username, password=self.TEST_PASSWORD) + response = self.client.get(self.url) + data = response.json() + assert data["results"] == self.stats_without_flags + + @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) + def test_moderator_user(self): + """ + Tests that for a moderator user stats are returned with flag counts + """ + self.client.login(username=self.moderator.username, password=self.TEST_PASSWORD) + response = self.client.get(self.url) + data = response.json() + assert data["results"] == self.stats + + @ddt.data( + ("moderator", "flagged", "flagged"), + ("moderator", "activity", "activity"), + ("moderator", "recency", "recency"), + ("moderator", None, "flagged"), + ("user", None, "activity"), + ("user", "activity", "activity"), + ("user", "recency", "recency"), + ) + @ddt.unpack + @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) + def test_sorting(self, username, ordering_requested, ordering_performed): + """ + Test valid sorting options and defaults + """ + self.client.login(username=username, password=self.TEST_PASSWORD) + params = {} + if ordering_requested: + params = {"order_by": ordering_requested} + self.client.get(self.url, params) + self.check_mock_called("get_user_course_stats") + params = self.get_mock_func_calls("get_user_course_stats")[-1][1] + assert params["sort_key"] == ordering_performed + + @ddt.data("flagged", "xyz") + @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) + def test_sorting_error_regular_user(self, order_by): + """ + Test for invalid sorting options for regular users. + """ + self.client.login(username=self.user.username, password=self.TEST_PASSWORD) + response = self.client.get(self.url, {"order_by": order_by}) + assert "order_by" in response.json()["field_errors"] + + @ddt.data( + ('user', 'user-0,user-1,user-2,user-3,user-4,user-5,user-6,user-7,user-8,user-9'), + ('moderator', 'moderator'), + ) + @ddt.unpack + @mock.patch.dict("django.conf.settings.FEATURES", {'ENABLE_DISCUSSION_SERVICE': True}) + def test_with_username_param(self, username_search_string, comma_separated_usernames): + """ + Test for endpoint with username param. + """ + params = {'username': username_search_string} + self.client.login(username=self.moderator.username, password=self.TEST_PASSWORD) + self.client.get(self.url, params) + self.check_mock_called("get_user_course_stats") + params = self.get_mock_func_calls("get_user_course_stats")[-1][1] + assert params["usernames"] == comma_separated_usernames + + @mock.patch.dict("django.conf.settings.FEATURES", {'ENABLE_DISCUSSION_SERVICE': True}) + def test_with_username_param_with_no_matches(self): + """ + Test for endpoint with username param with no matches. + """ + params = {'username': 'unknown'} + self.client.login(username=self.moderator.username, password=self.TEST_PASSWORD) + response = self.client.get(self.url, params) + data = response.json() + self.assertFalse(data['results']) + assert data['pagination']['count'] == 0 + + @ddt.data( + 'user-0', + 'USER-1', + 'User-2', + 'UsEr-3' + ) + @mock.patch.dict("django.conf.settings.FEATURES", {'ENABLE_DISCUSSION_SERVICE': True}) + def test_with_username_param_case(self, username_search_string): + """ + Test user search function is case-insensitive. + """ + response = get_usernames_from_search_string(self.course_key, username_search_string, 1, 1) + assert response == (username_search_string.lower(), 1, 1) + + +@httpretty.activate +@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) +class RetireViewTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase): + """Tests for CourseView""" + + def setUp(self): + super().setUp() + RetirementState.objects.create(state_name='PENDING', state_execution_order=1) + self.retire_forums_state = RetirementState.objects.create(state_name='RETIRE_FORUMS', state_execution_order=11) + + self.retirement = UserRetirementStatus.create_retirement(self.user) + self.retirement.current_state = self.retire_forums_state + self.retirement.save() + + self.superuser = SuperuserFactory() + self.superuser_client = APIClient() + self.retired_username = get_retired_username_by_username(self.user.username) + self.url = reverse("retire_discussion_user") + + def assert_response_correct(self, response, expected_status, expected_content): + """ + Assert that the response has the given status code and content + """ + assert response.status_code == expected_status + + if expected_content: + assert response.content.decode('utf-8') == expected_content + + def build_jwt_headers(self, user): + """ + Helper function for creating headers for the JWT authentication. + """ + token = create_jwt_for_user(user) + headers = {'HTTP_AUTHORIZATION': 'JWT ' + token} + return headers + + def test_basic(self): + """ + Check successful retirement case + """ + self.register_get_user_retire_response(self.user) + headers = self.build_jwt_headers(self.superuser) + data = {'username': self.user.username} + response = self.superuser_client.post(self.url, data, **headers) + self.assert_response_correct(response, 204, b"") + + def test_nonexistent_user(self): + """ + Check that we handle unknown users appropriately + """ + nonexistent_username = "nonexistent user" + self.retired_username = get_retired_username_by_username(nonexistent_username) + data = {'username': nonexistent_username} + headers = self.build_jwt_headers(self.superuser) + response = self.superuser_client.post(self.url, data, **headers) + self.assert_response_correct(response, 404, None) + + def test_not_authenticated(self): + """ + Override the parent implementation of this, we JWT auth for this API + """ + pass # lint-amnesty, pylint: disable=unnecessary-pass + + +@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) +class UploadFileViewTest(ForumsEnableMixin, ForumMockUtilsMixin, UrlResetMixin, ModuleStoreTestCase): + """ + Tests for UploadFileView. + """ + + @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) + def setUp(self): + super().setUp() + self.valid_file = { + "uploaded_file": SimpleUploadedFile( + "test.jpg", + b"test content", + content_type="image/jpeg", + ), + } + self.user = UserFactory.create(password=self.TEST_PASSWORD) + self.course = CourseFactory.create(org='a', course='b', run='c', start=datetime.now(UTC)) + self.url = reverse("upload_file", kwargs={"course_id": str(self.course.id)}) + + @classmethod + def setUpClass(cls): + super().setUpClass() + super().setUpClassAndForumMock() + + @classmethod + def tearDownClass(cls): + super().tearDownClass() + super().disposeForumMocks() + + def user_login(self): + """ + Authenticates the test client with the example user. + """ + self.client.login(username=self.user.username, password=self.TEST_PASSWORD) + + def enroll_user_in_course(self): + """ + Makes the example user enrolled to the course. + """ + CourseEnrollmentFactory.create(user=self.user, course_id=self.course.id) + + def assert_upload_success(self, response): + """ + Asserts that the upload response was successful and returned the + expected contents. + """ + assert response.status_code == status.HTTP_200_OK + assert response.content_type == "application/json" + response_data = json.loads(response.content) + assert "location" in response_data + + def test_file_upload_by_unauthenticated_user(self): + """ + Should fail if an unauthenticated user tries to upload a file. + """ + response = self.client.post(self.url, self.valid_file) + assert response.status_code == status.HTTP_401_UNAUTHORIZED + + def test_file_upload_by_unauthorized_user(self): + """ + Should fail if the user is not either staff or a student + enrolled in the course. + """ + self.user_login() + response = self.client.post(self.url, self.valid_file) assert response.status_code == status.HTTP_403_FORBIDDEN - thread_mock.count_documents.assert_not_called() - comment_mock.count_documents.assert_not_called() - @ddt.data(FORUM_ROLE_MODERATOR, FORUM_ROLE_ADMINISTRATOR) - def test_bulk_delete_allowed_for_discussion_roles(self, role): + def test_file_upload_by_enrolled_user(self): """ - Test bulk delete user posts passed with discussion roles. + Should succeed when a valid file is uploaded by an authenticated + user who's enrolled in the course. """ - self.mock_comment_and_thread_count(comment_count=1, thread_count=1) - assign_role(self.course.id, self.user, role) - response = self.client.post( - f"{self.url}?username={self.user2.username}", - format="json", - ) - assert response.status_code == status.HTTP_202_ACCEPTED - assert response.json() == {"comment_count": 1, "thread_count": 1} + self.user_login() + self.enroll_user_in_course() + response = self.client.post(self.url, self.valid_file) + self.assert_upload_success(response) - @mock.patch('lms.djangoapps.discussion.rest_api.views.delete_course_post_for_user.apply_async') - @ddt.data(True, False) - def test_task_only_runs_if_execute_param_is_true(self, execute, task_mock): + def test_file_upload_by_global_staff(self): """ - Test bulk delete user posts task runs only if execute parameter is set to true. + Should succeed when a valid file is uploaded by a global staff + member. """ - assign_role(self.course.id, self.user, FORUM_ROLE_MODERATOR) - self.mock_comment_and_thread_count(comment_count=1, thread_count=1) - response = self.client.post( - f"{self.url}?username={self.user2.username}&execute={str(execute).lower()}", - format="json", + self.user_login() + GlobalStaff().add_users(self.user) + response = self.client.post(self.url, self.valid_file) + self.assert_upload_success(response) + + def test_file_upload_by_instructor(self): + """ + Should succeed when a valid file is uploaded by a course instructor. + """ + self.user_login() + CourseInstructorRole(course_key=self.course.id).add_users(self.user) + response = self.client.post(self.url, self.valid_file) + self.assert_upload_success(response) + + def test_file_upload_by_course_staff(self): + """ + Should succeed when a valid file is uploaded by a course staff + member. + """ + self.user_login() + CourseStaffRole(course_key=self.course.id).add_users(self.user) + response = self.client.post(self.url, self.valid_file) + self.assert_upload_success(response) + + def test_file_upload_with_thread_key(self): + """ + Should contain the given thread_key in the uploaded file name. + """ + self.user_login() + self.enroll_user_in_course() + response = self.client.post(self.url, { + **self.valid_file, + "thread_key": "somethread", + }) + response_data = json.loads(response.content) + assert "/somethread/" in response_data["location"] + + def test_file_upload_with_invalid_file(self): + """ + Should fail if the uploaded file format is not allowed. + """ + self.user_login() + self.enroll_user_in_course() + invalid_file = { + "uploaded_file": SimpleUploadedFile( + "test.txt", + b"test content", + content_type="text/plain", + ), + } + response = self.client.post(self.url, invalid_file) + assert response.status_code == status.HTTP_403_FORBIDDEN + + def test_file_upload_with_invalid_course_id(self): + """ + Should fail if the course does not exist. + """ + self.user_login() + self.enroll_user_in_course() + url = reverse("upload_file", kwargs={"course_id": "d/e/f"}) + response = self.client.post(url, self.valid_file) + assert response.status_code == status.HTTP_403_FORBIDDEN + + def test_file_upload_with_no_data(self): + """ + Should fail when the user sends a request missing an + `uploaded_file` field. + """ + self.user_login() + self.enroll_user_in_course() + response = self.client.post(self.url, data={}) + assert response.status_code == status.HTTP_400_BAD_REQUEST + + +@ddt.ddt +class CourseDiscussionSettingsAPIViewTest(APITestCase, UrlResetMixin, ModuleStoreTestCase): + """ + Test the course discussion settings handler API endpoint. + """ + @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) + def setUp(self): + super().setUp() + self.course = CourseFactory.create( + org="x", + course="y", + run="z", + start=datetime.now(UTC), + discussion_topics={"Test Topic": {"id": "test_topic"}} ) - assert response.status_code == status.HTTP_202_ACCEPTED - assert response.json() == {"comment_count": 1, "thread_count": 1} - assert task_mock.called is execute + self.path = reverse('discussion_course_settings', kwargs={'course_id': str(self.course.id)}) + self.password = self.TEST_PASSWORD + self.user = UserFactory(username='staff', password=self.password, is_staff=True) + + def _get_oauth_headers(self, user): + """Return the OAuth headers for testing OAuth authentication""" + access_token = AccessTokenFactory.create(user=user, application=ApplicationFactory()).token + headers = { + 'HTTP_AUTHORIZATION': 'Bearer ' + access_token + } + return headers + + def _login_as_staff(self): + """Log the client in as the staff.""" + self.client.login(username=self.user.username, password=self.password) + + def _login_as_discussion_staff(self): + user = UserFactory(username='abc', password='abc') + role = Role.objects.create(name='Administrator', course_id=self.course.id) + role.users.set([user]) + self.client.login(username=user.username, password='abc') + + def _create_divided_discussions(self): + """Create some divided discussions for testing.""" + divided_inline_discussions = ['Topic A', ] + divided_course_wide_discussions = ['Topic B', ] + divided_discussions = divided_inline_discussions + divided_course_wide_discussions + + BlockFactory.create( + parent=self.course, + category='discussion', + discussion_id=topic_name_to_id(self.course, 'Topic A'), + discussion_category='Chapter', + discussion_target='Discussion', + start=datetime.now() + ) + discussion_topics = { + "Topic B": {"id": "Topic B"}, + } + config_course_cohorts(self.course, is_cohorted=True) + config_course_discussions( + self.course, + discussion_topics=discussion_topics, + divided_discussions=divided_discussions + ) + return divided_inline_discussions, divided_course_wide_discussions + + def _get_expected_response(self): + """Return the default expected response before any changes to the discussion settings.""" + return { + 'always_divide_inline_discussions': False, + 'divided_inline_discussions': [], + 'divided_course_wide_discussions': [], + 'id': 1, + 'division_scheme': 'cohort', + 'available_division_schemes': ['cohort'], + 'reported_content_email_notifications': False, + } + + def patch_request(self, data, headers=None): + headers = headers if headers else {} + return self.client.patch(self.path, json.dumps(data), content_type='application/merge-patch+json', **headers) + + def _assert_current_settings(self, expected_response): + """Validate the current discussion settings against the expected response.""" + response = self.client.get(self.path) + assert response.status_code == 200 + content = json.loads(response.content.decode('utf-8')) + assert content == expected_response + + def _assert_patched_settings(self, data, expected_response): + """Validate the patched settings against the expected response.""" + response = self.patch_request(data) + assert response.status_code == 204 + self._assert_current_settings(expected_response) + + @ddt.data('get', 'patch') + def test_authentication_required(self, method): + """Test and verify that authentication is required for this endpoint.""" + self.client.logout() + response = getattr(self.client, method)(self.path) + assert response.status_code == 401 + + @ddt.data( + {'is_staff': False, 'get_status': 403, 'put_status': 403}, + {'is_staff': True, 'get_status': 200, 'put_status': 204}, + ) + @ddt.unpack + def test_oauth(self, is_staff, get_status, put_status): + """Test that OAuth authentication works for this endpoint.""" + user = UserFactory(is_staff=is_staff) + headers = self._get_oauth_headers(user) + self.client.logout() + + response = self.client.get(self.path, **headers) + assert response.status_code == get_status + + response = self.patch_request( + {'always_divide_inline_discussions': True}, headers + ) + assert response.status_code == put_status + + def test_non_existent_course_id(self): + """Test the response when this endpoint is passed a non-existent course id.""" + self._login_as_staff() + response = self.client.get( + reverse('discussion_course_settings', kwargs={ + 'course_id': 'course-v1:a+b+c' + }) + ) + assert response.status_code == 404 + + def test_patch_request_by_discussion_staff(self): + """Test the response when patch request is sent by a user with discussions staff role.""" + self._login_as_discussion_staff() + response = self.patch_request( + {'always_divide_inline_discussions': True} + ) + assert response.status_code == 403 + + def test_get_request_by_discussion_staff(self): + """Test the response when get request is sent by a user with discussions staff role.""" + self._login_as_discussion_staff() + divided_inline_discussions, divided_course_wide_discussions = self._create_divided_discussions() + response = self.client.get(self.path) + assert response.status_code == 200 + expected_response = self._get_expected_response() + expected_response['divided_course_wide_discussions'] = [ + topic_name_to_id(self.course, name) for name in divided_course_wide_discussions + ] + expected_response['divided_inline_discussions'] = [ + topic_name_to_id(self.course, name) for name in divided_inline_discussions + ] + content = json.loads(response.content.decode('utf-8')) + assert content == expected_response + + def test_get_request_by_non_staff_user(self): + """Test the response when get request is sent by a regular user with no staff role.""" + user = UserFactory(username='abc', password='abc') + self.client.login(username=user.username, password='abc') + response = self.client.get(self.path) + assert response.status_code == 403 + + def test_patch_request_by_non_staff_user(self): + """Test the response when patch request is sent by a regular user with no staff role.""" + user = UserFactory(username='abc', password='abc') + self.client.login(username=user.username, password='abc') + response = self.patch_request( + {'always_divide_inline_discussions': True} + ) + assert response.status_code == 403 + + def test_get_settings(self): + """Test the current discussion settings against the expected response.""" + divided_inline_discussions, divided_course_wide_discussions = self._create_divided_discussions() + self._login_as_staff() + response = self.client.get(self.path) + assert response.status_code == 200 + expected_response = self._get_expected_response() + expected_response['divided_course_wide_discussions'] = [ + topic_name_to_id(self.course, name) for name in divided_course_wide_discussions + ] + expected_response['divided_inline_discussions'] = [ + topic_name_to_id(self.course, name) for name in divided_inline_discussions + ] + content = json.loads(response.content.decode('utf-8')) + assert content == expected_response + + def test_available_schemes(self): + """Test the available division schemes against the expected response.""" + config_course_cohorts(self.course, is_cohorted=False) + self._login_as_staff() + expected_response = self._get_expected_response() + expected_response['available_division_schemes'] = [] + self._assert_current_settings(expected_response) + + CourseModeFactory.create(course_id=self.course.id, mode_slug=CourseMode.AUDIT) + CourseModeFactory.create(course_id=self.course.id, mode_slug=CourseMode.VERIFIED) + + expected_response['available_division_schemes'] = [CourseDiscussionSettings.ENROLLMENT_TRACK] + self._assert_current_settings(expected_response) + + config_course_cohorts(self.course, is_cohorted=True) + expected_response['available_division_schemes'] = [ + CourseDiscussionSettings.COHORT, CourseDiscussionSettings.ENROLLMENT_TRACK + ] + self._assert_current_settings(expected_response) + + def test_empty_body_patch_request(self): + """Test the response status code on sending a PATCH request with an empty body or missing fields.""" + self._login_as_staff() + response = self.patch_request("") + assert response.status_code == 400 + + response = self.patch_request({}) + assert response.status_code == 400 + + @ddt.data( + {'abc': 123}, + {'divided_course_wide_discussions': 3}, + {'divided_inline_discussions': 'a'}, + {'always_divide_inline_discussions': ['a']}, + {'division_scheme': True} + ) + def test_invalid_body_parameters(self, body): + """Test the response status code on sending a PATCH request with parameters having incorrect types.""" + self._login_as_staff() + response = self.patch_request(body) + assert response.status_code == 400 + + def test_update_always_divide_inline_discussion_settings(self): + """Test whether the 'always_divide_inline_discussions' setting is updated.""" + config_course_cohorts(self.course, is_cohorted=True) + self._login_as_staff() + expected_response = self._get_expected_response() + self._assert_current_settings(expected_response) + expected_response['always_divide_inline_discussions'] = True + + self._assert_patched_settings({'always_divide_inline_discussions': True}, expected_response) + + def test_update_course_wide_discussion_settings(self): + """Test whether the 'divided_course_wide_discussions' setting is updated.""" + discussion_topics = { + 'Topic B': {'id': 'Topic B'} + } + config_course_cohorts(self.course, is_cohorted=True) + config_course_discussions(self.course, discussion_topics=discussion_topics) + expected_response = self._get_expected_response() + self._login_as_staff() + self._assert_current_settings(expected_response) + expected_response['divided_course_wide_discussions'] = [ + topic_name_to_id(self.course, "Topic B") + ] + self._assert_patched_settings( + {'divided_course_wide_discussions': [topic_name_to_id(self.course, "Topic B")]}, + expected_response + ) + expected_response['divided_course_wide_discussions'] = [] + self._assert_patched_settings( + {'divided_course_wide_discussions': []}, + expected_response + ) + + def test_update_inline_discussion_settings(self): + """Test whether the 'divided_inline_discussions' setting is updated.""" + config_course_cohorts(self.course, is_cohorted=True) + self._login_as_staff() + expected_response = self._get_expected_response() + self._assert_current_settings(expected_response) + + now = datetime.now() + BlockFactory.create( + parent_location=self.course.location, + category='discussion', + discussion_id='Topic_A', + discussion_category='Chapter', + discussion_target='Discussion', + start=now + ) + expected_response['divided_inline_discussions'] = ['Topic_A', ] + self._assert_patched_settings({'divided_inline_discussions': ['Topic_A']}, expected_response) + + expected_response['divided_inline_discussions'] = [] + self._assert_patched_settings({'divided_inline_discussions': []}, expected_response) + + def test_update_division_scheme(self): + """Test whether the 'division_scheme' setting is updated.""" + config_course_cohorts(self.course, is_cohorted=True) + self._login_as_staff() + expected_response = self._get_expected_response() + self._assert_current_settings(expected_response) + expected_response['division_scheme'] = 'none' + self._assert_patched_settings({'division_scheme': 'none'}, expected_response) + + def test_update_reported_content_email_notifications(self): + """Test whether the 'reported_content_email_notifications' setting is updated.""" + config_course_cohorts(self.course, is_cohorted=True) + config_course_discussions(self.course, reported_content_email_notifications=True) + expected_response = self._get_expected_response() + expected_response['reported_content_email_notifications'] = True + self._login_as_staff() + self._assert_current_settings(expected_response) + + +@ddt.ddt +class CourseDiscussionRolesAPIViewTest(APITestCase, UrlResetMixin, ModuleStoreTestCase): + """ + Test the course discussion roles management endpoint. + """ + @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) + def setUp(self): + super().setUp() + self.course = CourseFactory.create( + org="x", + course="y", + run="z", + start=datetime.now(UTC), + ) + self.password = self.TEST_PASSWORD + self.user = UserFactory(username='staff', password=self.password, is_staff=True) + course_key = CourseKey.from_string('course-v1:x+y+z') + seed_permissions_roles(course_key) + + @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) + def path(self, course_id=None, role=None): + """Return the URL path to the endpoint based on the provided arguments.""" + course_id = str(self.course.id) if course_id is None else course_id + role = 'Moderator' if role is None else role + return reverse( + 'discussion_course_roles', + kwargs={'course_id': course_id, 'rolename': role} + ) + + def _get_oauth_headers(self, user): + """Return the OAuth headers for testing OAuth authentication.""" + access_token = AccessTokenFactory.create(user=user, application=ApplicationFactory()).token + headers = { + 'HTTP_AUTHORIZATION': 'Bearer ' + access_token + } + return headers + + def _login_as_staff(self): + """Log the client is as the staff user.""" + self.client.login(username=self.user.username, password=self.password) + + def _create_and_enroll_users(self, count): + """Create 'count' number of users and enroll them in self.course.""" + users = [] + for _ in range(count): + user = UserFactory() + CourseEnrollmentFactory.create(user=user, course_id=self.course.id) + users.append(user) + return users + + def _add_users_to_role(self, users, rolename): + """Add the given users to the given role.""" + role = Role.objects.get(name=rolename, course_id=self.course.id) + for user in users: + role.users.add(user) + + def post(self, role, user_id, action): + """Make a POST request to the endpoint using the provided parameters.""" + self._login_as_staff() + return self.client.post(self.path(role=role), {'user_id': user_id, 'action': action}) + + @ddt.data('get', 'post') + def test_authentication_required(self, method): + """Test and verify that authentication is required for this endpoint.""" + self.client.logout() + response = getattr(self.client, method)(self.path()) + assert response.status_code == 401 + + def test_oauth(self): + """Test that OAuth authentication works for this endpoint.""" + oauth_headers = self._get_oauth_headers(self.user) + self.client.logout() + response = self.client.get(self.path(), **oauth_headers) + assert response.status_code == 200 + body = {'user_id': 'staff', 'action': 'allow'} + response = self.client.post(self.path(), body, format='json', **oauth_headers) + assert response.status_code == 200 + + @ddt.data( + {'username': 'u1', 'is_staff': False, 'expected_status': 403}, + {'username': 'u2', 'is_staff': True, 'expected_status': 200}, + ) + @ddt.unpack + def test_staff_permission_required(self, username, is_staff, expected_status): + """Test and verify that only users with staff permission can access this endpoint.""" + UserFactory(username=username, password='edx', is_staff=is_staff) + self.client.login(username=username, password='edx') + response = self.client.get(self.path()) + assert response.status_code == expected_status + + response = self.client.post(self.path(), {'user_id': username, 'action': 'allow'}, format='json') + assert response.status_code == expected_status + + def test_non_existent_course_id(self): + """Test the response when the endpoint URL contains a non-existent course id.""" + self._login_as_staff() + path = self.path(course_id='course-v1:a+b+c') + response = self.client.get(path) + + assert response.status_code == 404 + + response = self.client.post(path) + assert response.status_code == 404 + + def test_non_existent_course_role(self): + """Test the response when the endpoint URL contains a non-existent role.""" + self._login_as_staff() + path = self.path(role='A') + response = self.client.get(path) + + assert response.status_code == 400 + + response = self.client.post(path) + assert response.status_code == 400 + + @ddt.data( + {'role': 'Moderator', 'count': 0}, + {'role': 'Moderator', 'count': 1}, + {'role': 'Group Moderator', 'count': 2}, + {'role': 'Community TA', 'count': 3}, + ) + @ddt.unpack + def test_get_role_members(self, role, count): + """Test the get role members endpoint response.""" + config_course_cohorts(self.course, is_cohorted=True) + users = self._create_and_enroll_users(count=count) + + self._add_users_to_role(users, role) + self._login_as_staff() + response = self.client.get(self.path(role=role)) + + assert response.status_code == 200 + + content = json.loads(response.content.decode('utf-8')) + assert content['course_id'] == 'course-v1:x+y+z' + assert len(content['results']) == count + expected_fields = ('username', 'email', 'first_name', 'last_name', 'group_name') + for item in content['results']: + for expected_field in expected_fields: + assert expected_field in item + assert content['division_scheme'] == 'cohort' + + def test_post_missing_body(self): + """Test the response with a POST request without a body.""" + self._login_as_staff() + response = self.client.post(self.path()) + assert response.status_code == 400 + + @ddt.data( + {'a': 1}, + {'user_id': 'xyz', 'action': 'allow'}, + {'user_id': 'staff', 'action': 123}, + ) + def test_missing_or_invalid_parameters(self, body): + """ + Test the response when the POST request has missing required parameters or + invalid values for the required parameters. + """ + self._login_as_staff() + response = self.client.post(self.path(), body) + assert response.status_code == 400 + + response = self.client.post(self.path(), body, format='json') + assert response.status_code == 400 + + @ddt.data( + {'action': 'allow', 'user_in_role': False}, + {'action': 'allow', 'user_in_role': True}, + {'action': 'revoke', 'user_in_role': False}, + {'action': 'revoke', 'user_in_role': True} + ) + @ddt.unpack + def test_post_update_user_role(self, action, user_in_role): + """Test the response when updating the user's role""" + users = self._create_and_enroll_users(count=1) + user = users[0] + role = 'Moderator' + if user_in_role: + self._add_users_to_role(users, role) + + response = self.post(role, user.username, action) + assert response.status_code == 200 + content = json.loads(response.content.decode('utf-8')) + assertion = self.assertTrue if action == 'allow' else self.assertFalse + assertion(any(user.username in x['username'] for x in content['results'])) diff --git a/lms/djangoapps/discussion/rest_api/tests/utils.py b/lms/djangoapps/discussion/rest_api/tests/utils.py index 342afb0ada..37512c3573 100644 --- a/lms/djangoapps/discussion/rest_api/tests/utils.py +++ b/lms/djangoapps/discussion/rest_api/tests/utils.py @@ -635,7 +635,8 @@ class ForumMockUtilsMixin(MockForumApiMixin): self.set_mock_return_value('get_thread', thread) def register_get_comments_response(self, comments, page, num_pages): - self.set_mock_return_value('get_parent_comment', { + """Register a mock response for get_user_comments API call.""" + self.set_mock_return_value('get_user_comments', { "collection": comments, "page": page, "num_pages": num_pages, @@ -675,13 +676,21 @@ class ForumMockUtilsMixin(MockForumApiMixin): } self.set_mock_side_effect('get_user', make_user_callbacks(self.users_map)) - def register_get_user_retire_response(self, user, body=""): + def register_get_user_retire_response(self, user, status=200, body=""): self.set_mock_return_value('retire_user', body) def register_get_username_replacement_response(self, user, status=200, body=""): self.set_mock_return_value('update_username', body) def register_subscribed_threads_response(self, user, threads, page, num_pages): + """Register a mock response for get_user_threads and get_user_subscriptions API calls.""" + self.set_mock_return_value('get_user_threads', { + "collection": threads, + "page": page, + "num_pages": num_pages, + "thread_count": len(threads), + }) + # Also mock get_user_subscriptions for the Forum v2 API self.set_mock_return_value('get_user_subscriptions', { "collection": threads, "page": page, diff --git a/lms/djangoapps/discussion/tests/test_views.py b/lms/djangoapps/discussion/tests/test_views.py index e1b451b3bc..5f4953d1e6 100644 --- a/lms/djangoapps/discussion/tests/test_views.py +++ b/lms/djangoapps/discussion/tests/test_views.py @@ -7,19 +7,15 @@ from datetime import datetime from unittest import mock from unittest.mock import ANY, Mock, call, patch -import ddt import pytest -from django.conf import settings from django.test.client import Client, RequestFactory from django.test.utils import override_settings from django.urls import reverse from django.utils import translation from edx_django_utils.cache import RequestCache -from edx_toggles.toggles.testutils import override_waffle_flag from xmodule.modulestore.tests.django_utils import ( TEST_DATA_SPLIT_MODULESTORE, ModuleStoreTestCase, - SharedModuleStoreTestCase ) from xmodule.modulestore.tests.factories import ( CourseFactory, @@ -28,19 +24,17 @@ from xmodule.modulestore.tests.factories import ( from common.djangoapps.course_modes.models import CourseMode from common.djangoapps.course_modes.tests.factories import CourseModeFactory -from common.djangoapps.student.tests.factories import AdminFactory, CourseEnrollmentFactory, UserFactory +from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory from common.djangoapps.util.testing import UrlResetMixin from lms.djangoapps.courseware.exceptions import CourseAccessRedirect from lms.djangoapps.discussion import views from lms.djangoapps.discussion.django_comment_client.constants import TYPE_ENTRY, TYPE_SUBCATEGORY from lms.djangoapps.discussion.django_comment_client.permissions import get_team -from lms.djangoapps.discussion.django_comment_client.tests.unicode import UnicodeTestMixin from lms.djangoapps.discussion.django_comment_client.tests.utils import ( ForumsEnableMixin, config_course_discussions, topic_name_to_id ) -from lms.djangoapps.discussion.toggles import ENABLE_DISCUSSIONS_MFE from lms.djangoapps.discussion.views import _get_discussion_default_topic_id, course_discussions_settings_handler from openedx.core.djangoapps.course_groups.tests.helpers import config_course_cohorts from openedx.core.djangoapps.course_groups.tests.test_views import CohortViewsTestCase @@ -91,12 +85,6 @@ class ViewsExceptionTestCase(UrlResetMixin, ModuleStoreTestCase): # lint-amnest config = ForumsConfig.current() config.enabled = True config.save() - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) patcher = mock.patch( "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread" ) @@ -336,12 +324,6 @@ class CommentsServiceRequestHeadersTestCase(ForumsEnableMixin, UrlResetMixin, Mo @patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) def setUp(self): super().setUp() - patcher = mock.patch( - 'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', - return_value=False - ) - patcher.start() - self.addCleanup(patcher.stop) patcher = mock.patch( "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment" ) @@ -409,36 +391,6 @@ class CommentsServiceRequestHeadersTestCase(ForumsEnableMixin, UrlResetMixin, Mo self.assert_all_calls_have_header(mock_request, "X-Edx-Api-Key", "test_api_key") -class UserProfileUnicodeTestCase(ForumsEnableMixin, SharedModuleStoreTestCase, UnicodeTestMixin): # lint-amnesty, pylint: disable=missing-class-docstring - - @classmethod - def setUpClass(cls): - # pylint: disable=super-method-not-called - with super().setUpClassAndTestData(): - cls.course = CourseFactory.create() - - @classmethod - def setUpTestData(cls): - super().setUpTestData() - - cls.student = UserFactory.create() - CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id) - - @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True) - def _test_unicode_data(self, text, mock_request): # lint-amnesty, pylint: disable=missing-function-docstring - mock_request.side_effect = make_mock_request_impl(course=self.course, text=text) - request = RequestFactory().get("dummy_url") - request.user = self.student - # so (request.headers.get('x-requested-with') == 'XMLHttpRequest') == True - request.META["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest" - - response = views.user_profile(request, str(self.course.id), str(self.student.id)) - assert response.status_code == 200 - response_data = json.loads(response.content.decode('utf-8')) - assert response_data['discussion_data'][0]['title'] == text - assert response_data['discussion_data'][0]['body'] == text - - class EnrollmentTestCase(ForumsEnableMixin, ModuleStoreTestCase): """ Tests for the behavior of views depending on if the student is enrolled @@ -746,76 +698,3 @@ class DefaultTopicIdGetterTestCase(ModuleStoreTestCase): expected_id = 'another_discussion_id' result = _get_discussion_default_topic_id(course) assert expected_id == result - - -@ddt.ddt -@patch( - 'openedx.core.djangoapps.django_comment_common.comment_client.utils.perform_request', - Mock( - return_value={ - "id": "test_thread", - "title": "Title", - "body": "", - "default_sort_key": "date", - "upvoted_ids": [], - "downvoted_ids": [], - "subscribed_thread_ids": [], - } - ) -) -class ForumMFETestCase(ForumsEnableMixin, SharedModuleStoreTestCase): - """ - Tests that the MFE upgrade banner and MFE is shown in the correct situation with the correct UI - """ - - def setUp(self): - super().setUp() - self.course = CourseFactory.create() - self.user = UserFactory.create() - self.staff_user = AdminFactory.create() - CourseEnrollmentFactory.create(user=self.user, course_id=self.course.id) - - @override_settings(DISCUSSIONS_MICROFRONTEND_URL="http://test.url") - def test_redirect_from_legacy_base_url_to_new_experience(self): - """ - Verify that the legacy url is redirected to MFE homepage when - ENABLE_DISCUSSIONS_MFE flag is enabled. - """ - - with override_waffle_flag(ENABLE_DISCUSSIONS_MFE, True): - self.client.login(username=self.user.username, password=self.TEST_PASSWORD) - url = reverse("forum_form_discussion", args=[self.course.id]) - response = self.client.get(url) - assert response.status_code == 302 - expected_url = f"{settings.DISCUSSIONS_MICROFRONTEND_URL}/{str(self.course.id)}" - assert response.url == expected_url - - @override_settings(DISCUSSIONS_MICROFRONTEND_URL="http://test.url") - def test_redirect_from_legacy_profile_url_to_new_experience(self): - """ - Verify that the requested user profile is redirected to MFE learners tab when - ENABLE_DISCUSSIONS_MFE flag is enabled - """ - - with override_waffle_flag(ENABLE_DISCUSSIONS_MFE, True): - self.client.login(username=self.user.username, password=self.TEST_PASSWORD) - url = reverse("user_profile", args=[self.course.id, self.user.id]) - response = self.client.get(url) - assert response.status_code == 302 - expected_url = f"{settings.DISCUSSIONS_MICROFRONTEND_URL}/{str(self.course.id)}/learners" - assert response.url == expected_url - - @override_settings(DISCUSSIONS_MICROFRONTEND_URL="http://test.url") - def test_redirect_from_legacy_single_thread_to_new_experience(self): - """ - Verify that a legacy single url is redirected to corresponding MFE thread url when the ENABLE_DISCUSSIONS_MFE - flag is enabled - """ - - with override_waffle_flag(ENABLE_DISCUSSIONS_MFE, True): - self.client.login(username=self.user.username, password=self.TEST_PASSWORD) - url = reverse("single_thread", args=[self.course.id, "test_discussion", "test_thread"]) - response = self.client.get(url) - assert response.status_code == 302 - expected_url = f"{settings.DISCUSSIONS_MICROFRONTEND_URL}/{str(self.course.id)}/posts/test_thread" - assert response.url == expected_url diff --git a/lms/djangoapps/discussion/tests/test_views_v2.py b/lms/djangoapps/discussion/tests/test_views_v2.py index f7d7e6f9f1..1e4f36b8f5 100644 --- a/lms/djangoapps/discussion/tests/test_views_v2.py +++ b/lms/djangoapps/discussion/tests/test_views_v2.py @@ -2022,3 +2022,115 @@ class FollowedThreadsUnicodeTestCase( response_data = json.loads(response.content.decode('utf-8')) assert response_data['discussion_data'][0]['title'] == text assert response_data['discussion_data'][0]['body'] == text + + +class UserProfileUnicodeTestCase(ForumsEnableMixin, SharedModuleStoreTestCase, UnicodeTestMixin, ForumViewsUtilsMixin): # lint-amnesty, pylint: disable=missing-class-docstring + + @classmethod + def setUpClass(cls): + # pylint: disable=super-method-not-called + with super().setUpClassAndTestData(): + cls.course = CourseFactory.create() + super().setUpClassAndForumMock() + + @classmethod + def tearDownClass(cls): + super().tearDownClass() + super().disposeForumMocks() + + @classmethod + def setUpTestData(cls): + super().setUpTestData() + + cls.student = UserFactory.create() + CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id) + + def _test_unicode_data(self, text): # lint-amnesty, pylint: disable=missing-function-docstring + self._configure_mock_responses(course=self.course, text=text) + request = RequestFactory().get("dummy_url") + request.user = self.student + # so (request.headers.get('x-requested-with') == 'XMLHttpRequest') == True + request.META["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest" + + response = views.user_profile(request, str(self.course.id), str(self.student.id)) + assert response.status_code == 200 + response_data = json.loads(response.content.decode('utf-8')) + assert response_data['discussion_data'][0]['title'] == text + assert response_data['discussion_data'][0]['body'] == text + + +class ForumMFETestCase(ForumsEnableMixin, SharedModuleStoreTestCase, ModuleStoreTestCase, MockForumApiMixin): # lint-amnesty, pylint: disable=missing-class-docstring + """ + Tests that the MFE upgrade banner and MFE is shown in the correct situation with the correct UI + """ + + def setUp(self): + super().setUp() + self.course = CourseFactory.create() + self.user = UserFactory.create() + self.staff_user = AdminFactory.create() + CourseEnrollmentFactory.create(user=self.user, course_id=self.course.id) + self.set_mock_return_value("get_user", { + "id": "test_thread", + "title": "Title", + "body": "", + "default_sort_key": "date", + "upvoted_ids": [], + "downvoted_ids": [], + "subscribed_thread_ids": [], + }) + self.set_mock_return_value("get_user_active_threads", {}) + + @classmethod + def setUpClass(cls): + super().setUpClass() + super().setUpClassAndForumMock() + + @classmethod + def tearDownClass(cls): + super().tearDownClass() + super().disposeForumMocks() + + @override_settings(DISCUSSIONS_MICROFRONTEND_URL="http://test.url") + def test_redirect_from_legacy_base_url_to_new_experience(self): + """ + Verify that the legacy url is redirected to MFE homepage when + ENABLE_DISCUSSIONS_MFE flag is enabled. + """ + + with override_waffle_flag(ENABLE_DISCUSSIONS_MFE, True): + self.client.login(username=self.user.username, password=self.TEST_PASSWORD) + url = reverse("forum_form_discussion", args=[self.course.id]) + response = self.client.get(url) + assert response.status_code == 302 + expected_url = f"{settings.DISCUSSIONS_MICROFRONTEND_URL}/{str(self.course.id)}" + assert response.url == expected_url + + @override_settings(DISCUSSIONS_MICROFRONTEND_URL="http://test.url") + def test_redirect_from_legacy_profile_url_to_new_experience(self): + """ + Verify that the requested user profile is redirected to MFE learners tab when + ENABLE_DISCUSSIONS_MFE flag is enabled + """ + with override_waffle_flag(ENABLE_DISCUSSIONS_MFE, True): + self.client.login(username=self.user.username, password=self.TEST_PASSWORD) + url = reverse("user_profile", args=[self.course.id, self.user.id]) + response = self.client.get(url) + assert response.status_code == 302 + expected_url = f"{settings.DISCUSSIONS_MICROFRONTEND_URL}/{str(self.course.id)}/learners" + assert response.url == expected_url + + @override_settings(DISCUSSIONS_MICROFRONTEND_URL="http://test.url") + def test_redirect_from_legacy_single_thread_to_new_experience(self): + """ + Verify that a legacy single url is redirected to corresponding MFE thread url when the ENABLE_DISCUSSIONS_MFE + flag is enabled + """ + + with override_waffle_flag(ENABLE_DISCUSSIONS_MFE, True): + self.client.login(username=self.user.username, password=self.TEST_PASSWORD) + url = reverse("single_thread", args=[self.course.id, "test_discussion", "test_thread"]) + response = self.client.get(url) + assert response.status_code == 302 + expected_url = f"{settings.DISCUSSIONS_MICROFRONTEND_URL}/{str(self.course.id)}/posts/test_thread" + assert response.url == expected_url diff --git a/lms/djangoapps/experiments/tests/test_views.py b/lms/djangoapps/experiments/tests/test_views.py index 1378fbd9f0..398e199c71 100644 --- a/lms/djangoapps/experiments/tests/test_views.py +++ b/lms/djangoapps/experiments/tests/test_views.py @@ -21,6 +21,7 @@ from lms.djangoapps.experiments.models import ExperimentData # lint-amnesty, py from lms.djangoapps.experiments.serializers import ExperimentDataSerializer from openedx.core.djangolib.testing.utils import skip_unless_lms from xmodule.modulestore.tests.factories import CourseFactory # lint-amnesty, pylint: disable=wrong-import-order +from common.test.utils import assert_dict_contains_subset CROSS_DOMAIN_REFERER = 'https://ecommerce.edx.org' @@ -42,7 +43,7 @@ class ExperimentDataViewSetTests(APITestCase, ModuleStoreTestCase): # lint-amne ExperimentData.objects.get(user=user) data['user'] = user.username - self.assertDictContainsSubset(data, response.data) + assert_dict_contains_subset(self, data, response.data) def test_list_permissions(self): """ Users should only be able to list their own data. """ diff --git a/lms/djangoapps/grades/tests/test_events.py b/lms/djangoapps/grades/tests/test_events.py index eac8cc9a4a..4b3063265a 100644 --- a/lms/djangoapps/grades/tests/test_events.py +++ b/lms/djangoapps/grades/tests/test_events.py @@ -29,6 +29,7 @@ from lms.djangoapps.grades.models import PersistentCourseGrade from lms.djangoapps.grades.tests.utils import mock_passing_grade from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory +from common.test.utils import assert_dict_contains_subset class PersistentGradeEventsTest(SharedModuleStoreTestCase, OpenEdxEventsTestMixin): @@ -90,7 +91,8 @@ class PersistentGradeEventsTest(SharedModuleStoreTestCase, OpenEdxEventsTestMixi PERSISTENT_GRADE_SUMMARY_CHANGED.connect(event_receiver) grade = PersistentCourseGrade.update_or_create(**self.params) self.assertTrue(self.receiver_called) - self.assertDictContainsSubset( + assert_dict_contains_subset( + self, { "signal": PERSISTENT_GRADE_SUMMARY_CHANGED, "sender": None, @@ -151,7 +153,8 @@ class CoursePassingStatusEventsTest(SharedModuleStoreTestCase, OpenEdxEventsTest grade_factory.update(self.user, self.course) self.assertTrue(self.receiver_called) - self.assertDictContainsSubset( + assert_dict_contains_subset( + self, { "signal": COURSE_PASSING_STATUS_UPDATED, "sender": None, @@ -224,7 +227,8 @@ class CCXCoursePassingStatusEventsTest( grade_factory.update(self.user, self.store.get_course(self.ccx_locator)) self.assertTrue(self.receiver_called) - self.assertDictContainsSubset( + assert_dict_contains_subset( + self, { "signal": CCX_COURSE_PASSING_STATUS_UPDATED, "sender": None, diff --git a/lms/djangoapps/instructor_task/tests/test_integration.py b/lms/djangoapps/instructor_task/tests/test_integration.py index 267f8021cd..e2a2c75497 100644 --- a/lms/djangoapps/instructor_task/tests/test_integration.py +++ b/lms/djangoapps/instructor_task/tests/test_integration.py @@ -44,6 +44,7 @@ from openedx.core.djangoapps.util.testing import TestConditionalContent from openedx.core.lib.url_utils import quote_slashes from xmodule.modulestore import ModuleStoreEnum # lint-amnesty, pylint: disable=wrong-import-order from xmodule.modulestore.tests.factories import BlockFactory # lint-amnesty, pylint: disable=wrong-import-order +from common.test.utils import assert_dict_contains_subset log = logging.getLogger(__name__) @@ -585,7 +586,7 @@ class TestGradeReportConditionalContent(TestReportMixin, TestConditionalContent, Arguments: task_result (dict): Return value of `CourseGradeReport.generate`. """ - self.assertDictContainsSubset({'attempted': 2, 'succeeded': 2, 'failed': 0}, task_result) + assert_dict_contains_subset(self, {'attempted': 2, 'succeeded': 2, 'failed': 0}, task_result) def verify_grades_in_csv(self, students_grades, ignore_other_columns=False): """ diff --git a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py index 0a8c5e788b..4144dd9568 100644 --- a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py +++ b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py @@ -77,6 +77,7 @@ from xmodule.tests.helpers import override_descriptor_system # pylint: disable= from ..models import ReportStore from ..tasks_helper.utils import UPDATE_STATUS_FAILED, UPDATE_STATUS_SUCCEEDED +from common.test.utils import assert_dict_contains_subset _TEAMS_CONFIG = TeamsConfig({ 'max_size': 2, @@ -97,7 +98,7 @@ class InstructorGradeReportTestCase(TestReportMixin, InstructorTaskCourseTestCas with patch('lms.djangoapps.instructor_task.tasks_helper.runner._get_current_task'): with patch(USE_ON_DISK_GRADE_REPORT, return_value=use_tempfile): result = CourseGradeReport.generate(None, None, course_id, {}, 'graded') - self.assertDictContainsSubset({'attempted': num_rows, 'succeeded': num_rows, 'failed': 0}, result) + assert_dict_contains_subset(self, {'attempted': num_rows, 'succeeded': num_rows, 'failed': 0}, result) report_store = ReportStore.from_config(config_name='GRADES_DOWNLOAD') report_csv_filename = report_store.links_for(course_id)[0][0] report_path = report_store.path_to(course_id, report_csv_filename) @@ -135,7 +136,7 @@ class TestInstructorGradeReport(InstructorGradeReportTestCase): with patch(USE_ON_DISK_GRADE_REPORT, return_value=use_tempfile): result = CourseGradeReport.generate(None, None, self.course.id, {}, 'graded') num_students = len(emails) - self.assertDictContainsSubset({'attempted': num_students, 'succeeded': num_students, 'failed': 0}, result) + assert_dict_contains_subset(self, {'attempted': num_students, 'succeeded': num_students, 'failed': 0}, result) @ddt.data(True, False) @patch('lms.djangoapps.instructor_task.tasks_helper.runner._get_current_task') @@ -150,7 +151,7 @@ class TestInstructorGradeReport(InstructorGradeReportTestCase): ] with patch(USE_ON_DISK_GRADE_REPORT, return_value=use_tempfile): result = CourseGradeReport.generate(None, None, self.course.id, {}, 'graded') - self.assertDictContainsSubset({'attempted': 1, 'succeeded': 0, 'failed': 1}, result) + assert_dict_contains_subset(self, {'attempted': 1, 'succeeded': 0, 'failed': 1}, result) report_store = ReportStore.from_config(config_name='GRADES_DOWNLOAD') assert any(('grade_report_err' in item[0]) for item in report_store.links_for(self.course.id)) @@ -334,7 +335,7 @@ class TestInstructorGradeReport(InstructorGradeReportTestCase): ) ] result = CourseGradeReport.generate(None, None, self.course.id, {}, 'graded') - self.assertDictContainsSubset({'attempted': 1, 'succeeded': 1, 'failed': 0}, result) + assert_dict_contains_subset(self, {'attempted': 1, 'succeeded': 1, 'failed': 0}, result) def test_certificate_eligibility(self): """ @@ -430,8 +431,10 @@ class TestInstructorGradeReport(InstructorGradeReportTestCase): self._verify_cell_data_for_user('inactive-student', self.course.id, 'Enrollment Status', NOT_ENROLLED_IN_COURSE) expected_students = 2 - self.assertDictContainsSubset( - {'attempted': expected_students, 'succeeded': expected_students, 'failed': 0}, result + assert_dict_contains_subset( + self, + {'attempted': expected_students, 'succeeded': expected_students, 'failed': 0}, + result, ) @@ -539,12 +542,16 @@ class TestProblemResponsesReport(TestReportMixin, InstructorTaskModuleTestCase): usage_key_str_list=[str(problem.location)], ) assert len(student_data) == 1 - self.assertDictContainsSubset({ - 'username': 'student', - 'location': 'test_course > Section > Subsection > Problem1', - 'block_key': 'block-v1:edx+1.23x+test_course+type@problem+block@Problem1', - 'title': 'Problem1', - }, student_data[0]) + assert_dict_contains_subset( + self, + { + 'username': 'student', + 'location': 'test_course > Section > Subsection > Problem1', + 'block_key': 'block-v1:edx+1.23x+test_course+type@problem+block@Problem1', + 'title': 'Problem1', + }, + student_data[0], + ) assert 'state' in student_data[0] assert student_data_keys_list == ['username', 'title', 'location', 'block_key', 'state'] mock_list_problem_responses.assert_called_with(self.course.id, ANY, ANY) @@ -569,22 +576,30 @@ class TestProblemResponsesReport(TestReportMixin, InstructorTaskModuleTestCase): usage_key_str_list=[str(self.course.location)], ) assert len(student_data) == 2 - self.assertDictContainsSubset({ - 'username': 'student', - 'location': 'test_course > Section > Subsection > Problem1', - 'block_key': 'block-v1:edx+1.23x+test_course+type@problem+block@Problem1', - 'title': 'Problem1', - 'some': 'state1', - 'more': 'state1!', - }, student_data[0]) - self.assertDictContainsSubset({ - 'username': 'student', - 'location': 'test_course > Section > Subsection > Problem1', - 'block_key': 'block-v1:edx+1.23x+test_course+type@problem+block@Problem1', - 'title': 'Problem1', - 'some': 'state2', - 'more': 'state2!', - }, student_data[1]) + assert_dict_contains_subset( + self, + { + 'username': 'student', + 'location': 'test_course > Section > Subsection > Problem1', + 'block_key': 'block-v1:edx+1.23x+test_course+type@problem+block@Problem1', + 'title': 'Problem1', + 'some': 'state1', + 'more': 'state1!', + }, + student_data[0], + ) + assert_dict_contains_subset( + self, + { + 'username': 'student', + 'location': 'test_course > Section > Subsection > Problem1', + 'block_key': 'block-v1:edx+1.23x+test_course+type@problem+block@Problem1', + 'title': 'Problem1', + 'some': 'state2', + 'more': 'state2!', + }, + student_data[1], + ) assert student_data[0]['state'] == student_data[1]['state'] assert student_data_keys_list == ['username', 'title', 'location', 'more', 'some', 'block_key', 'state'] @@ -610,22 +625,30 @@ class TestProblemResponsesReport(TestReportMixin, InstructorTaskModuleTestCase): usage_key_str_list=[str(self.course.location)], ) assert len(student_data) == 2 - self.assertDictContainsSubset({ - 'username': 'student', - 'location': 'test_course > Section > Subsection > Problem1', - 'block_key': 'block-v1:edx+1.23x+test_course+type@problem+block@Problem1', - 'title': 'Problem1', - 'some': 'state1', - 'more': 'state1!', - }, student_data[0]) - self.assertDictContainsSubset({ - 'username': 'student', - 'location': 'test_course > Section > Subsection > Problem1', - 'block_key': 'block-v1:edx+1.23x+test_course+type@problem+block@Problem1', - 'title': 'Problem1', - 'some': 'state2', - 'more': 'state2!', - }, student_data[1]) + assert_dict_contains_subset( + self, + { + 'username': 'student', + 'location': 'test_course > Section > Subsection > Problem1', + 'block_key': 'block-v1:edx+1.23x+test_course+type@problem+block@Problem1', + 'title': 'Problem1', + 'some': 'state1', + 'more': 'state1!', + }, + student_data[0], + ) + assert_dict_contains_subset( + self, + { + 'username': 'student', + 'location': 'test_course > Section > Subsection > Problem1', + 'block_key': 'block-v1:edx+1.23x+test_course+type@problem+block@Problem1', + 'title': 'Problem1', + 'some': 'state2', + 'more': 'state2!', + }, + student_data[1], + ) assert student_data[0]['state'] == student_data[1]['state'] assert student_data_keys_list == ['username', 'title', 'location', 'some', 'more', 'block_key', 'state'] @@ -642,16 +665,20 @@ class TestProblemResponsesReport(TestReportMixin, InstructorTaskModuleTestCase): usage_key_str_list=[str(self.course.location)], ) assert len(student_data) == 1 - self.assertDictContainsSubset({ - 'username': 'student', - 'location': 'test_course > Section > Subsection > Problem1', - 'block_key': 'block-v1:edx+1.23x+test_course+type@problem+block@Problem1', - 'title': 'Problem1', - 'Answer ID': 'Problem1_2_1', - 'Answer': 'Option 1', - 'Correct Answer': 'Option 1', - 'Question': 'The correct answer is Option 1', - }, student_data[0]) + assert_dict_contains_subset( + self, + { + 'username': 'student', + 'location': 'test_course > Section > Subsection > Problem1', + 'block_key': 'block-v1:edx+1.23x+test_course+type@problem+block@Problem1', + 'title': 'Problem1', + 'Answer ID': 'Problem1_2_1', + 'Answer': 'Option 1', + 'Correct Answer': 'Option 1', + 'Question': 'The correct answer is Option 1', + }, + student_data[0], + ) assert 'state' in student_data[0] assert student_data_keys_list == ['username', 'title', 'location', 'Answer', 'Answer ID', 'Correct Answer', 'Question', 'block_key', 'state'] @@ -671,16 +698,20 @@ class TestProblemResponsesReport(TestReportMixin, InstructorTaskModuleTestCase): ) assert len(student_data) == 2 for idx in range(1, 3): - self.assertDictContainsSubset({ - 'username': 'student', - 'location': f'test_course > Section > Subsection > Problem{idx}', - 'block_key': f'block-v1:edx+1.23x+test_course+type@problem+block@Problem{idx}', - 'title': f'Problem{idx}', - 'Answer ID': f'Problem{idx}_2_1', - 'Answer': 'Option 1', - 'Correct Answer': 'Option 1', - 'Question': 'The correct answer is Option 1', - }, student_data[idx - 1]) + assert_dict_contains_subset( + self, + { + 'username': 'student', + 'location': f'test_course > Section > Subsection > Problem{idx}', + 'block_key': f'block-v1:edx+1.23x+test_course+type@problem+block@Problem{idx}', + 'title': f'Problem{idx}', + 'Answer ID': f'Problem{idx}_2_1', + 'Answer': 'Option 1', + 'Correct Answer': 'Option 1', + 'Question': 'The correct answer is Option 1', + }, + student_data[idx - 1], + ) assert 'state' in student_data[(idx - 1)] @ddt.data( @@ -819,7 +850,11 @@ class TestProblemGradeReport(TestReportMixin, InstructorTaskModuleTestCase): """ with patch(USE_ON_DISK_GRADE_REPORT, return_value=use_tempfile): result = ProblemGradeReport.generate(None, None, self.course.id, {}, 'graded') - self.assertDictContainsSubset({'action_name': 'graded', 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) + assert_dict_contains_subset( + self, + {'action_name': 'graded', 'attempted': 2, 'succeeded': 2, 'failed': 0}, + result + ) self.verify_rows_in_csv([ dict(list(zip( self.csv_header_row, @@ -845,7 +880,11 @@ class TestProblemGradeReport(TestReportMixin, InstructorTaskModuleTestCase): self.submit_student_answer(self.student_1.username, 'Problem1', ['Option 1']) with patch(USE_ON_DISK_GRADE_REPORT, return_value=use_tempfile): result = ProblemGradeReport.generate(None, None, self.course.id, {}, 'graded') - self.assertDictContainsSubset({'action_name': 'graded', 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) + assert_dict_contains_subset( + self, + {'action_name': 'graded', 'attempted': 2, 'succeeded': 2, 'failed': 0}, + result + ) problem_name = 'Homework 1: Subsection - Problem1' header_row = self.csv_header_row + [problem_name + ' (Earned)', problem_name + ' (Possible)'] self.verify_rows_in_csv([ @@ -891,8 +930,10 @@ class TestProblemGradeReport(TestReportMixin, InstructorTaskModuleTestCase): self.submit_student_answer(student_verified.username, 'Problem1', ['Option 1']) with patch(USE_ON_DISK_GRADE_REPORT, return_value=use_tempfile): result = ProblemGradeReport.generate(None, None, self.course.id, {}, 'graded') - self.assertDictContainsSubset( - {'action_name': 'graded', 'attempted': 1, 'succeeded': 1, 'failed': 0}, result + assert_dict_contains_subset( + self, + {'action_name': 'graded', 'attempted': 1, 'succeeded': 1, 'failed': 0}, + result, ) @patch('lms.djangoapps.instructor_task.tasks_helper.runner._get_current_task') @@ -913,7 +954,11 @@ class TestProblemGradeReport(TestReportMixin, InstructorTaskModuleTestCase): self.submit_student_answer(self.student_1.username, 'Problem1', ['Option 1']) with patch(USE_ON_DISK_GRADE_REPORT, return_value=use_tempfile): result = ProblemGradeReport.generate(None, None, self.course.id, {}, 'graded') - self.assertDictContainsSubset({'action_name': 'graded', 'attempted': 3, 'succeeded': 3, 'failed': 0}, result) + assert_dict_contains_subset( + self, + {'action_name': 'graded', 'attempted': 3, 'succeeded': 3, 'failed': 0}, + result + ) problem_name = 'Homework 1: Subsection - Problem1' header_row = self.csv_header_row + [problem_name + ' (Earned)', problem_name + ' (Possible)'] self.verify_rows_in_csv([ @@ -987,8 +1032,10 @@ class TestProblemReportSplitTestContent(TestReportMixin, TestConditionalContent, with patch('lms.djangoapps.instructor_task.tasks_helper.runner._get_current_task'): with patch(USE_ON_DISK_GRADE_REPORT, return_value=use_tempfile): result = ProblemGradeReport.generate(None, None, self.course.id, {}, 'graded') - self.assertDictContainsSubset( - {'action_name': 'graded', 'attempted': 2, 'succeeded': 2, 'failed': 0}, result + assert_dict_contains_subset( + self, + {'action_name': 'graded', 'attempted': 2, 'succeeded': 2, 'failed': 0}, + result, ) problem_names = ['Homework 1: Subsection - problem_a_url', 'Homework 1: Subsection - problem_b_url'] @@ -1143,8 +1190,10 @@ class TestProblemReportCohortedContent(TestReportMixin, ContentGroupTestCase, In with patch('lms.djangoapps.instructor_task.tasks_helper.runner._get_current_task'): with patch(USE_ON_DISK_GRADE_REPORT, return_value=use_tempfile): result = ProblemGradeReport.generate(None, None, self.course.id, {}, 'graded') - self.assertDictContainsSubset( - {'action_name': 'graded', 'attempted': 5, 'succeeded': 5, 'failed': 0}, result + assert_dict_contains_subset( + self, + {'action_name': 'graded', 'attempted': 5, 'succeeded': 5, 'failed': 0}, + result, ) problem_names = ['Homework 1: Subsection - Problem0', 'Homework 1: Subsection - Problem1'] header_row = ['Student ID', 'Email', 'Username', 'Enrollment Status', 'Grade'] @@ -1228,7 +1277,7 @@ class TestCourseSurveyReport(TestReportMixin, InstructorTaskCourseTestCase): None, None, self.course.id, task_input, 'generating course survey report' ) - self.assertDictContainsSubset({'attempted': 2, 'succeeded': 2, 'failed': 0}, result) + assert_dict_contains_subset(self, {'attempted': 2, 'succeeded': 2, 'failed': 0}, result) def test_generate_course_survey_report(self): """ @@ -1262,7 +1311,7 @@ class TestCourseSurveyReport(TestReportMixin, InstructorTaskCourseTestCase): ]) expected_data = [header_row, student1_row, student2_row] - self.assertDictContainsSubset({'attempted': 2, 'succeeded': 2, 'failed': 0}, result) + assert_dict_contains_subset(self, {'attempted': 2, 'succeeded': 2, 'failed': 0}, result) self._verify_csv_file_report(report_store, expected_data) def _verify_csv_file_report(self, report_store, expected_data): @@ -1297,7 +1346,7 @@ class TestStudentReport(TestReportMixin, InstructorTaskCourseTestCase): links = report_store.links_for(self.course.id) assert len(links) == 1 - self.assertDictContainsSubset({'attempted': 1, 'succeeded': 1, 'failed': 0}, result) + assert_dict_contains_subset(self, {'attempted': 1, 'succeeded': 1, 'failed': 0}, result) def test_custom_directory(self): self.create_student('student', 'student@example.com') @@ -1352,7 +1401,7 @@ class TestStudentReport(TestReportMixin, InstructorTaskCourseTestCase): result = upload_students_csv(None, None, self.course.id, task_input, 'calculated') # This assertion simply confirms that the generation completed with no errors num_students = len(students) - self.assertDictContainsSubset({'attempted': num_students, 'succeeded': num_students, 'failed': 0}, result) + assert_dict_contains_subset(self, {'attempted': num_students, 'succeeded': num_students, 'failed': 0}, result) class TestTeamStudentReport(TestReportMixin, InstructorTaskCourseTestCase): @@ -1382,7 +1431,7 @@ class TestTeamStudentReport(TestReportMixin, InstructorTaskCourseTestCase): with patch('lms.djangoapps.instructor_task.tasks_helper.runner._get_current_task') as mock_current_task: mock_current_task.return_value = current_task result = upload_students_csv(None, None, self.course.id, task_input, 'calculated') - self.assertDictContainsSubset({'attempted': 2, 'succeeded': 2, 'failed': 0}, result) + assert_dict_contains_subset(self, {'attempted': 2, 'succeeded': 2, 'failed': 0}, result) report_store = ReportStore.from_config(config_name='GRADES_DOWNLOAD') report_csv_filename = report_store.links_for(self.course.id)[0][0] report_path = report_store.path_to(self.course.id, report_csv_filename) @@ -1447,7 +1496,7 @@ class TestListMayEnroll(TestReportMixin, InstructorTaskCourseTestCase): links = report_store.links_for(self.course.id) assert len(links) == 1 - self.assertDictContainsSubset({'attempted': 1, 'succeeded': 1, 'failed': 0}, result) + assert_dict_contains_subset(self, {'attempted': 1, 'succeeded': 1, 'failed': 0}, result) def test_unicode_email_addresses(self): """ @@ -1463,7 +1512,11 @@ class TestListMayEnroll(TestReportMixin, InstructorTaskCourseTestCase): result = upload_may_enroll_csv(None, None, self.course.id, task_input, 'calculated') # This assertion simply confirms that the generation completed with no errors num_enrollments = len(enrollments) - self.assertDictContainsSubset({'attempted': num_enrollments, 'succeeded': num_enrollments, 'failed': 0}, result) + assert_dict_contains_subset( + self, + {'attempted': num_enrollments, 'succeeded': num_enrollments, 'failed': 0}, + result + ) class MockDefaultStorage: @@ -1510,7 +1563,7 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase): 'student_1\xec,,Cohort 1\n' 'student_2,,Cohort 2' ) - self.assertDictContainsSubset({'total': 2, 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) + assert_dict_contains_subset(self, {'total': 2, 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) self.verify_rows_in_csv( [ dict(list(zip(self.csv_header_row, ['Cohort 1', 'True', '1', '', '', '']))), @@ -1525,7 +1578,7 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase): ',student_1@example.com,Cohort 1\n' ',student_2@example.com,Cohort 2' ) - self.assertDictContainsSubset({'total': 2, 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) + assert_dict_contains_subset(self, {'total': 2, 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) self.verify_rows_in_csv( [ dict(list(zip(self.csv_header_row, ['Cohort 1', 'True', '1', '', '', '']))), @@ -1540,7 +1593,7 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase): 'student_1\xec,student_1@example.com,Cohort 1\n' 'student_2,student_2@example.com,Cohort 2' ) - self.assertDictContainsSubset({'total': 2, 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) + assert_dict_contains_subset(self, {'total': 2, 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) self.verify_rows_in_csv( [ dict(list(zip(self.csv_header_row, ['Cohort 1', 'True', '1', '', '', '']))), @@ -1561,7 +1614,7 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase): 'student_1\xec,student_1@example.com,Cohort 1\n' # valid username and email 'Invalid,student_2@example.com,Cohort 2' # invalid username, valid email ) - self.assertDictContainsSubset({'total': 2, 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) + assert_dict_contains_subset(self, {'total': 2, 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) self.verify_rows_in_csv( [ dict(list(zip(self.csv_header_row, ['Cohort 1', 'True', '1', '', '', '']))), @@ -1575,7 +1628,7 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase): 'username,email,cohort\n' 'Invalid,,Cohort 1\n' ) - self.assertDictContainsSubset({'total': 1, 'attempted': 1, 'succeeded': 0, 'failed': 1}, result) + assert_dict_contains_subset(self, {'total': 1, 'attempted': 1, 'succeeded': 0, 'failed': 1}, result) self.verify_rows_in_csv( [ dict(list(zip(self.csv_header_row, ['Cohort 1', 'True', '0', 'Invalid', '', '']))), @@ -1589,7 +1642,7 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase): ',student_1@example.com,Does Not Exist\n' 'student_2,,Cohort 2' ) - self.assertDictContainsSubset({'total': 2, 'attempted': 2, 'succeeded': 1, 'failed': 1}, result) + assert_dict_contains_subset(self, {'total': 2, 'attempted': 2, 'succeeded': 1, 'failed': 1}, result) self.verify_rows_in_csv( [ dict(list(zip(self.csv_header_row, ['Does Not Exist', 'False', '0', '', '', '']))), @@ -1603,8 +1656,11 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase): 'username,email,cohort\n' ',example_email@example.com,Cohort 1' ) - self.assertDictContainsSubset({'total': 1, 'attempted': 1, 'succeeded': 0, 'failed': 0}, - result) + assert_dict_contains_subset( + self, + {'total': 1, 'attempted': 1, 'succeeded': 0, 'failed': 0}, + result, + ) self.verify_rows_in_csv( [ dict(list(zip(self.csv_header_row, ['Cohort 1', 'True', '0', '', '', 'example_email@example.com']))), @@ -1617,7 +1673,7 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase): 'username,email,cohort\n' ',student_1@,Cohort 1\n' ) - self.assertDictContainsSubset({'total': 1, 'attempted': 1, 'succeeded': 0, 'failed': 1}, result) + assert_dict_contains_subset(self, {'total': 1, 'attempted': 1, 'succeeded': 0, 'failed': 1}, result) self.verify_rows_in_csv( [ dict(list(zip(self.csv_header_row, ['Cohort 1', 'True', '0', '', 'student_1@', '']))), @@ -1642,7 +1698,7 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase): 'student_1\xec,\n' 'student_2' ) - self.assertDictContainsSubset({'total': 2, 'attempted': 2, 'succeeded': 0, 'failed': 2}, result) + assert_dict_contains_subset(self, {'total': 2, 'attempted': 2, 'succeeded': 0, 'failed': 2}, result) self.verify_rows_in_csv( [ dict(list(zip(self.csv_header_row, ['', 'False', '0', '', '', '']))), @@ -1654,7 +1710,7 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase): result = self._cohort_students_and_upload( 'username,email,cohort' ) - self.assertDictContainsSubset({'total': 0, 'attempted': 0, 'succeeded': 0, 'failed': 0}, result) + assert_dict_contains_subset(self, {'total': 0, 'attempted': 0, 'succeeded': 0, 'failed': 0}, result) self.verify_rows_in_csv([]) def test_carriage_return(self): @@ -1666,7 +1722,7 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase): 'student_1\xec,,Cohort 1\r' 'student_2,,Cohort 2' ) - self.assertDictContainsSubset({'total': 2, 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) + assert_dict_contains_subset(self, {'total': 2, 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) self.verify_rows_in_csv( [ dict(list(zip(self.csv_header_row, ['Cohort 1', 'True', '1', '', '', '']))), @@ -1684,7 +1740,7 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase): 'student_1\xec,,Cohort 1\r\n' 'student_2,,Cohort 2' ) - self.assertDictContainsSubset({'total': 2, 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) + assert_dict_contains_subset(self, {'total': 2, 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) self.verify_rows_in_csv( [ dict(list(zip(self.csv_header_row, ['Cohort 1', 'True', '1', '', '', '']))), @@ -1704,7 +1760,7 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase): 'student_1\xec,,Cohort 2\n' 'student_2,,Cohort 1' ) - self.assertDictContainsSubset({'total': 2, 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) + assert_dict_contains_subset(self, {'total': 2, 'attempted': 2, 'succeeded': 2, 'failed': 0}, result) self.verify_rows_in_csv( [ dict(list(zip(self.csv_header_row, ['Cohort 1', 'True', '1', '', '', '']))), @@ -1724,7 +1780,7 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase): 'student_1\xec,,Cohort 1\n' 'student_2,,Cohort 2' ) - self.assertDictContainsSubset({'total': 2, 'attempted': 2, 'skipped': 2, 'failed': 0}, result) + assert_dict_contains_subset(self, {'total': 2, 'attempted': 2, 'skipped': 2, 'failed': 0}, result) self.verify_rows_in_csv( [ dict(list(zip(self.csv_header_row, ['Cohort 1', 'True', '0', '', '', '']))), @@ -1809,7 +1865,8 @@ class TestGradeReport(TestReportMixin, InstructorTaskModuleTestCase): with patch('lms.djangoapps.instructor_task.tasks_helper.runner._get_current_task'): result = CourseGradeReport.generate(None, None, self.course.id, {}, 'graded') - self.assertDictContainsSubset( + assert_dict_contains_subset( + self, {'action_name': 'graded', 'attempted': 1, 'succeeded': 1, 'failed': 0}, result, ) @@ -1868,7 +1925,8 @@ class TestGradeReport(TestReportMixin, InstructorTaskModuleTestCase): with patch('lms.djangoapps.instructor_task.tasks_helper.runner._get_current_task'): result = CourseGradeReport.generate(None, None, self.course.id, {}, 'graded') - self.assertDictContainsSubset( + assert_dict_contains_subset( + self, {'action_name': 'graded', 'attempted': 1, 'succeeded': 1, 'failed': 0}, result, ) @@ -1912,8 +1970,10 @@ class TestGradeReport(TestReportMixin, InstructorTaskModuleTestCase): self.submit_student_answer(student_1.username, 'Problem4', ['Option 1']) self.submit_student_answer(student_verified.username, 'Problem4', ['Option 1']) result = CourseGradeReport.generate(None, None, self.course.id, {}, 'graded') - self.assertDictContainsSubset( - {'action_name': 'graded', 'attempted': 1, 'succeeded': 1, 'failed': 0}, result + assert_dict_contains_subset( + self, + {'action_name': 'graded', 'attempted': 1, 'succeeded': 1, 'failed': 0}, + result, ) @ddt.data(True, False) @@ -2517,9 +2577,10 @@ class TestCertificateGeneration(InstructorTaskModuleTestCase): None, None, self.course.id, task_input, 'certificates generated' ) - self.assertDictContainsSubset( + assert_dict_contains_subset( + self, expected_results, - result + result, ) def _create_students(self, number_of_students): diff --git a/lms/djangoapps/program_enrollments/models.py b/lms/djangoapps/program_enrollments/models.py index 04114a9dd5..2abec16d93 100644 --- a/lms/djangoapps/program_enrollments/models.py +++ b/lms/djangoapps/program_enrollments/models.py @@ -10,7 +10,7 @@ from django.utils.translation import gettext_lazy as _ from model_utils.models import TimeStampedModel from opaque_keys.edx.django.models import CourseKeyField from simple_history.models import HistoricalRecords -from user_util import user_util +from openedx.core.lib import user_util from common.djangoapps.student.models import CourseEnrollment diff --git a/lms/djangoapps/support/tests/test_views.py b/lms/djangoapps/support/tests/test_views.py index 4abc4508ea..df713daf0b 100644 --- a/lms/djangoapps/support/tests/test_views.py +++ b/lms/djangoapps/support/tests/test_views.py @@ -52,7 +52,7 @@ from common.djangoapps.student.tests.factories import ( UserFactory, ) from common.djangoapps.third_party_auth.tests.factories import SAMLProviderConfigFactory -from common.test.utils import disable_signal +from common.test.utils import disable_signal, assert_dict_contains_subset from lms.djangoapps.program_enrollments.tests.factories import ProgramCourseEnrollmentFactory, ProgramEnrollmentFactory from lms.djangoapps.support.models import CourseResetAudit from lms.djangoapps.support.serializers import ProgramEnrollmentSerializer @@ -343,14 +343,18 @@ class SupportViewEnrollmentsTests(SharedModuleStoreTestCase, SupportViewTestCase assert response.status_code == 200 data = json.loads(response.content.decode('utf-8')) assert len(data) == 1 - self.assertDictContainsSubset({ - 'mode': CourseMode.AUDIT, - 'manual_enrollment': {}, - 'user': self.student.username, - 'course_id': str(self.course.id), - 'is_active': True, - 'verified_upgrade_deadline': None, - }, data[0]) + assert_dict_contains_subset( + self, + { + 'mode': CourseMode.AUDIT, + 'manual_enrollment': {}, + 'user': self.student.username, + 'course_id': str(self.course.id), + 'is_active': True, + 'verified_upgrade_deadline': None, + }, + data[0], + ) assert {CourseMode.VERIFIED, CourseMode.AUDIT, CourseMode.HONOR, CourseMode.NO_ID_PROFESSIONAL_MODE, CourseMode.PROFESSIONAL, CourseMode.CREDIT_MODE} == {mode['slug'] for mode in data[0]['course_modes']} assert 'enterprise_course_enrollments' not in data[0] @@ -471,10 +475,14 @@ class SupportViewEnrollmentsTests(SharedModuleStoreTestCase, SupportViewTestCase ) response = self.client.get(self.url) assert response.status_code == 200 - self.assertDictContainsSubset({ - 'enrolled_by': self.user.email, - 'reason': 'Financial Assistance', - }, json.loads(response.content.decode('utf-8'))[0]['manual_enrollment']) + assert_dict_contains_subset( + self, + { + 'enrolled_by': self.user.email, + 'reason': 'Financial Assistance', + }, + json.loads(response.content.decode('utf-8'))[0]['manual_enrollment'], + ) @disable_signal(signals, 'post_save') @ddt.data('username', 'email') diff --git a/lms/envs/production.py b/lms/envs/production.py index 0620d4f2c0..aeccaf0c0f 100644 --- a/lms/envs/production.py +++ b/lms/envs/production.py @@ -141,11 +141,6 @@ SESSION_COOKIE_SAMESITE = DCS_SESSION_COOKIE_SAMESITE for feature, value in _YAML_TOKENS.get('FEATURES', {}).items(): FEATURES[feature] = value -ALLOWED_HOSTS = [ - "*", - _YAML_TOKENS.get('LMS_BASE'), -] - # Cache used for location mapping -- called many times with the same key/value # in a given request. if 'loc_cache' not in CACHES: diff --git a/lms/static/sass/_build-lms-v1.scss b/lms/static/sass/_build-lms-v1.scss index 4d64e67685..90c5077c1f 100644 --- a/lms/static/sass/_build-lms-v1.scss +++ b/lms/static/sass/_build-lms-v1.scss @@ -67,7 +67,6 @@ // features @import 'features/bookmarks-v1'; -@import "features/announcements"; @import 'features/_unsupported-browser-alert'; @import 'features/content-type-gating'; @import 'features/course-duration-limits'; diff --git a/lms/static/sass/features/_announcements.scss b/lms/static/sass/features/_announcements.scss deleted file mode 100644 index 0c3c01fe60..0000000000 --- a/lms/static/sass/features/_announcements.scss +++ /dev/null @@ -1,28 +0,0 @@ -// lms - features - announcements -// ==================== -.announcements-list { - display: inline-block; - width: 100%; - - .announcement { - background-color: $course-profile-bg; - align-content: center; - text-align: center; - padding: 22px 33px; - margin-bottom: 15px; - } - - .announcement-button { - display: inline-block; - padding: 3px 10px; - font-size: 0.75rem; - } - - .prev { - float: left; - } - - .next { - float: right; - } -} diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index d44cdefc63..6149418035 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -294,16 +294,6 @@ from common.djangoapps.student.models import CourseEnrollment