Merge lp:~diegosarmentero/ubuntuone-windows-installer/mismatch-password into lp:ubuntuone-windows-installer

[Diego Sarmentero]

- Fixed: Setup account button can be clicked with password not matching (LP: #850334).

- Fixed: Setup account button can be clicked with password not matching (LP: #850334).

[lp:~diegosarmentero/ubuntuone-windows-installer/mismatch-password]

70. By Diego Sarmentero on 2011-09-16

merge

71. By Diego Sarmentero on 2011-09-16

Conflict resolved.

[Natalia Bidart (nataliabidart)]

* This statement is very hard to read:

        self.email_verification = EmailVerificationPage(
                                                Ui_EmailVerificationPage(),
                                                EmailVerificationController(
                                                    message_box=self))

can you please change it to:

        controller = EmailVerificationController(message_box=self)
        page = Ui_EmailVerificationPage()
        self.email_verification = EmailVerificationPage(page, controller)

* Looks like you resolved the conflicts with trunk dropping some changes from there. Please view the changes from this branch against trunk using meld and revert to trunk version all the changes you're reverting in ubuntuone_installer/gui/qt/tests/test_setup_account.py.

In particular, restore this import:

from ubuntuone_installer.gui.qt import setup_account as gui

and restore all the changes from setup_account.something to gui.something.

This certainly needs fixing and can't go into trunk as is, so I'll mark as such. Ping me whenever is ready and I'll re-review, no matter if I'm off or not.

Thanks!

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/mismatch-password]

72. By Diego Sarmentero on 2011-09-19

Removed code that remains from conflict.

[Natalia Bidart (nataliabidart)]

Looks good now!

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-09-16 12:55:16 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-09-19 15:53:25 +0000
@@ -325,9 +325,11 @@
             self.setup_controller,
             parent=self)
 
+        email_controller = EmailVerificationController(message_box=self)
+        email_verification_page = Ui_EmailVerificationPage()
         self.email_verification = EmailVerificationPage(
-                                                Ui_EmailVerificationPage(),
-                                                EmailVerificationController())
+                                                       email_verification_page,
+                                                       email_controller)
         self.email_verification.next_button.clicked.connect(
             self.overlay.show)
 

=== modified file 'ubuntuone_installer/gui/qt/setup_account.py'
--- ubuntuone_installer/gui/qt/setup_account.py	2011-09-16 12:55:16 +0000
+++ ubuntuone_installer/gui/qt/setup_account.py	2011-09-19 15:53:25 +0000
@@ -69,20 +69,8 @@
         self.terms_checkbox = enhanced_check_box.EnhancedCheckBox(terms)
         self.ui.hlayout_check.addWidget(self.terms_checkbox)
 
-        # The functions are placed based on the focus order of the widgets.
-        self.validation_functions = [
-            self.name_assistance,
-            self.email_assistance,
-            self.confirm_email_assistance,
-            self.password_check_match_wrapper]
         self.set_up_button = None
 
-    def password_check_match_wrapper(self):
-        """Wrapper between validation_functions calls and utils function."""
-        common.password_check_match(self.ui.password_edit,
-                                      self.ui.confirm_password_edit,
-                                      self.ui.password_assistance)
-
     # Invalid name "initializePage"
     # pylint: disable=C0103
 
@@ -128,20 +116,18 @@
 
     def focus_changed(self, old, now):
         """Check who has the focus to activate password popups if necessary."""
-        if now == self.ui.email_edit:
-            self.validate_data_on_focus_changed(1)
-        elif now == self.ui.confirm_email_edit:
-            self.validate_data_on_focus_changed(2)
-        elif now == self.ui.password_edit:
-            self.validate_data_on_focus_changed(3)
+        if old == self.ui.name_edit:
+            self.name_assistance()
+        elif old == self.ui.email_edit:
+            self.email_assistance()
+        elif old == self.ui.confirm_email_edit:
+            self.confirm_email_assistance()
+        elif old == self.ui.confirm_password_edit:
+            common.password_check_match(self.ui.password_edit,
+                                      self.ui.confirm_password_edit,
+                                      self.ui.password_assistance)
+        if now == self.ui.password_edit:
             self.ui.password_assistance.setVisible(True)
-        elif now == self.ui.captcha_solution_edit:
-            self.validate_data_on_focus_changed(4)
-
-    def validate_data_on_focus_changed(self, until):
-        """Validate the all the text fields until the given index."""
-        for func in self.validation_functions[:until]:
-            func()
 
     def name_assistance(self):
         """Show help for the name field."""

=== modified file 'ubuntuone_installer/gui/qt/tests/test_setup_account.py'
--- ubuntuone_installer/gui/qt/tests/test_setup_account.py	2011-09-16 12:58:50 +0000
+++ ubuntuone_installer/gui/qt/tests/test_setup_account.py	2011-09-19 15:53:25 +0000
@@ -33,37 +33,6 @@
 from ubuntuone_installer.gui.qt.ui import setup_account_ui
 
 
-class FakeValidationDict(object):
-    """A Fake dictionary to replace validation_functions on Setup Account."""
-
-    def __init__(self):
-        for i in xrange(len(self)):
-            # set all the instance variables
-            setattr(FakeValidationDict, 'valid%s' % i, False)
-            setattr(self, 'validate_%s' % i, self.wrapper(i))
-
-    def __getitem__(self, i):
-        """Get the proper function depending on the index received."""
-        return getattr(self, 'validate_%s' % i)
-
-    def __getslice__(self, i, j):
-        """Check that the class length is not exceded and return the funcs."""
-        j = j if j <= len(self) else len(self)
-        return [self[q] for q in xrange(j)]
-
-    def __len__(self):
-        """Return the number of functions in this class."""
-        return 4
-
-    def wrapper(self, i):
-        """Change the state of the attributes based on the index."""
-        def inner(*args, **kwargs):
-            """Replace the value of the attributes depending on the index."""
-            for j in xrange(i + 1):
-                setattr(FakeValidationDict, 'valid%s' % j, True)
-        return inner
-
-
 class SetupAccountTestCase(BaseTestCase):
     """Test the SetupAccountPage code."""
 
@@ -82,7 +51,6 @@
         """Check the initial state of SetupAccount."""
         self.assertEqual(self.ui.ui.password_edit.receivers(
             QtCore.SIGNAL('textEdited(QString)')), 1)
-        self.assertTrue(self.ui.validation_functions)
 
     def test_empty_name(self):
         """Status when the name field is empty.
@@ -107,7 +75,7 @@
         """
         self.ui.ui.password_edit.setText("")
         self.ui.ui.confirm_password_edit.setText("")
-        self.ui.validate_data_on_focus_changed(4)
+        common.password_default_assistance(self.ui.ui.password_assistance)
         self.ui.focus_changed(None, self.ui.ui.password_edit)
         self.assertIn(
             common.NORMAL % common.PASSWORD_LENGTH,
@@ -122,41 +90,39 @@
             unicode(self.ui.ui.password_assistance.text()),
         )
 
-    def test_focus_changed_1(self):
-        """Check functions execution when focus_changed() is executed."""
-        self.patch(self.ui, 'validation_functions', FakeValidationDict())
-        self.ui.validate_data_on_focus_changed(1)
-        self.assertTrue(getattr(FakeValidationDict, "valid0"))
-        self.assertFalse(getattr(FakeValidationDict, "valid1"))
-        self.assertFalse(getattr(FakeValidationDict, "valid2"))
-        self.assertFalse(getattr(FakeValidationDict, "valid3"))
-
-    def test_focus_changed_2(self):
-        """Check functions execution when focus_changed() is executed."""
-        self.patch(self.ui, 'validation_functions', FakeValidationDict())
-        self.ui.validate_data_on_focus_changed(2)
-        self.assertTrue(getattr(FakeValidationDict, "valid0"))
-        self.assertTrue(getattr(FakeValidationDict, "valid1"))
-        self.assertFalse(getattr(FakeValidationDict, "valid2"))
-        self.assertFalse(getattr(FakeValidationDict, "valid3"))
-
-    def test_focus_changed_3(self):
-        """Check functions execution when focus_changed() is executed."""
-        self.patch(self.ui, 'validation_functions', FakeValidationDict())
-        self.ui.validate_data_on_focus_changed(3)
-        self.assertTrue(getattr(FakeValidationDict, "valid0"))
-        self.assertTrue(getattr(FakeValidationDict, "valid1"))
-        self.assertTrue(getattr(FakeValidationDict, "valid2"))
-        self.assertFalse(getattr(FakeValidationDict, "valid3"))
-
-    def test_focus_changed_4(self):
-        """Check functions execution when focus_changed() is executed."""
-        self.patch(self.ui, 'validation_functions', FakeValidationDict())
-        self.ui.validate_data_on_focus_changed(4)
-        self.assertTrue(getattr(FakeValidationDict, "valid0"))
-        self.assertTrue(getattr(FakeValidationDict, "valid1"))
-        self.assertTrue(getattr(FakeValidationDict, "valid2"))
-        self.assertTrue(getattr(FakeValidationDict, "valid3"))
+    def test_password_focus_gain(self):
+        """Check functions execution when focus_changed() is executed."""
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.ui.ui.password_assistance.setVisible(False)
+        self.assertFalse(self.ui.ui.password_assistance.isVisible())
+        self.patch(self.ui, 'name_assistance', self._set_called)
+        self.ui.focus_changed(None, self.ui.ui.password_edit)
+        self.assertTrue(self.ui.ui.password_assistance.isVisible())
+
+    def test_name_focus_lost(self):
+        """Check functions execution when focus_changed() is executed."""
+        self.patch(self.ui, 'name_assistance', self._set_called)
+        self.ui.focus_changed(self.ui.ui.name_edit, None)
+        self.assertTrue(self._called)
+
+    def test_email_focus_lost(self):
+        """Check functions execution when focus_changed() is executed."""
+        self.patch(self.ui, 'email_assistance', self._set_called)
+        self.ui.focus_changed(self.ui.ui.email_edit, None)
+        self.assertTrue(self._called)
+
+    def test_confirm_email_focus_lost(self):
+        """Check functions execution when focus_changed() is executed."""
+        self.patch(self.ui, 'confirm_email_assistance', self._set_called)
+        self.ui.focus_changed(self.ui.ui.confirm_email_edit, None)
+        self.assertTrue(self._called)
+
+    def test_confirm_password_focus_lost(self):
+        """Check functions execution when focus_changed() is executed."""
+        self.patch(common, 'password_check_match', self._set_called)
+        self.ui.focus_changed(self.ui.ui.confirm_password_edit, None)
+        self.assertTrue(self._called)
 
 
 class SetupAccountFakeWizardTestCase(BaseTestCase):