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

- course_about_url in enrollment emails now uses
  get_link_for_about_page(), resolving the marketing URL, social sharing
  URL, or LMS about URL as a fallback
- get_link_for_about_page() uses course.marketing_url unconditionally
- has_marketing_url() returns bool(self.marketing_url) directly
- url_to_enroll() always returns marketing_link('COURSES')
- _course_home_redirect_enabled() only checks ENABLE_COURSE_HOME_REDIRECT;
  default changed from True to False because the flag previously had no
  effect when ENABLE_MKTG_SITE=False (the old default) — operators who
  relied on ENABLE_MKTG_SITE=True to activate the course-about redirect
  must now set ENABLE_COURSE_HOME_REDIRECT=True explicitly
- Remove ENABLE_MKTG_SITE patches from courseware, instructor, and
  mobile API tests; merge redundant test cases where applicable

BREAKING CHANGE: ENABLE_COURSE_HOME_REDIRECT now defaults to False.
Operators who previously had ENABLE_MKTG_SITE=True and want the
course about page to redirect to the learning MFE must explicitly set
ENABLE_COURSE_HOME_REDIRECT=True in their configuration.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: feanil

common/djangoapps/util/course.py

@@ -59,7 +59,7 @@ def get_link_for_about_page(course):
 
     if is_social_sharing_enabled and course.social_sharing_url:
         course_about_url = course.social_sharing_url
-    elif settings.FEATURES.get('ENABLE_MKTG_SITE') and getattr(course, 'marketing_url', None):
+    elif getattr(course, 'marketing_url', None):
         course_about_url = course.marketing_url
     else:
         course_about_url = f'{about_base_url}/courses/{course.id}/about'

common/djangoapps/util/tests/test_course.py

@@ -38,13 +38,12 @@ def setUp(self):
         self.course_overview.marketing_url = 'test_marketing_url'
         self.course_overview.save()
 
-    def get_course_sharing_link(self, enable_social_sharing, enable_mktg_site, use_overview=True):
+    def get_course_sharing_link(self, enable_social_sharing, use_overview=True):
         """
         Get course sharing link.
 
         Arguments:
             enable_social_sharing(Boolean): To indicate whether social sharing is enabled.
-            enable_mktg_site(Boolean): A feature flag to decide activation of marketing site.
 
         Keyword Arguments:
             use_overview: indicates whether course overview or course block should get
@@ -53,9 +52,6 @@ def get_course_sharing_link(self, enable_social_sharing, enable_mktg_site, use_o
         Returns course sharing url.
         """
         mock_settings = {
-            'FEATURES': {
-                'ENABLE_MKTG_SITE': enable_mktg_site,
-            },
             'SOCIAL_SHARING_SETTINGS': {
                 'CUSTOM_COURSE_URLS': enable_social_sharing
             }
@@ -70,19 +66,17 @@ def get_course_sharing_link(self, enable_social_sharing, enable_mktg_site, use_o
         return course_sharing_link
 
     @ddt.data(
-        (True, True, 'test_social_sharing_url'),
-        (False, True, 'test_marketing_url'),
-        (True, False, 'test_social_sharing_url'),
-        (False, False, f'{settings.LMS_ROOT_URL}/courses/course-v1:test_org+test_number+test_run/about'),
+        (True, 'test_social_sharing_url'),
+        (False, 'test_marketing_url'),
     )
     @ddt.unpack
-    def test_sharing_link_with_settings(self, enable_social_sharing, enable_mktg_site, expected_course_sharing_link):
+    def test_sharing_link_with_settings(self, enable_social_sharing, expected_course_sharing_link):
         """
-        Verify the method gives correct course sharing url on settings manipulations.
+        Verify the method gives correct course sharing url: social sharing URL takes priority
+        over marketing URL, which takes priority over the LMS about URL.
         """
         actual_course_sharing_link = self.get_course_sharing_link(
             enable_social_sharing=enable_social_sharing,
-            enable_mktg_site=enable_mktg_site,
         )
         assert actual_course_sharing_link == expected_course_sharing_link
 
@@ -107,7 +101,6 @@ def test_sharing_link_with_course_overview_attrs(self, overview_attrs, expected_
 
         actual_course_sharing_link = self.get_course_sharing_link(
             enable_social_sharing=True,
-            enable_mktg_site=True,
         )
         assert actual_course_sharing_link == expected_course_sharing_link
 
@@ -122,11 +115,10 @@ def test_sharing_link_with_course_overview_attrs(self, overview_attrs, expected_
     def test_sharing_link_with_course_block(self, enable_social_sharing, expected_course_sharing_link):
         """
         Verify the method gives correct course sharing url on passing
-        course block as a parameter.
+        course block as a parameter (course blocks have no marketing_url attribute).
         """
         actual_course_sharing_link = self.get_course_sharing_link(
             enable_social_sharing=enable_social_sharing,
-            enable_mktg_site=True,
             use_overview=False,
         )
         assert actual_course_sharing_link == expected_course_sharing_link
@@ -146,8 +138,11 @@ def test_sharing_link_with_new_course_about_page(
         self, catalog_mfe_enabled, expected_course_sharing_link
     ):
         """
-        Verify the method gives correct course sharing url when new course about page is used.
+        Verify the correct about URL base is used when neither social sharing URL nor
+        marketing URL is set (catalog MFE URL vs LMS root URL).
         """
+        self.course_overview.marketing_url = None
+        self.course_overview.save()
         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/courseware/tests/test_about.py

@@ -115,15 +115,13 @@ 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_MKTG_SITE': True})
+    @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)])
         resp = self.client.get(url)
         self.assertRedirects(resp, course_home_url(self.course.id), fetch_redirect_response=False)
 
-    @patch.dict(settings.FEATURES, {'ENABLE_COURSE_HOME_REDIRECT': False})
-    @patch.dict(settings.FEATURES, {'ENABLE_MKTG_SITE': True})
     def test_logged_in_marketing_without_course_home_redirect(self):
         """
         Verify user is not redirected to course home page when
@@ -135,19 +133,6 @@ def test_logged_in_marketing_without_course_home_redirect(self):
         # should not be redirected
         self.assertContains(resp, "OOGIE BLOOGIE")
 
-    @patch.dict(settings.FEATURES, {'ENABLE_COURSE_HOME_REDIRECT': True})
-    @patch.dict(settings.FEATURES, {'ENABLE_MKTG_SITE': False})
-    def test_logged_in_marketing_without_mktg_site(self):
-        """
-        Verify user is not redirected to course home page when
-        ENABLE_MKTG_SITE is set to False
-        """
-        self.setup_user()
-        url = reverse('about_course', args=[str(self.course.id)])
-        resp = self.client.get(url)
-        # should not be redirected
-        self.assertContains(resp, "OOGIE BLOOGIE")
-
     @patch.dict(settings.FEATURES, {'ENABLE_PREREQUISITE_COURSES': True})
     def test_pre_requisite_course(self):
         pre_requisite_course = CourseFactory.create(org='edX', course='900', display_name='pre requisite course')

lms/djangoapps/courseware/views/views.py

@@ -545,14 +545,11 @@ def get(self, request, course_id, tab_type, **kwargs):  # pylint: disable=argume
                 return CourseTabView.handle_exceptions(request, course_key, course, exception)
 
     @staticmethod
-    def url_to_enroll(course_key):
+    def url_to_enroll(course_key):  # pylint: disable=unused-argument
         """
         Returns the URL to use to enroll in the specified course.
         """
-        url_to_enroll = reverse('about_course', args=[str(course_key)])
-        if settings.FEATURES.get('ENABLE_MKTG_SITE'):
-            url_to_enroll = marketing_link('COURSES')
-        return url_to_enroll
+        return marketing_link('COURSES')
 
     @staticmethod
     def register_user_access_warning_messages(request, course):
@@ -1214,16 +1211,11 @@ def credit_course_requirements(course_key, student):
 
 def _course_home_redirect_enabled():
     """
-    Return True value if user needs to be redirected to course home based on value of
-    `ENABLE_MKTG_SITE` and `ENABLE_COURSE_HOME_REDIRECT feature` flags
-    Returns: boolean True or False
+    Return True if users should be redirected from the course about page to course home.
     """
-    if configuration_helpers.get_value(
-            'ENABLE_MKTG_SITE', settings.FEATURES.get('ENABLE_MKTG_SITE', False)
-    ) and configuration_helpers.get_value(
-        'ENABLE_COURSE_HOME_REDIRECT', settings.FEATURES.get('ENABLE_COURSE_HOME_REDIRECT', True)
-    ):
-        return True
+    return bool(configuration_helpers.get_value(
+        'ENABLE_COURSE_HOME_REDIRECT', settings.FEATURES.get('ENABLE_COURSE_HOME_REDIRECT', False)
+    ))
 
 
 @login_required

lms/djangoapps/instructor/enrollment.py

@@ -35,6 +35,7 @@
     get_event_transaction_id,
     set_event_transaction_type,
 )
+from common.djangoapps.util.course import get_link_for_about_page
 from lms.djangoapps.branding.api import get_logo_url_for_email
 from lms.djangoapps.courseware.models import StudentModule
 from lms.djangoapps.grades.api import constants as grades_constants
@@ -494,14 +495,7 @@ def get_email_params(course, auto_enroll, secure=True, course_key=None, display_
         path=reverse('course_root', kwargs={'course_id': course_key})
     )
 
-    # We can't get the url to the course's About page if the marketing site is enabled.
-    course_about_url = None
-    if not settings.FEATURES.get('ENABLE_MKTG_SITE', False):
-        course_about_url = '{proto}://{site}{path}'.format(
-            proto=protocol,
-            site=stripped_site_name,
-            path=reverse('about_course', kwargs={'course_id': course_key})
-        )
+    course_about_url = get_link_for_about_page(course)
 
     is_shib_course = uses_shib(course)
 

lms/djangoapps/instructor/tests/test_api.py

@@ -1316,50 +1316,7 @@ def test_enroll_with_email_not_registered(self, protocol):
 
             assert 'Once you have registered and activated your account,' in body
 
-            assert '{proto}://{site}{about_path}'.format(  # noqa: UP032
-                proto=protocol,
-                site=self.site_name,
-                about_path=self.about_path
-            ) in body
-
-            assert 'This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org' in body
-
-    @ddt.data('http', 'https')
-    @patch.dict(settings.FEATURES, {'ENABLE_MKTG_SITE': True})
-    def test_enroll_email_not_registered_mktgsite(self, protocol):
-        url = reverse('students_update_enrollment', kwargs={'course_id': str(self.course.id)})
-        params = {'identifiers': self.notregistered_email, 'action': 'enroll', 'email_students': True}
-        environ = {'wsgi.url_scheme': protocol}
-        response = self.client.post(url, params, **environ)
-
-        manual_enrollments = ManualEnrollmentAudit.objects.all()
-        assert manual_enrollments.count() == 1
-        assert manual_enrollments[0].state_transition == UNENROLLED_TO_ALLOWEDTOENROLL
-        assert response.status_code == 200
-
-        text_body = mail.outbox[0].body
-        html_body = mail.outbox[0].alternatives[0][0]
-
-        assert text_body.startswith('Dear student,')
-        assert 'To finish your registration, please visit' in text_body
-        assert 'Please finish your registration and fill' in html_body
-
-        for body in [text_body, html_body]:
-            assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format(  # noqa: UP032  # pylint: disable=line-too-long
-                display_name=self.course.display_name
-            ) in body
-
-            assert '{proto}://{site}/register'.format(  # noqa: UP032
-                proto=protocol,
-                site=self.site_name
-            ) in body
-
-            assert ('fill out the registration form making sure to use '
-                    'robot-not-an-email-yet@robot.org in the Email field') in body
-
-            assert 'You can then enroll in {display_name}.'.format(  # noqa: UP032
-                display_name=self.course.display_name
-            ) in body
+            assert f'{settings.LMS_ROOT_URL}{self.about_path}' in body
 
             assert 'This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org' in body
 
@@ -1587,11 +1544,7 @@ def test_enroll_with_email_not_registered_with_shib(self, protocol, mock_uses_sh
 
         text_body = mail.outbox[0].body
         html_body = mail.outbox[0].alternatives[0][0]
-        course_url = '{proto}://{site}{about_path}'.format(  # noqa: UP032
-            proto=protocol,
-            site=self.site_name,
-            about_path=self.about_path,
-        )
+        course_url = f'{settings.LMS_ROOT_URL}{self.about_path}'
         assert text_body.startswith('Dear student,')
         assert 'To access this course visit {course_url} and register for this course.'.format(  # noqa: UP032
             course_url=course_url,
@@ -1606,31 +1559,6 @@ def test_enroll_with_email_not_registered_with_shib(self, protocol, mock_uses_sh
 
             assert 'This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org' in body
 
-    @patch('lms.djangoapps.instructor.enrollment.uses_shib')
-    @patch.dict(settings.FEATURES, {'ENABLE_MKTG_SITE': True})
-    def test_enroll_email_not_registered_shib_mktgsite(self, mock_uses_shib):
-        # Try with marketing site enabled and shib on
-        mock_uses_shib.return_value = True
-
-        url = reverse('students_update_enrollment', kwargs={'course_id': str(self.course.id)})
-        # Try with marketing site enabled
-        with patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': True}):
-            response = self.client.post(url, {'identifiers': self.notregistered_email, 'action': 'enroll',
-                                              'email_students': True})
-
-        assert response.status_code == 200
-
-        text_body = mail.outbox[0].body
-        html_body = mail.outbox[0].alternatives[0][0]
-        assert text_body.startswith('Dear student,')
-
-        for body in [text_body, html_body]:
-            assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format(  # noqa: UP032  # pylint: disable=line-too-long
-                display_name=self.course.display_name,
-            ) in body
-
-            assert 'This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org' in body
-
     @ddt.data('http', 'https')
     @patch('lms.djangoapps.instructor.enrollment.uses_shib')
     def test_enroll_with_email_not_registered_with_shib_autoenroll(self, protocol, mock_uses_shib):
@@ -2270,11 +2198,7 @@ def test_add_notenrolled_with_email(self, protocol):
             assert 'by a member of the course staff.' in body
             assert 'enroll in this course and begin the beta test' in body
 
-            assert '{proto}://{site}{about_path}'.format(  # noqa: UP032
-                proto=protocol,
-                site=self.site_name,
-                about_path=self.about_path,
-            ) in body
+            assert f'{settings.LMS_ROOT_URL}{self.about_path}' in body
 
             assert 'This email was automatically sent from edx.org to {student_email}'.format(  # noqa: UP032
                 student_email=self.notenrolled_student.email,
@@ -2332,31 +2256,6 @@ def test_add_notenrolled_with_email_autoenroll(self, protocol):
                 student_email=self.notenrolled_student.email,
             ) in body
 
-    @patch.dict(settings.FEATURES, {'ENABLE_MKTG_SITE': True})
-    def test_add_notenrolled_email_mktgsite(self):
-        # Try with marketing site enabled
-        url = reverse('bulk_beta_modify_access', kwargs={'course_id': str(self.course.id)})
-        response = self.client.post(url, {'identifiers': self.notenrolled_student.email, 'action': 'add', 'email_students': True})  # pylint: disable=line-too-long
-
-        assert response.status_code == 200
-
-        text_body = mail.outbox[0].body
-        html_body = mail.outbox[0].alternatives[0][0]
-        student_name = self.notenrolled_student.profile.name
-        assert text_body.startswith(f'Dear {student_name}')
-
-        for body in [text_body, html_body]:
-            assert 'You have been invited to be a beta tester for {display_name} at edx.org'.format(  # noqa: UP032
-                display_name=self.course.display_name,
-            ) in body
-
-            assert 'by a member of the course staff.' in body
-            assert 'Visit edx.org' in body
-            assert 'enroll in this course and begin the beta test' in body
-            assert 'This email was automatically sent from edx.org to {student_email}'.format(  # noqa: UP032
-                student_email=self.notenrolled_student.email,
-            ) in body
-
     def test_enroll_with_email_not_registered(self):
         # User doesn't exist
         url = reverse('bulk_beta_modify_access', kwargs={'course_id': str(self.course.id)})

lms/djangoapps/instructor/tests/test_enrollment.py

@@ -887,6 +887,8 @@ class TestGetEmailParamsCCX(SharedModuleStoreTestCase):
     def setUpClass(cls):
         super().setUpClass()
         cls.course = CourseFactory.create()
+        # get_link_for_about_page uses course.id (parent course), not the CCX key
+        cls.course_about_url = f'{settings.LMS_ROOT_URL}/courses/{cls.course.id}/about'
 
     @override_settings(CUSTOM_COURSES_EDX=True)
     def setUp(self):
@@ -903,7 +905,6 @@ def setUp(self):
             site,
             self.course_key
         )
-        self.course_about_url = self.course_url + 'about'
         self.registration_url = f'https://{site}/register'
 
     @override_settings(CUSTOM_COURSES_EDX=True)
@@ -940,13 +941,11 @@ def setUpClass(cls):
             site,
             str(cls.course.id)
         )
-        cls.course_about_url = cls.course_url + 'about'
         cls.registration_url = f'https://{site}/register'
         cls.logo_url = get_logo_url_for_email()
+        cls.course_about_url = f'{settings.LMS_ROOT_URL}/courses/{cls.course.id}/about'
 
     def test_normal_params(self):
-        # For a normal site, what do we expect to get for the URLs?
-        # Also make sure `auto_enroll` is properly passed through.
         result = get_email_params(self.course, False)
 
         assert result['auto_enroll'] is False
@@ -955,18 +954,11 @@ def test_normal_params(self):
         assert result['course_url'] == self.course_url
         assert result['logo_url'] == self.logo_url
 
-    def test_marketing_params(self):
-        # For a site with a marketing front end, what do we expect to get for the URLs?
-        # Also make sure `auto_enroll` is properly passed through.
-        with patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': True}):
-            result = get_email_params(self.course, True)
+    def test_auto_enroll_params(self):
+        result = get_email_params(self.course, True)
 
         assert result['auto_enroll'] is True
-        # We should *not* get a course about url (LMS doesn't know what the marketing site URLs are)
-        assert result['course_about_url'] is None
-        assert result['registration_url'] == self.registration_url
-        assert result['course_url'] == self.course_url
-        assert result['logo_url'] == self.logo_url
+        assert result['course_about_url'] == self.course_about_url
 
     @patch('lms.djangoapps.instructor.enrollment.get_logo_url_for_email', return_value='https://www.logo.png')
     def test_logo_url_params(self, mock_get_logo_url_for_email):