diff options
| author | Luke Plant <L.Plant.98@cantab.net> | 2010-09-13 23:09:56 +0000 |
|---|---|---|
| committer | Luke Plant <L.Plant.98@cantab.net> | 2010-09-13 23:09:56 +0000 |
| commit | 86031bf59d8dfb0972c064bb5e20da162e510c20 (patch) | |
| tree | e5fa204818ff859d1ae3aec5b423b8eb93f54c97 | |
| parent | 6fb4f6e2996cf442b614a073f30839419d9db030 (diff) | |
Fixed #14252 - django.contrib.flatpages unit tests assume default value for settings.LOGIN_URL
Thanks to pmclanahan for report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/flatpages/tests/csrf.py | 3 | ||||
| -rw-r--r-- | django/contrib/flatpages/tests/middleware.py | 3 | ||||
| -rw-r--r-- | django/contrib/flatpages/tests/views.py | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/django/contrib/flatpages/tests/csrf.py b/django/contrib/flatpages/tests/csrf.py index b65ee382a6..36b915317f 100644 --- a/django/contrib/flatpages/tests/csrf.py +++ b/django/contrib/flatpages/tests/csrf.py @@ -23,10 +23,13 @@ class FlatpageCSRFTests(TestCase): 'templates' ), ) + self.old_LOGIN_URL = settings.LOGIN_URL + settings.LOGIN_URL = '/accounts/login/' def tearDown(self): settings.MIDDLEWARE_CLASSES = self.old_MIDDLEWARE_CLASSES settings.TEMPLATE_DIRS = self.old_TEMPLATE_DIRS + settings.LOGIN_URL = self.old_LOGIN_URL def test_view_flatpage(self): "A flatpage can be served through a view, even when the middleware is in use" diff --git a/django/contrib/flatpages/tests/middleware.py b/django/contrib/flatpages/tests/middleware.py index bedaffc8ac..b971aab458 100644 --- a/django/contrib/flatpages/tests/middleware.py +++ b/django/contrib/flatpages/tests/middleware.py @@ -19,10 +19,13 @@ class FlatpageMiddlewareTests(TestCase): 'templates' ), ) + self.old_LOGIN_URL = settings.LOGIN_URL + settings.LOGIN_URL = '/accounts/login/' def tearDown(self): settings.MIDDLEWARE_CLASSES = self.old_MIDDLEWARE_CLASSES settings.TEMPLATE_DIRS = self.old_TEMPLATE_DIRS + settings.LOGIN_URL = self.old_LOGIN_URL def test_view_flatpage(self): "A flatpage can be served through a view, even when the middleware is in use" diff --git a/django/contrib/flatpages/tests/views.py b/django/contrib/flatpages/tests/views.py index 89bdde2d92..4a54e5697e 100644 --- a/django/contrib/flatpages/tests/views.py +++ b/django/contrib/flatpages/tests/views.py @@ -20,10 +20,13 @@ class FlatpageViewTests(TestCase): 'templates' ), ) + self.old_LOGIN_URL = settings.LOGIN_URL + settings.LOGIN_URL = '/accounts/login/' def tearDown(self): settings.MIDDLEWARE_CLASSES = self.old_MIDDLEWARE_CLASSES settings.TEMPLATE_DIRS = self.old_TEMPLATE_DIRS + settings.LOGIN_URL = self.old_LOGIN_URL def test_view_flatpage(self): "A flatpage can be served through a view" |