fixup! feat: remove ENABLE_MKTG_SITE from enrollment, courseware, and mobile API

Author: feanil

lms/djangoapps/course_wiki/tests/tests.py

@@ -8,6 +8,7 @@
 from django.urls import reverse
 
 from lms.djangoapps.courseware.tests.tests import LoginEnrollmentTestCase
+from openedx.features.course_experience import course_home_url
 from openedx.features.course_experience.url_helpers import make_learning_mfe_courseware_url
 from openedx.features.enterprise_support.tests.mixins.enterprise import EnterpriseTestConsentRequired
 from xmodule.modulestore.tests.django_utils import (
@@ -135,7 +136,7 @@ def test_course_navigator(self):
     def test_wiki_not_accessible_when_not_enrolled(self):
         """
         Test that going from a course page to a wiki page when not enrolled
-        redirects a user to the course about page
+        redirects a user to the course home page
         """
 
         self.login(self.instructor, self.password)
@@ -151,10 +152,10 @@ def test_wiki_not_accessible_when_not_enrolled(self):
         resp = self.client.get(course_wiki_page, follow=False, HTTP_REFERER=referer)
         assert resp.status_code == 302
 
-        # and end up at the course about page
+        # and end up at the course home page
         resp = self.client.get(course_wiki_page, follow=True, HTTP_REFERER=referer)
         target_url, __ = resp.redirect_chain[-1]
-        assert target_url.endswith(reverse('about_course', args=[str(self.toy.id)]))
+        assert target_url == course_home_url(self.toy.id)
 
     @patch.dict("django.conf.settings.FEATURES", {'ALLOW_WIKI_ROOT_ACCESS': True})
     def test_redirect_when_not_logged_in(self):

lms/djangoapps/courseware/tests/test_about.py

@@ -42,6 +42,7 @@
 
 
 @ddt.ddt
+@patch.dict(settings.FEATURES, {'ENABLE_COURSE_HOME_REDIRECT': False})
 class AboutTestCase(LoginEnrollmentTestCase, SharedModuleStoreTestCase, EventTrackingTestCase, MilestonesTestCaseMixin):
     """
     Tests about xblock.
@@ -113,6 +114,7 @@ def test_visible_about_page_settings(self):
         resp = self.client.get(url)
         self.assertRedirects(resp, reverse('dashboard'), fetch_redirect_response=False)
 
+    @patch.dict(settings.FEATURES, {'ENABLE_COURSE_HOME_REDIRECT': True})
     def test_logged_in_marketing(self):
         self.setup_user()
         url = reverse('about_course', args=[str(self.course.id)])
@@ -208,6 +210,7 @@ def test_about_page_public_view(self, course_visibility):
             self.assertContains(resp, "Enroll Now")
 
 
+@patch.dict(settings.FEATURES, {'ENABLE_COURSE_HOME_REDIRECT': False})
 class AboutTestCaseXML(LoginEnrollmentTestCase, ModuleStoreTestCase):
     """
     Tests for the course about page
@@ -251,6 +254,7 @@ def test_anonymous_user_xml(self):
         self.assertContains(resp, self.xml_data)
 
 
+@patch.dict(settings.FEATURES, {'ENABLE_COURSE_HOME_REDIRECT': False})
 class AboutWithCappedEnrollmentsTestCase(LoginEnrollmentTestCase, SharedModuleStoreTestCase):
     """
     This test case will check the About page when a course has a capped enrollment
@@ -293,6 +297,7 @@ def test_enrollment_cap(self):
         self.assertNotContains(resp, REG_STR)
 
 
+@patch.dict(settings.FEATURES, {'ENABLE_COURSE_HOME_REDIRECT': False})
 class AboutWithInvitationOnly(SharedModuleStoreTestCase):
     """
     This test case will check the About page when a course is invitation only.
@@ -332,6 +337,7 @@ def test_invitation_only_but_allowed(self):
         self.assertContains(resp, REG_STR)
 
 
+@patch.dict(settings.FEATURES, {'ENABLE_COURSE_HOME_REDIRECT': False})
 class AboutWithClosedEnrollment(ModuleStoreTestCase):
     """
     This test case will check the About page for a course that has enrollment start/end
@@ -368,6 +374,7 @@ def test_course_price_is_not_visible_in_sidebar(self):
 
 
 @ddt.ddt
+@patch.dict(settings.FEATURES, {'ENABLE_COURSE_HOME_REDIRECT': False})
 class AboutSidebarHTMLTestCase(SharedModuleStoreTestCase):
     """
     This test case will check the About page for the content in the HTML sidebar.

lms/djangoapps/courseware/tests/test_filters.py

@@ -1,6 +1,9 @@
 """
 Test that various filters are fired for courseware views.
 """
+from unittest.mock import patch
+
+from django.conf import settings
 from django.http import HttpResponse
 from django.test import override_settings
 from django.urls import reverse
@@ -104,6 +107,7 @@ def run_filter(self, context, template_name):  # pylint: disable=arguments-diffe
 
 
 @skip_unless_lms
+@patch.dict(settings.FEATURES, {'ENABLE_COURSE_HOME_REDIRECT': False})
 class CourseAboutFiltersTest(ModuleStoreTestCase):
     """
     Tests for the Open edX Filters associated with the course about rendering process.

lms/djangoapps/courseware/tests/test_view_authentication.py

@@ -23,6 +23,7 @@
 from lms.djangoapps.courseware.access import has_access
 from lms.djangoapps.courseware.tests.helpers import CourseAccessTestMixin, LoginEnrollmentTestCase
 from lms.djangoapps.instructor.toggles import LEGACY_INSTRUCTOR_DASHBOARD
+from openedx.features.course_experience import course_home_url
 from openedx.features.enterprise_support.tests.mixins.enterprise import EnterpriseTestConsentRequired
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -58,10 +59,13 @@ def _check_non_staff_light(self, course):
 
         `course` is an instance of CourseBlock.
         """
-        urls = [reverse('about_course', kwargs={'course_id': str(course.id)}),
-                reverse('courses')]
-        for url in urls:
-            self.assert_request_status_code(200, url)
+        about_url = reverse('about_course', kwargs={'course_id': str(course.id)})
+        response = self.client.get(about_url)
+        assert response.status_code == 302
+        assert response['Location'] == course_home_url(course.id)
+
+        # courses view redirects to / when no marketing URL is configured
+        self.assert_request_status_code(302, reverse('courses'))
 
     def _check_non_staff_dark(self, course):
         """
@@ -94,9 +98,14 @@ def _check_staff(self, course):
             for index in range(len(course.textbooks))
         ])
         for url in urls:
-            # Instructor dashboard returns 302 (MFE redirect) by default
             if 'instructor' in url:
+                # Instructor dashboard returns 302 (MFE redirect) by default
                 self.assert_request_status_code(302, url)
+            elif 'about' in url:
+                # about_course redirects enrolled users to course home MFE
+                response = self.client.get(url)
+                assert response.status_code == 302
+                assert response['Location'] == course_home_url(course.id)
             else:
                 self.assert_request_status_code(200, url)
 
@@ -127,8 +136,14 @@ def _check_staff_legacy(self, course):
             for index in range(len(course.textbooks))
         ])
         for url in urls:
-            # With legacy flag enabled, all URLs return 200 (instructor dashboard skips MFE redirect)
-            self.assert_request_status_code(200, url)
+            if 'about' in url:
+                # about_course redirects enrolled users to course home MFE
+                response = self.client.get(url)
+                assert response.status_code == 302
+                assert response['Location'] == course_home_url(course.id)
+            else:
+                # With legacy flag enabled, all other URLs return 200
+                self.assert_request_status_code(200, url)
 
         # The student progress tab behavior is affected by legacy flag in normal scenarios
         url = reverse(
@@ -153,8 +168,14 @@ def _check_staff_legacy_dark_launch(self, course):
             for index in range(len(course.textbooks))
         ])
         for url in urls:
-            # With legacy flag enabled, all URLs return 200 (instructor dashboard skips MFE redirect)
-            self.assert_request_status_code(200, url)
+            if 'about' in url:
+                # about_course redirects enrolled users to course home MFE
+                response = self.client.get(url)
+                assert response.status_code == 302
+                assert response['Location'] == course_home_url(course.id)
+            else:
+                # With legacy flag enabled, all other URLs return 200
+                self.assert_request_status_code(200, url)
 
         # In dark launch scenarios, student progress URL still returns 302 even with legacy flag
         # because course access restrictions take precedence