test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Corrected tests depending on the error message on the AuthenticationForm. 

Refs #19368, and the fix introduced in 27f8129d64.
This commit is contained in:
Russell Keith-Magee 2012-12-16 07:18:45 +08:00
parent 27f8129d64
commit 9facca28b6
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/auth/tests/forms.py
View File

@ -100,7 +100,9 @@ class AuthenticationFormTest(TestCase):
form = AuthenticationForm(None, data) form = AuthenticationForm(None, data)
self.assertFalse(form.is_valid()) self.assertFalse(form.is_valid())
self.assertEqual(form.non_field_errors(), self.assertEqual(form.non_field_errors(),
[force_text(form.error_messages['invalid_login'])]) [force_text(form.error_messages['invalid_login'] % {
'username': User._meta.get_field('username').verbose_name
})])
def test_inactive_user(self): def test_inactive_user(self):
# The user is inactive. # The user is inactive.

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

@ -248,7 +248,9 @@ class ChangePasswordTest(AuthViewsTestCase):
'username': 'testclient', 'username': 'testclient',
'password': password, 'password': password,
}) })
self.assertContainsEscaped(response, AuthenticationForm.error_messages['invalid_login']) self.assertContainsEscaped(response, AuthenticationForm.error_messages['invalid_login'] % {
'username': User._meta.get_field('username').verbose_name
})
def logout(self): def logout(self):
response = self.client.get('/logout/') response = self.client.get('/logout/')

2
tests/regressiontests/admin_views/tests.py
View File

@ -51,7 +51,7 @@ from .models import (Article, BarAccount, CustomArticle, EmptyModel, FooAccount,
ERROR_MESSAGE = "Please enter the correct username and password \ ERROR_MESSAGE = "Please enter the correct username and password \
for a staff account. Note that both fields are case-sensitive." for a staff account. Note that both fields may be case-sensitive."
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))