Commit c124fb34 by Calen Pennington

Make test_favicon tests work independently

parent e93d112c
...@@ -9,12 +9,14 @@ from nose.plugins.attrib import attr ...@@ -9,12 +9,14 @@ from nose.plugins.attrib import attr
import sys import sys
from util.testing import UrlResetMixin
@attr('shard_1')
class FaviconTestCase(TestCase):
def setUp(self): @attr('shard_1')
super(FaviconTestCase, self).setUp() class FaviconTestCase(UrlResetMixin, TestCase):
"""
Tests of the courseware favicon.
"""
def test_favicon_redirect(self): def test_favicon_redirect(self):
resp = self.client.get("/favicon.ico") resp = self.client.get("/favicon.ico")
...@@ -27,15 +29,7 @@ class FaviconTestCase(TestCase): ...@@ -27,15 +29,7 @@ class FaviconTestCase(TestCase):
@override_settings(FAVICON_PATH="images/foo.ico") @override_settings(FAVICON_PATH="images/foo.ico")
def test_favicon_redirect_with_favicon_path_setting(self): def test_favicon_redirect_with_favicon_path_setting(self):
self.reset_urls()
# for some reason I had to put this inline rather than just using
# the UrlResetMixin
urlconf = settings.ROOT_URLCONF
if urlconf in sys.modules:
reload(sys.modules[urlconf])
clear_url_caches()
resolve("/")
resp = self.client.get("/favicon.ico") resp = self.client.get("/favicon.ico")
self.assertEqual(resp.status_code, 301) self.assertEqual(resp.status_code, 301)
...@@ -46,14 +40,16 @@ class FaviconTestCase(TestCase): ...@@ -46,14 +40,16 @@ class FaviconTestCase(TestCase):
) )
@patch.dict("django.conf.settings.FEATURES", {"USE_CUSTOM_THEME": True}) @patch.dict("django.conf.settings.FEATURES", {"USE_CUSTOM_THEME": True})
@override_settings(FAVICON_PATH="images/bar_fav.ico")
@override_settings(THEME_NAME="bar") @override_settings(THEME_NAME="bar")
def test_favicon_redirect_with_theme(self): def test_favicon_redirect_with_theme(self):
self.assertEqual(settings.FEATURES["USE_CUSTOM_THEME"], True) self.assertEqual(settings.FEATURES["USE_CUSTOM_THEME"], True)
self.reset_urls()
resp = self.client.get("/favicon.ico") resp = self.client.get("/favicon.ico")
self.assertEqual(resp.status_code, 301) self.assertEqual(resp.status_code, 301)
self.assertRedirects( self.assertRedirects(
resp, resp,
"/static/images/foo.ico", "/static/images/bar_fav.ico",
status_code=301, target_status_code=404 # @@@ how to avoid 404? status_code=301, target_status_code=404 # @@@ how to avoid 404?
) )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment