From 5a57a7f0069b419506ef9bd00b95acf9216d5c96 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Sun, 19 Apr 2009 03:41:33 +0000 Subject: [PATCH] Fixed #8752 -- Fixed django.contrib.auth tests to be locale-independent. Patch from Koen Biermans. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10599 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/auth/tests/views.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/django/contrib/auth/tests/views.py b/django/contrib/auth/tests/views.py index 68ab009365..532f92b523 100644 --- a/django/contrib/auth/tests/views.py +++ b/django/contrib/auth/tests/views.py @@ -18,6 +18,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( @@ -27,10 +31,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/') @@ -224,4 +240,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()