Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Corrected tests depending on the error message on the AuthenticationF…

…orm.

Refs #19368, and the fix introduced in 27f8129.
  • Loading branch information...
commit 9facca28b619ad94680cf07774ee7a377034ca42 1 parent 27f8129
Russell Keith-Magee freakboy3742 authored
4 django/contrib/auth/tests/forms.py
View
@@ -100,7 +100,9 @@ def test_invalid_username(self):
form = AuthenticationForm(None, data)
self.assertFalse(form.is_valid())
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):
# The user is inactive.
4 django/contrib/auth/tests/views.py
View
@@ -248,7 +248,9 @@ def fail_login(self, password='password'):
'username': 'testclient',
'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):
response = self.client.get('/logout/')
2  tests/regressiontests/admin_views/tests.py
View
@@ -51,7 +51,7 @@
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',))
Please sign in to comment.
Something went wrong with that request. Please try again.