diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-04-19 03:44:06 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-04-19 03:44:06 +0000 |
| commit | 1c925f65b3f9ca126d97e8166557dc071177913a (patch) | |
| tree | 05e59c41ed5992f594b960fc505713eebaf3ca4e | |
| parent | ecb39067915093f6ff3849c57a7853600ecdd50f (diff) | |
[1.0.X] Fixed #8752 -- Fixed django.contrib.auth tests to be locale-independent.
Patch from Koen Biermans.
Backport of r10599 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/auth/tests/views.py | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/django/contrib/auth/tests/views.py b/django/contrib/auth/tests/views.py index 34c4163265..653c5b02dc 100644 --- a/django/contrib/auth/tests/views.py +++ b/django/contrib/auth/tests/views.py @@ -15,6 +15,10 @@ class AuthViewsTestCase(TestCase): urls = 'django.contrib.auth.urls' def setUp(self): + self.old_LANGUAGES = settings.LANGUAGES + self.old_LANGUAGE_CODE = settings.LANGUAGE_CODE + settings.LANGUAGES = (('en', 'English'),) + settings.LANGUAGE_CODE = 'en' self.old_TEMPLATE_DIRS = settings.TEMPLATE_DIRS settings.TEMPLATE_DIRS = ( os.path.join( @@ -24,10 +28,22 @@ class AuthViewsTestCase(TestCase): ,) def tearDown(self): + settings.LANGUAGES = self.old_LANGUAGES + settings.LANGUAGE_CODE = self.old_LANGUAGE_CODE settings.TEMPLATE_DIRS = self.old_TEMPLATE_DIRS class PasswordResetTest(AuthViewsTestCase): + def setUp(self): + self.old_LANGUAGES = settings.LANGUAGES + self.old_LANGUAGE_CODE = settings.LANGUAGE_CODE + settings.LANGUAGES = (('en', 'English'),) + settings.LANGUAGE_CODE = 'en' + + def tearDown(self): + settings.LANGUAGES = self.old_LANGUAGES + settings.LANGUAGE_CODE = self.old_LANGUAGE_CODE + def test_email_not_found(self): "Error is raised if the provided email address isn't currently registered" response = self.client.get('/password_reset/') @@ -221,4 +237,4 @@ class LogoutTest(AuthViewsTestCase): response = self.client.get('/logout/custom_query/?follow=/somewhere/') self.assertEqual(response.status_code, 302) self.assert_(response['Location'].endswith('/somewhere/')) - self.confirm_logged_out()
\ No newline at end of file + self.confirm_logged_out() |