From b794441951f7328bbe5bcac305386862fd88f967 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sat, 13 Feb 2010 12:02:11 +0000 Subject: [PATCH] Fixed #10976 -- Isolated contrib.auth tests so they will always pass, regardless of any local templates. Thanks to aarond10 for the report, and SmileyChris for turning that into a patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12420 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../registration/password_reset_complete.html | 1 + .../templates/registration/password_reset_confirm.html | 5 +++++ .../templates/registration/password_reset_done.html | 1 + .../templates/registration/password_reset_email.html | 1 + .../templates/registration/password_reset_form.html | 1 + django/contrib/auth/tests/views.py | 10 ---------- 6 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 django/contrib/auth/tests/templates/registration/password_reset_complete.html create mode 100644 django/contrib/auth/tests/templates/registration/password_reset_confirm.html create mode 100644 django/contrib/auth/tests/templates/registration/password_reset_done.html create mode 100644 django/contrib/auth/tests/templates/registration/password_reset_email.html create mode 100644 django/contrib/auth/tests/templates/registration/password_reset_form.html diff --git a/django/contrib/auth/tests/templates/registration/password_reset_complete.html b/django/contrib/auth/tests/templates/registration/password_reset_complete.html new file mode 100644 index 00000000000..3dd79d86a4d --- /dev/null +++ b/django/contrib/auth/tests/templates/registration/password_reset_complete.html @@ -0,0 +1 @@ +Password reset successfully \ No newline at end of file diff --git a/django/contrib/auth/tests/templates/registration/password_reset_confirm.html b/django/contrib/auth/tests/templates/registration/password_reset_confirm.html new file mode 100644 index 00000000000..8f06c577934 --- /dev/null +++ b/django/contrib/auth/tests/templates/registration/password_reset_confirm.html @@ -0,0 +1,5 @@ +{% if validlink %} +Please enter your new password: {{ form }} +{% else %} +The password reset link was invalid +{% endif %} \ No newline at end of file diff --git a/django/contrib/auth/tests/templates/registration/password_reset_done.html b/django/contrib/auth/tests/templates/registration/password_reset_done.html new file mode 100644 index 00000000000..d56b10f0d5b --- /dev/null +++ b/django/contrib/auth/tests/templates/registration/password_reset_done.html @@ -0,0 +1 @@ +E-mail sent \ No newline at end of file diff --git a/django/contrib/auth/tests/templates/registration/password_reset_email.html b/django/contrib/auth/tests/templates/registration/password_reset_email.html new file mode 100644 index 00000000000..1b9a48255a2 --- /dev/null +++ b/django/contrib/auth/tests/templates/registration/password_reset_email.html @@ -0,0 +1 @@ +{{ protocol }}://{{ domain }}/reset/{{ uid }}-{{ token }}/ \ No newline at end of file diff --git a/django/contrib/auth/tests/templates/registration/password_reset_form.html b/django/contrib/auth/tests/templates/registration/password_reset_form.html new file mode 100644 index 00000000000..d9601119923 --- /dev/null +++ b/django/contrib/auth/tests/templates/registration/password_reset_form.html @@ -0,0 +1 @@ +{{ form }} \ No newline at end of file diff --git a/django/contrib/auth/tests/views.py b/django/contrib/auth/tests/views.py index 532f92b5234..11adaf17908 100644 --- a/django/contrib/auth/tests/views.py +++ b/django/contrib/auth/tests/views.py @@ -37,16 +37,6 @@ class AuthViewsTestCase(TestCase): 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/')