mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity

[1.1.X] 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.

Browse Source 
Backport of r12420 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-02-13 12:32:49 +00:00
parent bf11ab2b21
commit 1d9bc59534
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/contrib/auth/tests/templates/registration/password_reset_complete.html Normal file
View File

@ -0,0 +1 @@
Password reset successfully

5
django/contrib/auth/tests/templates/registration/password_reset_confirm.html Normal file
View File

@ -0,0 +1,5 @@
{% if validlink %}
Please enter your new password: {{ form }}
{% else %}
The password reset link was invalid
{% endif %}

1
django/contrib/auth/tests/templates/registration/password_reset_done.html Normal file
View File

@ -0,0 +1 @@
E-mail sent

1
django/contrib/auth/tests/templates/registration/password_reset_email.html Normal file
View File

@ -0,0 +1 @@
{{ protocol }}://{{ domain }}/reset/{{ uid }}-{{ token }}/

1
django/contrib/auth/tests/templates/registration/password_reset_form.html Normal file
View File

@ -0,0 +1 @@
{{ form }}

10
django/contrib/auth/tests/views.py
View File

@ -37,16 +37,6 @@ class AuthViewsTestCase(TestCase):
class PasswordResetTest(AuthViewsTestCase): 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): def test_email_not_found(self):
"Error is raised if the provided email address isn't currently registered" "Error is raised if the provided email address isn't currently registered"
response = self.client.get('/password_reset/') response = self.client.get('/password_reset/')