Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

auth: Tweak invalid credentials error message. 

We decided this is the better string to use.
This commit is contained in:
Mateusz Mandera 2024-10-24 21:47:47 +02:00 committed by Tim Abbott
parent 94a86d4ac2
commit 481ef24b53
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/forms.py
View File

@ -52,7 +52,7 @@ MIT_VALIDATION_ERROR = Markup(
' <a href="mailto:support@zulip.com">contact us</a>.' ' <a href="mailto:support@zulip.com">contact us</a>.'
) )
INVALID_ACCOUNT_CREDENTIALS_ERROR = gettext_lazy("Please enter a correct email and password.") INVALID_ACCOUNT_CREDENTIALS_ERROR = gettext_lazy("Incorrect email or password.")
DEACTIVATED_ACCOUNT_ERROR = gettext_lazy( DEACTIVATED_ACCOUNT_ERROR = gettext_lazy(
"Your account {username} has been deactivated." "Your account {username} has been deactivated."
" Please contact your organization administrator to reactivate it." " Please contact your organization administrator to reactivate it."

2
zerver/tests/test_decorators.py
View File

@ -856,7 +856,7 @@ class InactiveUserTest(ZulipTestCase):
form = OurAuthenticationForm(request, payload) form = OurAuthenticationForm(request, payload)
with self.settings(AUTHENTICATION_BACKENDS=("zproject.backends.EmailAuthBackend",)): with self.settings(AUTHENTICATION_BACKENDS=("zproject.backends.EmailAuthBackend",)):
self.assertFalse(form.is_valid()) self.assertFalse(form.is_valid())
self.assertIn("Please enter a correct email", str(form.errors)) self.assertIn("Incorrect email or password.", str(form.errors))
# Test a non-mirror-dummy deactivated user. # Test a non-mirror-dummy deactivated user.
user_profile.is_mirror_dummy = False user_profile.is_mirror_dummy = False

4
zerver/tests/test_signup.py
View File

@ -993,7 +993,7 @@ class LoginTest(ZulipTestCase):
def test_login_nonexistent_user(self) -> None: def test_login_nonexistent_user(self) -> None:
result = self.login_with_return("xxx@zulip.com", "xxx") result = self.login_with_return("xxx@zulip.com", "xxx")
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
self.assert_in_response("Please enter a correct email and password.", result) self.assert_in_response("Incorrect email or password.", result)
self.assert_logged_in_user_id(None) self.assert_logged_in_user_id(None)
def test_login_wrong_subdomain(self) -> None: def test_login_wrong_subdomain(self) -> None:
@ -1009,7 +1009,7 @@ class LoginTest(ZulipTestCase):
], ],
) )
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
expected_error = "Please enter a correct email and password." expected_error = "Incorrect email or password."
self.assert_in_response(expected_error, result) self.assert_in_response(expected_error, result)
self.assert_logged_in_user_id(None) self.assert_logged_in_user_id(None)