Commit 06b5f5fc authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.5.X] Corrected tests depending on the error message on the AuthenticationForm. 

Refs #19368, and the fix introduced in 27f8129d.

Backport of 9facca28 from trunk.
parent 55aae4b8

django/contrib/auth/tests/forms.py

+3 −1
Original line number Diff line number Diff line
@@ -100,7 +100,9 @@ class AuthenticationFormTest(TestCase): 
        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.

django/contrib/auth/tests/views.py

+3 −1
Original line number Diff line number Diff line
@@ -248,7 +248,9 @@ class ChangePasswordTest(AuthViewsTestCase): 
            '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/')

tests/regressiontests/admin_views/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ from .models import (Article, BarAccount, CustomArticle, EmptyModel, FooAccount, 




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',))