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]

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

[Natalia Bidart (nataliabidart)]

Branch looks good!

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntu_sso/qt/current_user_sign_in_page.py'
--- ubuntu_sso/qt/current_user_sign_in_page.py	2012-03-05 21:21:20 +0000
+++ ubuntu_sso/qt/current_user_sign_in_page.py	2012-03-05 21:21:20 +0000
@@ -61,6 +61,11 @@
          }
         return result
 
+    @property
+    def password(self):
+        """Return the content of the password edit."""
+        return unicode(self.ui.password_edit.text())
+
     def on_user_not_validated(self, app_name, email):
         """Show the validate email page."""
         self.hide_overlay()

=== modified file 'ubuntu_sso/qt/setup_account_page.py'
--- ubuntu_sso/qt/setup_account_page.py	2012-03-05 21:21:20 +0000
+++ ubuntu_sso/qt/setup_account_page.py	2012-03-05 21:21:20 +0000
@@ -112,6 +112,11 @@
         }
         return result
 
+    @property
+    def password(self):
+        """Return the content of the password edit."""
+        return unicode(self.ui.password_edit.text())
+
     # Invalid name "initializePage"
     # pylint: disable=C0103
 

=== modified file 'ubuntu_sso/qt/tests/test_current_user_sign_in_page.py'
--- ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2012-03-05 21:21:20 +0000
+++ ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2012-03-05 21:21:20 +0000
@@ -24,6 +24,7 @@
     FakePageUiStyle,
     FakeWizardButtonStyle,
 )
+from ubuntu_sso.tests import EMAIL
 
 
 # pylint: disable=W0212
@@ -139,19 +140,16 @@
 
     def test_on_logged_in(self):
         """Test the on_login_in method."""
-        email = 'email@example'
-        self.ui.ui.email_edit.setText(email)
-
-        self.assert_signal_emitted(self.ui.userLoggedIn, (email,),
-            self.ui.on_logged_in, self.app_name, email)
+        self.ui.ui.email_edit.setText(EMAIL)
+        self.assert_signal_emitted(self.ui.userLoggedIn, (EMAIL,),
+            self.ui.on_logged_in, self.app_name, EMAIL)
         self.assertTrue(self.ui.isEnabled())
 
     def test_on_user_not_validated(self):
         """Test the navigation flow on user not validated."""
-        email = 'email@example'
-        self.ui.ui.email_edit.setText(email)
-        self.assert_signal_emitted(self.ui.userNotValidated, (email,),
-            self.ui.on_user_not_validated, self.app_name, email)
+        self.ui.ui.email_edit.setText(EMAIL)
+        self.assert_signal_emitted(self.ui.userNotValidated, (EMAIL,),
+            self.ui.on_user_not_validated, self.app_name, EMAIL)
 
     def test_on_forgotten_password(self):
         """Test the on_forgotten_password method."""

=== modified file 'ubuntu_sso/qt/tests/test_setup_account.py'
--- ubuntu_sso/qt/tests/test_setup_account.py	2012-03-05 21:21:20 +0000
+++ ubuntu_sso/qt/tests/test_setup_account.py	2012-03-05 21:21:20 +0000
@@ -174,7 +174,6 @@
         """Test on_user_registered method."""
         email = 'email@example'
         self.ui.ui.email_edit.setText(email)
-
         self.assert_signal_emitted(self.ui.userRegistered, (email,),
             self.ui.on_user_registered, self.app_name, email)
 

=== 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 21:21:20 +0000
@@ -19,6 +19,11 @@
 from PyQt4 import QtGui
 from twisted.internet import defer
 
+from ubuntu_sso.tests import (
+    APP_NAME,
+    EMAIL,
+    PASSWORD,
+)
 from ubuntu_sso.qt import PREFERED_UI_SIZE, ubuntu_sso_wizard
 from ubuntu_sso.qt.tests import (
     BaseTestCase,
@@ -146,3 +151,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."""
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.ui._next_id = self.ui.current_user_page_id
+        self.ui.next()
+        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(APP_NAME, EMAIL)
+        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."""
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        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(APP_NAME, {})
+        self.assertEqual(EMAIL, self.ui.email_verification.email)
+        self.assertEqual(PASSWORD, self.ui.email_verification.password)

=== modified file 'ubuntu_sso/qt/ubuntu_sso_wizard.py'
--- ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-03-05 21:21:20 +0000
+++ ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-03-05 21:21:20 +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):
         """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 = self.currentPage().password
         self.next()
         self._next_id = -1