Merge pull request #11494 from edx/saleem-latif/WL-307

WL-307: correct FAVICON_PATH setting for comprehensive theming
openedx · Feb 16, 2016 · cd101d5 · cd101d5
2 parents 8280e22 + 75f17ec
commit cd101d5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/lms/djangoapps/courseware/tests/test_comprehensive_theming.py b/lms/djangoapps/courseware/tests/test_comprehensive_theming.py
@@ -71,3 +71,18 @@ def test_default_logo_image(self):
     def test_overridden_logo_image(self):
         result = staticfiles.finders.find('images/logo.png')
         self.assertEqual(result, settings.REPO_ROOT / 'themes/red-theme/lms/static/images/logo.png')
+
+    def test_default_favicon(self):
+        """
+        Test default favicon is served if no theme is applied
+        """
+        result = staticfiles.finders.find('images/favicon.ico')
+        self.assertEqual(result, settings.REPO_ROOT / 'lms/static/images/favicon.ico')
+
+    @with_comprehensive_theme(settings.REPO_ROOT / 'themes/red-theme')
+    def test_overridden_favicon(self):
+        """
+        Test comprehensive theme override on favicon image.
+        """
+        result = staticfiles.finders.find('images/favicon.ico')
+        self.assertEqual(result, settings.REPO_ROOT / 'themes/red-theme/lms/static/images/favicon.ico')
diff --git a/openedx/core/djangoapps/theming/core.py b/openedx/core/djangoapps/theming/core.py
@@ -45,10 +45,6 @@ def comprehensive_theme_changes(theme_dir):
     if locale_dir.isdir():
         changes['settings']['LOCALE_PATHS'] = [locale_dir] + settings.LOCALE_PATHS
 
-    favicon = component_dir / "static" / "images" / "favicon.ico"
-    if favicon.isfile():
-        changes['settings']['FAVICON_PATH'] = str(favicon)
-
     return changes
 
 

diff --git a/themes/red-theme/lms/static/images/favicon.ico b/themes/red-theme/lms/static/images/favicon.ico