Merge lp:~diegosarmentero/ubuntu-sso-client/verification-fail into lp:ubuntu-sso-client

[Diego Sarmentero]

- The _move_to_email_verification_page wasn't receiving the params that the signal emits (LP: #945066).

[lp:~diegosarmentero/ubuntu-sso-client/verification-fail]

899. By Diego Sarmentero on 2012-03-05

Some modifications to the branch to avoid passing password on the signals.

900. By Diego Sarmentero on 2012-03-05

Conflict resolved

901. By Diego Sarmentero on 2012-03-05

Fixed lint issues.

902. By Diego Sarmentero on 2012-03-05

merge

903. By Diego Sarmentero on 2012-03-05

merge and conflicts fixed.

904. By Diego Sarmentero on 2012-03-05

Reverting some minor problems from the merge

Unmerged revisions

=== modified file 'ubuntu_sso/qt/current_user_sign_in_page.py'
--- ubuntu_sso/qt/current_user_sign_in_page.py	2012-03-05 12:07:21 +0000
+++ ubuntu_sso/qt/current_user_sign_in_page.py	2012-03-05 17:48:29 +0000
@@ -66,8 +66,8 @@
     def on_user_not_validated(self, *args):
         """Show the validate email page."""
         self.hide_overlay()
-        email = unicode(self.ui.email_edit.text())
-        password = unicode(self.ui.password_edit.text())
+        email = self.ui.email_edit.text()
+        password = self.ui.password_edit.text()
         self.userNotValidated.emit(email, password)
 
     # Invalid names of Qt-inherited methods

=== modified file 'ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py'
--- ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py	2012-03-05 14:37:43 +0000
+++ ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py	2012-03-05 17:48:29 +0000
@@ -136,6 +136,7 @@
         # We do +1 because a hide action is executed on the wizard init.
         self.assertEqual(self.ui.overlay.hide_counter,
             len(self.ui._pages) + 1)
+<<<<<<< TREE
 
     def test_go_back_to_current_user_sign_in(self):
         """Move the wizard back to the current user sign in page."""
@@ -146,3 +147,25 @@
         self.ui.reset_password.passwordChanged.emit('')
         expected = ((self.ui.current_user,), {})
         self.assertEqual(expected, self._called)
+=======
+
+    def test_email_verification_page_params_from_current_user(self):
+        """Tests that email_verification_page receives the proper params."""
+        email = '[e-mail]'
+        password = 't3st3r'
+        self.ui.current_user.ui.email_edit.setText(email)
+        self.ui.current_user.ui.password_edit.setText(password)
+        self.ui.current_user.on_user_not_validated()
+        self.assertEqual(email, self.ui.email_verification.email)
+        self.assertEqual(password, self.ui.email_verification.password)
+
+    def test_email_verification_page_params_from_setup(self):
+        """Tests that email_verification_page receives the proper params."""
+        email = '[e-mail]'
+        password = 't3st3r'
+        self.ui.setup_account.ui.email_edit.setText(email)
+        self.ui.setup_account.ui.password_edit.setText(password)
+        self.ui.setup_account.on_user_registered('', {})
+        self.assertEqual(email, self.ui.email_verification.email)
+        self.assertEqual(password, self.ui.email_verification.password)
+>>>>>>> MERGE-SOURCE

=== modified file 'ubuntu_sso/qt/ubuntu_sso_wizard.py'
--- ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-03-05 14:15:44 +0000
+++ ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-03-05 17:48:29 +0000
@@ -154,9 +154,11 @@
         self.next()
         self._next_id = -1
 
-    def _move_to_email_verification_page(self):
+    def _move_to_email_verification_page(self, email, password):
         """Move to the email verification page wizard."""
         self._next_id = self.email_verification_page_id
+        self.email_verification.email = unicode(email)
+        self.email_verification.password = unicode(password)
         self.next()
         self._next_id = -1