Merge lp:~canonical-isd-hackers/canonical-identity-provider/bug_579920 into lp:canonical-identity-provider/release

[David Owen]

If the first password field has errors, errors regarding the second password field are suppressed (whether or not it matches the first field).

Includes unit tests.

[Danny Tamez (zematynnad)]

First bug fix is looking good David. Please add a test and I'll approve. Also,even once approved please do not merge into trunk until we're out of code freeze.

review: Needs Fixing

[David Owen (dsowen)]

On 05/20/2010 02:25 PM, Danny Tamez wrote:
> Review: Needs Fixing
>
> First bug fix is looking good David. Please add a test and I'll
> approve. Also,even once approved please do not merge into trunk until
> we're out of code freeze.

Okay, I might schedule that for after I wrap up my current bug (if not
sooner).

Thanks,
David

[Danny Tamez (zematynnad)]

LGTM

review: Approve

=== modified file 'identityprovider/forms.py'
--- identityprovider/forms.py	2010-04-21 15:29:24 +0000
+++ identityprovider/forms.py	2010-05-22 02:46:19 +0000
@@ -231,6 +231,7 @@
         newpasswordconfirm = cleaned_data.get('newpasswordconfirm')
         if newpassword or newpasswordconfirm:
             if (newpassword != newpasswordconfirm and
+                not self['newpassword'].errors and
                 not self['newpasswordconfirm'].errors):
                 raise forms.ValidationError(_("Didn't match"))
         return cleaned_data

=== modified file 'identityprovider/tests/test_forms.py'
--- identityprovider/tests/test_forms.py	2010-04-21 15:29:24 +0000
+++ identityprovider/tests/test_forms.py	2010-05-22 02:46:19 +0000
@@ -47,6 +47,26 @@
         self.assertFalse(form.is_valid())
         self.assertFalse('displayname' in form.errors)
 
+    def test_newpassword_mismatch_validation(self):
+        account = Account.objects.get(openid_identifier='name12_oid')
+        form = EditAccountForm(account=account,
+                               data={'newpassword': 'tooweak',
+                                     'newpasswordconfirm' : 'other'})
+        self.assertFalse(form.is_valid())
+        self.assertEqual(1, len(form.errors['newpassword']))
+        self.assertFalse('newpasswordconfirm' in form.errors)
+        self.assertEqual(0, len(form.non_field_errors()))
+
+    def test_newpassword_validation(self):
+        account = Account.objects.get(openid_identifier='name12_oid')
+        form = EditAccountForm(account=account,
+                               data={'newpassword': 'tooweak',
+                                     'newpasswordconfirm' : 'tooweak'})
+        self.assertFalse(form.is_valid())
+        self.assertEqual(1, len(form.errors['newpassword']))
+        self.assertFalse('newpasswordconfirm' in form.errors)
+        self.assertEqual(0, len(form.non_field_errors()))
+
 
 class WebServiceCreateAccountFormTest(SQLCachedTestCase):