fix: look up ENABLE_CATALOG_MICROFRONTEND in settings directly, adjust tests

Author: Serj-N

cms/djangoapps/contentstore/rest_api/v1/views/tests/test_settings.py

@@ -17,7 +17,6 @@
 
 
 @ddt.ddt
-@patch.dict("django.conf.settings.FEATURES", {"ENABLE_CATALOG_MICROFRONTEND": False})
 class CourseSettingsViewTest(CourseTestCase, PermissionAccessMixin):
     """
     Tests for CourseSettingsView.

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -91,7 +91,6 @@ def decorated_func(*args, **kwargs):
 
 
 @override_settings(CONTENTSTORE=TEST_DATA_CONTENTSTORE)
-@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_CATALOG_MICROFRONTEND": False})
 class ContentStoreTestCase(CourseTestCase):
     """
     Base class for Content Store Test Cases
@@ -1050,7 +1049,6 @@ def _check_verticals(self, locations):
 
 
 @ddt.ddt
-@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_CATALOG_MICROFRONTEND": False})
 class ContentStoreTest(ContentStoreTestCase):
     """
     Tests for the CMS ContentStore application.

cms/djangoapps/contentstore/tests/test_course_settings.py

@@ -182,7 +182,6 @@ def test_disable_advanced_settings_feature(self, disable_advanced_settings):
 
         with override_settings(FEATURES={
             'DISABLE_ADVANCED_SETTINGS': disable_advanced_settings,
-            'ENABLE_CATALOG_MICROFRONTEND': False,
         }):
             for handler in (
                 'import_handler',
@@ -222,7 +221,6 @@ def test_disable_advanced_settings_feature(self, disable_advanced_settings):
 
 
 @ddt.ddt
-@patch.dict("django.conf.settings.FEATURES", {"ENABLE_CATALOG_MICROFRONTEND": False})
 class CourseDetailsViewTest(CourseTestCase, MilestonesTestCaseMixin):
     """
     Tests for modifying content on the first course settings page (course dates, overview, etc.).
@@ -1927,7 +1925,6 @@ def test_add(self):
         self.assertEqual(len(self.starting_graders) + 1, len(current_graders))
 
 
-@patch.dict("django.conf.settings.FEATURES", {"ENABLE_CATALOG_MICROFRONTEND": False})
 class CourseEnrollmentEndFieldTest(CourseTestCase):
     """
     Base class to test the enrollment end fields in the course settings details view in Studio

cms/djangoapps/contentstore/views/tests/test_credit_eligibility.py

@@ -15,7 +15,6 @@
 from xmodule.modulestore.tests.factories import CourseFactory  # lint-amnesty, pylint: disable=wrong-import-order
 
 
-@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_CATALOG_MICROFRONTEND": False})
 class CreditEligibilityTest(CourseTestCase):
     """
     Base class to test the course settings details view in Studio for credit

cms/djangoapps/contentstore/views/tests/test_exam_settings_view.py

@@ -30,7 +30,6 @@
 @override_waffle_flag(toggles.LEGACY_STUDIO_CONFIGURATIONS, True)
 @override_waffle_flag(toggles.LEGACY_STUDIO_GRADING, True)
 @override_waffle_flag(toggles.LEGACY_STUDIO_ADVANCED_SETTINGS, True)
-@patch.dict("django.conf.settings.FEATURES", {"ENABLE_CATALOG_MICROFRONTEND": False})
 class TestExamSettingsView(CourseTestCase, UrlResetMixin):
     """
     Unit tests for the exam settings view.

common/djangoapps/student/tests/test_views.py

@@ -191,7 +191,6 @@ class StudentDashboardTests(SharedModuleStoreTestCase, MilestonesTestCaseMixin,
             'DISABLE_START_DATES': False,
             'ENABLE_MKTG_SITE': True,
             'DISABLE_SET_JWT_COOKIES_FOR_TESTS': True,
-            'ENABLE_CATALOG_MICROFRONTEND': False,
         },
         'SOCIAL_SHARING_SETTINGS': {
             'CUSTOM_COURSE_URLS': True,

common/djangoapps/util/tests/test_course.py

@@ -146,8 +146,6 @@ def test_sharing_link_with_new_course_about_page(
         """
         Verify the method gives correct course sharing url when new course about page is used.
         """
-        features = settings.FEATURES.copy()
-        features['ENABLE_CATALOG_MICROFRONTEND'] = catalog_mfe_enabled
-        with override_settings(FEATURES=features):
+        with override_settings(ENABLE_CATALOG_MICROFRONTEND=catalog_mfe_enabled):
             actual_course_sharing_link = get_link_for_about_page(self.course_overview)
             assert actual_course_sharing_link == expected_course_sharing_link

lms/djangoapps/branding/toggles.py

@@ -11,5 +11,5 @@ def use_catalog_mfe():
     Returns a boolean = true if the Catalog MFE is enabled.
     """
     return configuration_helpers.get_value(
-        'ENABLE_CATALOG_MICROFRONTEND', settings.FEATURES.get('ENABLE_CATALOG_MICROFRONTEND')
+        'ENABLE_CATALOG_MICROFRONTEND', settings.ENABLE_CATALOG_MICROFRONTEND
     )

lms/djangoapps/learner_home/test_views.py

@@ -98,11 +98,8 @@ def test_link_with_new_catalog_page(self, catalog_mfe_enabled, expected_catalog_
         """
         Test that the catalog link is constructed correctly based on the MFE flags.
         """
-        features = settings.FEATURES.copy()
-        features['ENABLE_CATALOG_MICROFRONTEND'] = catalog_mfe_enabled
-        with override_settings(FEATURES=features):
-            actual_course_sharing_link = get_platform_settings()["courseSearchUrl"]
-            assert actual_course_sharing_link == expected_catalog_link
+        with override_settings(ENABLE_CATALOG_MICROFRONTEND=catalog_mfe_enabled):
+            assert get_platform_settings()["courseSearchUrl"] == expected_catalog_link
 
 
 @ddt.ddt