Merge pull request #89 from edx/bug/christina/mktg-urls

Bug/christina/mktg urls

cms/djangoapps/contentstore/tests/test_utils.py

@@ -24,6 +24,30 @@ class LMSLinksTestCase(TestCase):
         with mock.patch.dict('django.conf.settings.MITX_FEATURES', {'ENABLE_MKTG_SITE': False}):
             self.assertEquals(self.get_about_page_link(), "//localhost:8000/courses/mitX/101/test/about")
 
+    @override_settings(MKTG_URLS={'ROOT': 'http://www.dummy'})
+    def about_page_marketing_site_remove_http_test(self):
+        """ Get URL for about page, marketing root present, remove http://. """
+        with mock.patch.dict('django.conf.settings.MITX_FEATURES', {'ENABLE_MKTG_SITE': True}):
+            self.assertEquals(self.get_about_page_link(), "//www.dummy/courses/mitX/101/test/about")
+
+    @override_settings(MKTG_URLS={'ROOT': 'https://www.dummy'})
+    def about_page_marketing_site_remove_https_test(self):
+        """ Get URL for about page, marketing root present, remove https://. """
+        with mock.patch.dict('django.conf.settings.MITX_FEATURES', {'ENABLE_MKTG_SITE': True}):
+            self.assertEquals(self.get_about_page_link(), "//www.dummy/courses/mitX/101/test/about")
+
+    @override_settings(MKTG_URLS={'ROOT': 'www.dummyhttps://x'})
+    def about_page_marketing_site_https__edge_test(self):
+        """ Get URL for about page, only remove https:// at the beginning of the string. """
+        with mock.patch.dict('django.conf.settings.MITX_FEATURES', {'ENABLE_MKTG_SITE': True}):
+            self.assertEquals(self.get_about_page_link(), "//www.dummyhttps://x/courses/mitX/101/test/about")
+
+    @override_settings(MKTG_URLS={})
+    def about_page_marketing_urls_not_set_test(self):
+        """ Error case. ENABLE_MKTG_SITE is True, but there is either no MKTG_URLS, or no MKTG_URLS Root property. """
+        with mock.patch.dict('django.conf.settings.MITX_FEATURES', {'ENABLE_MKTG_SITE': True}):
+            self.assertEquals(self.get_about_page_link(), None)
+
     @override_settings(LMS_BASE=None)
     def about_page_no_lms_base_test(self):
         """ No LMS_BASE, nor is ENABLE_MKTG_SITE True """

cms/djangoapps/contentstore/utils.py

@@ -4,6 +4,10 @@ from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from django.core.urlresolvers import reverse
 import copy
+import logging
+import re
+
+log = logging.getLogger(__name__)
 
 DIRECT_ONLY_CATEGORIES = ['course', 'chapter', 'sequential', 'about', 'static_tab', 'course_info']
 
@@ -108,9 +112,20 @@ def get_lms_link_for_about_page(location):
     Returns the url to the course about page from the location tuple.
     """
     if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE', False):
-        # Root will be "www.edx.org". The complete URL will still not be exactly correct,
-        # but redirects exist from www.edx.org to get to the drupal course about page URL.
-        about_base = settings.MKTG_URLS.get('ROOT')
+        if not hasattr(settings, 'MKTG_URLS'):
+            log.exception("ENABLE_MKTG_SITE is True, but MKTG_URLS is not defined.")
+            about_base = None
+        else:
+            marketing_urls = settings.MKTG_URLS
+            if marketing_urls.get('ROOT', None) is None:
+                log.exception('There is no ROOT defined in MKTG_URLS')
+                about_base = None
+            else:
+                # Root will be "https://www.edx.org". The complete URL will still not be exactly correct,
+                # but redirects exist from www.edx.org to get to the Drupal course about page URL.
+                about_base = marketing_urls.get('ROOT')
+                # Strip off https:// (or http://) to be consistent with the formatting of LMS_BASE.
+                about_base = re.sub(r"^https?://", "", about_base)
     elif settings.LMS_BASE is not None:
         about_base = settings.LMS_BASE
     else: