From ad4b0541f88e66a68a916e33332a755b3a30998f Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Fri, 10 Oct 2025 15:05:29 -0400 Subject: [PATCH] test: Don't test HTML views that no longer exist. The removed tests either needed to check things on the outline page which makes them not relevant tests, or they just needed data from the course_handler which they can get from json now. --- .../contentstore/tests/test_contentstore.py | 33 ++----------------- .../views/tests/test_course_index.py | 32 ++---------------- .../views/tests/test_exam_settings_view.py | 5 --- 3 files changed, 5 insertions(+), 65 deletions(-) diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py index 7862d60f95..fa1075621f 100644 --- a/cms/djangoapps/contentstore/tests/test_contentstore.py +++ b/cms/djangoapps/contentstore/tests/test_contentstore.py @@ -1399,33 +1399,6 @@ class ContentStoreTest(ContentStoreTestCase): item = BlockFactory.create(parent_location=course.location) self.assertIsInstance(item, SequenceBlock) - @override_waffle_flag(toggles.LEGACY_STUDIO_COURSE_OUTLINE, True) - def test_course_overview_view_with_course(self): - """Test viewing the course overview page with an existing course""" - course = CourseFactory.create() - resp = self._show_course_overview(course.id) - - # course_handler raise 404 for old mongo course - if course.id.deprecated: - self.assertEqual(resp.status_code, 404) - return - - assets_url = reverse_course_url( - 'assets_handler', - course.location.course_key - ) - - self.assertContains( - resp, - '
'.format( # lint-amnesty, pylint: disable=line-too-long - locator=str(course.location), - course_key=str(course.id), - assets_url=assets_url, - ), - status_code=200, - html=True - ) - def test_create_block(self): """Test creating a new xblock instance.""" course = CourseFactory.create() @@ -1499,8 +1472,7 @@ class ContentStoreTest(ContentStoreTestCase): ) course_key = course_items[0].id - with override_waffle_flag(toggles.LEGACY_STUDIO_COURSE_OUTLINE, True): - resp = self._show_course_overview(course_key) + resp = self._show_course_overview(course_key) # course_handler raise 404 for old mongo course if course_key.deprecated: @@ -1744,7 +1716,8 @@ class ContentStoreTest(ContentStoreTestCase): """ Show the course overview page. """ - resp = self.client.get_html(get_url('course_handler', course_key, 'course_key_string')) + resp = self.client.get(get_url('course_handler', course_key, 'course_key_string'), + content_type='application/json') return resp def test_wiki_slug(self): diff --git a/cms/djangoapps/contentstore/views/tests/test_course_index.py b/cms/djangoapps/contentstore/views/tests/test_course_index.py index c164ccc564..58c425c601 100644 --- a/cms/djangoapps/contentstore/views/tests/test_course_index.py +++ b/cms/djangoapps/contentstore/views/tests/test_course_index.py @@ -10,16 +10,12 @@ from unittest import mock, skip import ddt import pytz from django.core.exceptions import PermissionDenied -from django.test.utils import override_settings from django.utils.translation import gettext as _ -from edx_toggles.toggles.testutils import override_waffle_flag from search.api import perform_search -from cms.djangoapps.contentstore import toggles from cms.djangoapps.contentstore.courseware_index import CoursewareSearchIndexer, SearchIndexingError from cms.djangoapps.contentstore.tests.utils import CourseTestCase from cms.djangoapps.contentstore.utils import ( - get_proctored_exam_settings_url, reverse_course_url, reverse_usage_url ) @@ -34,7 +30,6 @@ from ..course import _deprecated_blocks_info, course_outline_initial_state, rein from cms.djangoapps.contentstore.xblock_storage_handlers.view_handlers import VisibilityState, create_xblock_info -@override_waffle_flag(toggles.LEGACY_STUDIO_COURSE_OUTLINE, True) @ddt.ddt class TestCourseOutline(CourseTestCase): """ @@ -226,38 +221,15 @@ class TestCourseOutline(CourseTestCase): expected_block_types ) - @override_settings(FEATURES={'ENABLE_EXAM_SETTINGS_HTML_VIEW': True}) - @mock.patch('cms.djangoapps.models.settings.course_metadata.CourseMetadata.validate_proctoring_settings') - def test_proctoring_link_is_visible(self, mock_validate_proctoring_settings): - """ - Test to check proctored exam settings mfe url is rendering properly - """ - mock_validate_proctoring_settings.return_value = [ - { - 'key': 'proctoring_provider', - 'message': 'error message', - 'model': {'display_name': 'proctoring_provider'} - }, - { - 'key': 'proctoring_provider', - 'message': 'error message', - 'model': {'display_name': 'proctoring_provider'} - } - ] - response = self.client.get_html(reverse_course_url('course_handler', self.course.id)) - proctored_exam_settings_url = get_proctored_exam_settings_url(self.course.id) - self.assertContains(response, proctored_exam_settings_url, 2) - def test_number_of_calls_to_db(self): """ Test to check number of queries made to mysql and mongo """ - with self.assertNumQueries(39, table_ignorelist=WAFFLE_TABLES): + with self.assertNumQueries(21, table_ignorelist=WAFFLE_TABLES): with check_mongo_calls(3): - self.client.get_html(reverse_course_url('course_handler', self.course.id)) + self.client.get(reverse_course_url('course_handler', self.course.id), content_type="application/json") -@override_waffle_flag(toggles.LEGACY_STUDIO_COURSE_OUTLINE, True) class TestCourseReIndex(CourseTestCase): """ Unit tests for the course outline. diff --git a/cms/djangoapps/contentstore/views/tests/test_exam_settings_view.py b/cms/djangoapps/contentstore/views/tests/test_exam_settings_view.py index 9bad2c77fc..88c4aa27eb 100644 --- a/cms/djangoapps/contentstore/views/tests/test_exam_settings_view.py +++ b/cms/djangoapps/contentstore/views/tests/test_exam_settings_view.py @@ -24,7 +24,6 @@ from common.djangoapps.util.testing import UrlResetMixin "ENABLE_PROCTORED_EXAMS": True, }, ) -@override_waffle_flag(toggles.LEGACY_STUDIO_COURSE_OUTLINE, True) @override_waffle_flag(toggles.LEGACY_STUDIO_CERTIFICATES, True) @override_waffle_flag(toggles.LEGACY_STUDIO_SCHEDULE_DETAILS, True) @override_waffle_flag(toggles.LEGACY_STUDIO_CONFIGURATIONS, True) @@ -93,7 +92,6 @@ class TestExamSettingsView(CourseTestCase, UrlResetMixin): ) @ddt.data( "advanced_settings_handler", - "course_handler", ) def test_exam_settings_alert_with_exam_settings_enabled(self, page_handler): """ @@ -130,7 +128,6 @@ class TestExamSettingsView(CourseTestCase, UrlResetMixin): ) @ddt.data( "advanced_settings_handler", - "course_handler", ) @override_waffle_flag(toggles.LEGACY_STUDIO_EXAM_SETTINGS, True) def test_exam_settings_alert_with_exam_settings_disabled(self, page_handler): @@ -173,7 +170,6 @@ class TestExamSettingsView(CourseTestCase, UrlResetMixin): ) @ddt.data( "advanced_settings_handler", - "course_handler", ) def test_invalid_provider_alert(self, page_handler): """ @@ -198,7 +194,6 @@ class TestExamSettingsView(CourseTestCase, UrlResetMixin): @ddt.data( "advanced_settings_handler", - "course_handler", ) def test_exam_settings_alert_not_shown(self, page_handler): """