mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-06 12:09:11 +00:00
Code Issues 32 Releases Wiki Activity

Completed test coverage for contrib.auth.forms.

Browse Source
This commit is contained in:
Marcelo Galigniana 2022-10-23 08:42:40 -03:00 committed by Mariusz Felisiak
parent 022a864a5d
commit b440493eaa
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/contrib/auth/forms.py
View File

@ -378,12 +378,11 @@ class SetPasswordForm(forms.Form):
def clean_new_password2(self): def clean_new_password2(self):
password1 = self.cleaned_data.get("new_password1") password1 = self.cleaned_data.get("new_password1")
password2 = self.cleaned_data.get("new_password2") password2 = self.cleaned_data.get("new_password2")
if password1 and password2: if password1 and password2 and password1 != password2:
if password1 != password2: raise ValidationError(
raise ValidationError( self.error_messages["password_mismatch"],
self.error_messages["password_mismatch"], code="password_mismatch",
code="password_mismatch", )
)
password_validation.validate_password(password2, self.user) password_validation.validate_password(password2, self.user)
return password2 return password2

31
tests/auth_tests/test_forms.py
View File

@ -590,6 +590,14 @@ class AuthenticationFormTest(TestDataMixin, TestCase):
form.fields[field_name].widget.attrs["autocomplete"], autocomplete form.fields[field_name].widget.attrs["autocomplete"], autocomplete
) )
def test_no_password(self):
data = {"username": "username"}
form = AuthenticationForm(None, data)
self.assertIs(form.is_valid(), False)
self.assertEqual(
form["password"].errors, [Field.default_error_messages["required"]]
)
class SetPasswordFormTest(TestDataMixin, TestCase): class SetPasswordFormTest(TestDataMixin, TestCase):
def test_password_verification(self): def test_password_verification(self):
@ -655,6 +663,23 @@ class SetPasswordFormTest(TestDataMixin, TestCase):
form["new_password2"].errors, form["new_password2"].errors,
) )
def test_no_password(self):
user = User.objects.get(username="testclient")
data = {"new_password1": "new-password"}
form = SetPasswordForm(user, data)
self.assertIs(form.is_valid(), False)
self.assertEqual(
form["new_password2"].errors, [Field.default_error_messages["required"]]
)
form = SetPasswordForm(user, {})
self.assertIs(form.is_valid(), False)
self.assertEqual(
form["new_password1"].errors, [Field.default_error_messages["required"]]
)
self.assertEqual(
form["new_password2"].errors, [Field.default_error_messages["required"]]
)
def test_password_whitespace_not_stripped(self): def test_password_whitespace_not_stripped(self):
user = User.objects.get(username="testclient") user = User.objects.get(username="testclient")
data = { data = {
@ -1201,6 +1226,7 @@ class AdminPasswordChangeFormTest(TestDataMixin, TestCase):
self.assertEqual(password_changed.call_count, 0) self.assertEqual(password_changed.call_count, 0)
form.save() form.save()
self.assertEqual(password_changed.call_count, 1) self.assertEqual(password_changed.call_count, 1)
self.assertEqual(form.changed_data, ["password"])
def test_password_whitespace_not_stripped(self): def test_password_whitespace_not_stripped(self):
user = User.objects.get(username="testclient") user = User.objects.get(username="testclient")
@ -1212,6 +1238,7 @@ class AdminPasswordChangeFormTest(TestDataMixin, TestCase):
self.assertTrue(form.is_valid()) self.assertTrue(form.is_valid())
self.assertEqual(form.cleaned_data["password1"], data["password1"]) self.assertEqual(form.cleaned_data["password1"], data["password1"])
self.assertEqual(form.cleaned_data["password2"], data["password2"]) self.assertEqual(form.cleaned_data["password2"], data["password2"])
self.assertEqual(form.changed_data, ["password"])
def test_non_matching_passwords(self): def test_non_matching_passwords(self):
user = User.objects.get(username="testclient") user = User.objects.get(username="testclient")
@ -1220,6 +1247,7 @@ class AdminPasswordChangeFormTest(TestDataMixin, TestCase):
self.assertEqual( self.assertEqual(
form.errors["password2"], [form.error_messages["password_mismatch"]] form.errors["password2"], [form.error_messages["password_mismatch"]]
) )
self.assertEqual(form.changed_data, ["password"])
def test_missing_passwords(self): def test_missing_passwords(self):
user = User.objects.get(username="testclient") user = User.objects.get(username="testclient")
@ -1228,6 +1256,7 @@ class AdminPasswordChangeFormTest(TestDataMixin, TestCase):
required_error = [Field.default_error_messages["required"]] required_error = [Field.default_error_messages["required"]]
self.assertEqual(form.errors["password1"], required_error) self.assertEqual(form.errors["password1"], required_error)
self.assertEqual(form.errors["password2"], required_error) self.assertEqual(form.errors["password2"], required_error)
self.assertEqual(form.changed_data, [])
def test_one_password(self): def test_one_password(self):
user = User.objects.get(username="testclient") user = User.objects.get(username="testclient")
@ -1235,9 +1264,11 @@ class AdminPasswordChangeFormTest(TestDataMixin, TestCase):
required_error = [Field.default_error_messages["required"]] required_error = [Field.default_error_messages["required"]]
self.assertEqual(form1.errors["password1"], required_error) self.assertEqual(form1.errors["password1"], required_error)
self.assertNotIn("password2", form1.errors) self.assertNotIn("password2", form1.errors)
self.assertEqual(form1.changed_data, [])
form2 = AdminPasswordChangeForm(user, {"password1": "test", "password2": ""}) form2 = AdminPasswordChangeForm(user, {"password1": "test", "password2": ""})
self.assertEqual(form2.errors["password2"], required_error) self.assertEqual(form2.errors["password2"], required_error)
self.assertNotIn("password1", form2.errors) self.assertNotIn("password1", form2.errors)
self.assertEqual(form2.changed_data, [])
def test_html_autocomplete_attributes(self): def test_html_autocomplete_attributes(self):
user = User.objects.get(username="testclient") user = User.objects.get(username="testclient")