Merge lp:~diegosarmentero/ubuntu-sso-client/qt-signals into lp:ubuntu-sso-client

[Diego Sarmentero]

- Added signals for the different pages, letting the wizard decide what to do in each case.

[Natalia Bidart (nataliabidart)]

Loosk good!

review: Approve

[Roberto Alsina (ralsina)]

+1 nice way not to fight the toolkit ;-)

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntu-sso-client/qt-signals into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
ubuntu_sso.tests.test_account
  AccountTestCase
    test_generate_captcha ... [OK]
    test_is_not_validated ... [OK]
    test_is_not_validated_empty_result ... [OK]
    test_is_validated ... [OK]
    test_login_if_http_error ... [OK]
    test_login_if_no_error ... [OK]
    test_register_user_checks_valid_email ... [OK]
    test_register_user_checks_valid_password ... [OK]
    test_register_user_if_status_error ... [OK]
    test_register_user_if_status_error_with_string_message ... [OK]
    test_register_user_if_status_ok ... [OK]
    test_register_user_if_status_unknown ... [OK]
    test_request_password_reset_token_if_http_error ... [OK]
    test_request_password_reset_token_if_status_ok ... [OK]
    test_request_password_reset_token_if_status_unknown ... [OK]
    test_set_new_password_if_http_error ... [OK]
    test_set_new_password_if_status_ok ... [OK]
    test_set_new_password_if_status_unknown ... [OK]
    test_validate_email_if_status_error ... [OK]
    test_validate_email_if_status_error_with_string_message ... [OK]
    test_validate_email_if_status_ok ... [OK]
    test_validate_email_if_status_unknown ... [OK]
  EnvironOverridesTestCase
    test_no_override_service_url ... [OK]
    test_override_service_url ... [OK]
    test_service_url_as_parameter ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.tests.test_account
  TimestampedAuthorizerTestCase
    test_authorize_request_includes_timestamp ... [OK]
ubuntu_sso.tests.test_credentials
  BasicTestCase
    runTest ... [OK]
  ClearCredentialsTestCase
    test_clear_credentials ... [OK]
    test_keyring_failure ... [OK]
  CredentialsCallbacksTestCase
    test_creation_parameters_are_stored ... [OK]
    test_help_text_defaults_to_empty_string ... [OK]
    test_ping_url_defaults_to_none ... [OK]
    test_policy_url_defaults_to_none ... [OK]
    tes...

[Ubuntu One Auto Pilot (otto-pilot)]

No proposals found for merge of lp:~diegosarmentero/ubuntu-sso-client/qt-refactor into lp:ubuntu-sso-client.

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntu-sso-client/qt-signals into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
ubuntu_sso.tests.test_account
  AccountTestCase
    test_generate_captcha ... [OK]
    test_is_not_validated ... [OK]
    test_is_not_validated_empty_result ... [OK]
    test_is_validated ... [OK]
    test_login_if_http_error ... [OK]
    test_login_if_no_error ... [OK]
    test_register_user_checks_valid_email ... [OK]
    test_register_user_checks_valid_password ... [OK]
    test_register_user_if_status_error ... [OK]
    test_register_user_if_status_error_with_string_message ... [OK]
    test_register_user_if_status_ok ... [OK]
    test_register_user_if_status_unknown ... [OK]
    test_request_password_reset_token_if_http_error ... [OK]
    test_request_password_reset_token_if_status_ok ... [OK]
    test_request_password_reset_token_if_status_unknown ... [OK]
    test_set_new_password_if_http_error ... [OK]
    test_set_new_password_if_status_ok ... [OK]
    test_set_new_password_if_status_unknown ... [OK]
    test_validate_email_if_status_error ... [OK]
    test_validate_email_if_status_error_with_string_message ... [OK]
    test_validate_email_if_status_ok ... [OK]
    test_validate_email_if_status_unknown ... [OK]
  EnvironOverridesTestCase
    test_no_override_service_url ... [OK]
    test_override_service_url ... [OK]
    test_service_url_as_parameter ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.tests.test_account
  TimestampedAuthorizerTestCase
    test_authorize_request_includes_timestamp ... [OK]
ubuntu_sso.tests.test_credentials
  BasicTestCase
    runTest ... [OK]
  ClearCredentialsTestCase
    test_clear_credentials ... [OK]
    test_keyring_failure ... [OK]
  CredentialsCallbacksTestCase
    test_creation_parameters_are_stored ... [OK]
    test_help_text_defaults_to_empty_string ... [OK]
    test_ping_url_defaults_to_none ... [OK]
    test_policy_url_defaults_to_none ... [OK]
    tes...

=== modified file 'ubuntu_sso/qt/current_user_sign_in_page.py'
--- ubuntu_sso/qt/current_user_sign_in_page.py	2012-02-10 21:27:52 +0000
+++ ubuntu_sso/qt/current_user_sign_in_page.py	2012-02-10 21:27:52 +0000
@@ -18,7 +18,7 @@
 
 import gettext
 
-from PyQt4 import QtGui
+from PyQt4 import QtGui, QtCore
 from twisted.internet import defer
 
 from ubuntu_sso.qt import build_general_error_message
@@ -40,6 +40,10 @@
 class CurrentUserSignInPage(SSOWizardPage):
     """Wizard Page that lets a current user Sign into Ubuntu One."""
 
+    userLoggedIn = QtCore.pyqtSignal('QString', 'QString')
+    passwordForgotten = QtCore.pyqtSignal()
+    userNotValidated = QtCore.pyqtSignal('QString', 'QString')
+
     def __init__(self, ui, *args, **kwargs):
         super(CurrentUserSignInPage, self).__init__(ui, *args, **kwargs)
 
@@ -53,14 +57,11 @@
          }
         self.setup_page()
 
-    # pylint: disable=W0212
     def on_user_not_validated(self, *args):
         """Show the validate email page."""
-        self.next = self.wizard()._pages[self.wizard().email_verification]
         email = unicode(self.ui.email_edit.text())
-        self.wizard().page(self.next).set_titles(email)
-        self.wizard().next()
-    # pylint: enable=W0212
+        password = unicode(self.ui.password_edit.text())
+        self.userNotValidated.emit(email, password)
 
     @defer.inlineCallbacks
     def setup_page(self):
@@ -98,10 +99,6 @@
         self.ui.sign_in_button.style().polish(
             self.ui.sign_in_button)
 
-    def cleanupPage(self):
-        """Reset the state of the wizard if Verification code was visited."""
-        self.wizard()._next_id = None
-
     def _set_translated_strings(self):
         """Set the translated strings."""
         logger.debug('CurrentUserSignInPage._set_translated_strings')
@@ -148,17 +145,14 @@
         self.message_box.critical(self, self.app_name,
             build_general_error_message(error))
 
-    # pylint: disable=W0212
     def on_logged_in(self, app_name, result):
         """We managed to log in."""
         logger.info('Logged in for %s', app_name)
-        self.next = self.wizard()._pages[self.wizard().success]
-        self.wizard().next()
+        email = unicode(self.ui.email_edit.text())
+        self.userLoggedIn.emit(app_name, email)
         logger.debug('Wizard.loginSuccess emitted.')
 
     def on_forgotten_password(self):
         """Show the user the forgotten password page."""
         logger.info('Forgotten password')
-        self.next = self.wizard()._pages[self.wizard().forgotten]
-        self.wizard().next()
-    # pylint: enable=W0212
+        self.passwordForgotten.emit()

=== modified file 'ubuntu_sso/qt/email_verification_page.py'
--- ubuntu_sso/qt/email_verification_page.py	2012-02-10 21:27:52 +0000
+++ ubuntu_sso/qt/email_verification_page.py	2012-02-10 21:27:52 +0000
@@ -16,6 +16,7 @@
 
 """Email Verification page UI."""
 
+from PyQt4 import QtCore
 from twisted.internet import defer
 
 from ubuntu_sso.qt import build_general_error_message
@@ -34,9 +35,12 @@
 class EmailVerificationPage(SSOWizardPage):
     """Widget used to input the email verification code."""
 
+    registrationSuccess = QtCore.pyqtSignal('QString', 'QString')
+
     def __init__(self, ui, *args, **kwargs):
         super(EmailVerificationPage, self).__init__(ui, *args, **kwargs)
         self.email = ''
+        self.password = ''
         self._signals = {
             'EmailValidated':
              self._filter_by_app_name(self.on_email_validated),
@@ -76,10 +80,8 @@
         self.next_button.setEnabled(enabled)
         self.next_button.setProperty('DisabledState',
             not self.next_button.isEnabled())
-        self.next_button.style().unpolish(
-            self.next_button)
-        self.next_button.style().polish(
-            self.next_button)
+        self.next_button.style().unpolish(self.next_button)
+        self.next_button.style().polish(self.next_button)
 
     def _set_titles(self):
         """Set the different titles."""
@@ -96,23 +98,19 @@
         Since the subtitle contains data that is only known after SetupAccount
         and _set_titles is only called on initialization.
         """
-        self.email = email
         self._set_titles()
 
     def validate_email(self):
         """Call the next action."""
         logger.debug('EmailVerificationController.validate_email')
-        email = unicode(self.wizard().field('email_address').toString())
-        password = unicode(self.wizard().field('password').toString())
         code = unicode(self.ui.verification_code_edit.text())
-        self.backend.validate_email(self.app_name, email,
-                                    password, code)
+        self.backend.validate_email(self.app_name,
+            self.email, self.password, code)
 
     def on_email_validated(self, app_name, *args, **kwargs):
         """Signal thrown after the email is validated."""
         logger.info('EmailVerificationController.on_email_validated')
-        email = self.wizard().field('email_address').toString()
-        self.wizard().registrationSuccess.emit(app_name, email)
+        self.registrationSuccess.emit(app_name, self.email)
 
     def on_email_validation_error(self, app_name, error):
         """Signal thrown when there's a problem validating the email."""

=== modified file 'ubuntu_sso/qt/forgotten_password_page.py'
--- ubuntu_sso/qt/forgotten_password_page.py	2012-02-10 21:27:52 +0000
+++ ubuntu_sso/qt/forgotten_password_page.py	2012-02-10 21:27:52 +0000
@@ -16,6 +16,7 @@
 
 """Forgotten Password page UI."""
 
+from PyQt4 import QtCore
 from twisted.internet import defer
 
 from ubuntu_sso.qt.gui import SSOWizardEnhancedEditPage
@@ -33,6 +34,8 @@
 class ForgottenPasswordPage(SSOWizardEnhancedEditPage):
     """Widget used to deal with users that forgot the password."""
 
+    passwordResetTokenSent = QtCore.pyqtSignal()
+
     def __init__(self, ui, *args, **kwargs):
         super(ForgottenPasswordPage, self).__init__(ui, *args, **kwargs)
         self._signals = {
@@ -160,8 +163,7 @@
     def on_password_reset_token_sent(self):
         """Action taken when we managed to get the password reset done."""
         # ignore the result and move to the reset page
-        self.next = self.wizard()._pages[self.wizard().reset_password]
-        self.wizard().next()
+        self.passwordResetTokenSent.emit()
     # pylint: enable=W0212
 
     def on_password_reset_error(self, app_name, error):

=== modified file 'ubuntu_sso/qt/gui.py'
--- ubuntu_sso/qt/gui.py	2012-02-10 21:27:52 +0000
+++ ubuntu_sso/qt/gui.py	2012-02-10 21:27:52 +0000
@@ -94,7 +94,6 @@
         self.header.set_subtitle(subtitle)
         self.layout().insertWidget(0, self.header)
         self.message_box = QMessageBox
-        self.next = -1
         self._signals = {}
         self._signals_receivers = {}
         self.backend = None
@@ -108,10 +107,6 @@
         defer.returnValue(self.backend)
 
     # pylint: disable=C0103
-    def nextId(self):
-        """Provide the next id."""
-        return self.next
-
     def resizeEvent(self, event):
         """Resize the overlay to fit all the widget."""
         QWizardPage.resizeEvent(self, event)

=== modified file 'ubuntu_sso/qt/reset_password_page.py'
--- ubuntu_sso/qt/reset_password_page.py	2012-02-10 21:27:52 +0000
+++ ubuntu_sso/qt/reset_password_page.py	2012-02-10 21:27:52 +0000
@@ -17,6 +17,7 @@
 """Reset Password page UI."""
 
 from PyQt4.QtCore import SIGNAL
+from PyQt4.QtCore import pyqtSignal
 from PyQt4.QtGui import QApplication
 from twisted.internet import defer
 
@@ -42,6 +43,8 @@
 class ResetPasswordPage(SSOWizardEnhancedEditPage):
     """Widget used to allow the user change his password."""
 
+    passwordChanged = pyqtSignal('QString')
+
     def __init__(self, ui, app_name=None, parent=None):
         """Create a new instance."""
         super(ResetPasswordPage, self).__init__(ui, app_name, parent)
@@ -173,14 +176,8 @@
     def on_password_changed(self, app_name, result):
         """Let user know that the password was changed."""
         email = unicode(self.wizard().forgotten.ui.email_line_edit.text())
-        self.wizard().current_user.ui.email_edit.setText(email)
         self.overlay.hide()
-        current_user_id = self.wizard().current_user_page_id
-        visited_pages = self.wizard().visitedPages()
-        for index in reversed(visited_pages):
-            if index == current_user_id:
-                break
-            self.wizard().back()
+        self.passwordChanged.emit(email)
 
     def on_password_change_error(self, app_name, error):
         """Let the user know that there was an error."""

=== modified file 'ubuntu_sso/qt/setup_account_page.py'
--- ubuntu_sso/qt/setup_account_page.py	2012-02-10 21:27:52 +0000
+++ ubuntu_sso/qt/setup_account_page.py	2012-02-10 21:27:52 +0000
@@ -87,6 +87,8 @@
 class SetupAccountPage(SSOWizardEnhancedEditPage):
     """Customized Setup Account page for SSO."""
 
+    userRegistered = QtCore.pyqtSignal('QString', 'QString')
+
     def __init__(self, ui, subtitle, toc_link, policy_link, *args, **kwargs):
         super(SetupAccountPage, self).__init__(ui, *args, **kwargs)
         self._subtitle = subtitle
@@ -287,7 +289,7 @@
         logger.debug('SetUpAccountPage._set_titles')
         self.header.set_title(
             JOIN_HEADER_LABEL % {'app_name': self.app_name})
-        self.header.set_subtitle(self.wizard().help_text)
+        self.header.set_subtitle(self._subtitle)
 
     def _register_fields(self):
         """Register the diff fields of the Ui."""
@@ -338,8 +340,9 @@
     def on_user_registered(self, app_name, result):
         """Execute when the user did register."""
         logger.debug('SetUpAccountPage.on_user_registered')
-        self.next = self.wizard().email_verification_page_id
-        self.wizard().next()
+        email = unicode(self.ui.email_edit.text())
+        password = unicode(self.ui.password_edit.text())
+        self.userRegistered.emit(email, password)
 
     def validate_form(self):
         """Validate the info of the form and return an error."""
@@ -390,9 +393,8 @@
             self.backend.register_user(self.app_name, email,
                                        password, name, captcha_id,
                                        captcha_solution)
-        # Update validation page's title, which contains the email
-        self.next = self.wizard()._pages[self.wizard().email_verification]
-        self.wizard().page(self.next).set_titles(email)
+            # Update validation page's title, which contains the email
+            self.userRegistered.emit(email, password)
     # pylint: enable=W0212
 
     def is_correct_email(self, email_address):

=== modified file 'ubuntu_sso/qt/sign_in_page.py'
--- ubuntu_sso/qt/sign_in_page.py	2012-02-10 21:27:52 +0000
+++ ubuntu_sso/qt/sign_in_page.py	2012-02-10 21:27:52 +0000
@@ -18,7 +18,7 @@
 
 import gettext
 
-from PyQt4 import QtGui
+from PyQt4 import QtGui, QtCore
 
 from ubuntu_sso.qt.gui import SSOWizardPage
 from ubuntu_sso.logger import setup_logging
@@ -36,6 +36,10 @@
 class SignInPage(SSOWizardPage):
     """Wizard Page that lets the user Sign into Ubuntu One."""
 
+    existingAccountSelected = QtCore.pyqtSignal()
+    newAccountSelected = QtCore.pyqtSignal()
+    singInCanceled = QtCore.pyqtSignal()
+
     def __init__(self, ui, image_pixmap, *args, **kwargs):
         super(SignInPage, self).__init__(ui, *args, **kwargs)
         self.ui.image_label.setPixmap(image_pixmap)
@@ -62,14 +66,12 @@
     def _set_next_existing(self):
         """Set the next id and fire signal."""
         logger.debug('SignInPage._set_next_existing')
-        self.next = self.wizard().current_user_page_id
-        self.wizard().next()
+        self.existingAccountSelected.emit()
 
     def _set_next_new(self):
         """Set the next id and fire signal."""
         logger.debug('SignInPage._set_next_new')
-        self.next = self.wizard().setup_account_page_id
-        self.wizard().next()
+        self.newAccountSelected.emit()
 
     # Invalid names of Qt-inherited methods
     # pylint: disable=C0103
@@ -77,7 +79,7 @@
     def initializePage(self):
         """Setup UI details."""
         self.ui.cancel_button.setText(_("Close window and setup later"))
-        self.ui.cancel_button.clicked.connect(self.wizard().reject)
+        self.ui.cancel_button.clicked.connect(self.singInCanceled.emit)
         # Layout without custom button 1,
         # without finish button
         # without cancel

=== 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-02-10 21:27:52 +0000
+++ ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2012-02-10 21:27:52 +0000
@@ -26,6 +26,7 @@
     FakedBackend,
     FakedObject,
     FakePageUiStyle,
+    FakeSignal,
     FakeWizard,
     FakeWizardButtonStyle,
 )
@@ -40,6 +41,13 @@
     def setUp(self):
         yield super(CurrentUserSignInTestCase, self).setUp()
         self.patch(gui.main, "get_sso_client", FakedBackend)
+        self.signals_results = []
+        self.patch(current_user_sign_in_page.CurrentUserSignInPage,
+            "userLoggedIn", FakeSignal())
+        self.patch(current_user_sign_in_page.CurrentUserSignInPage,
+            "passwordForgotten", FakeSignal())
+        self.patch(current_user_sign_in_page.CurrentUserSignInPage,
+            "userNotValidated", FakeSignal())
         self.ui = current_user_sign_in_page.CurrentUserSignInPage(
             current_user_sign_in_ui.Ui_CurrentUserSignInPage(),
             parent=None)
@@ -79,18 +87,17 @@
 
     def test_on_user_not_validated(self):
         """Test the navigation flow on user not validated."""
-        self.ui.on_user_not_validated()
-        self.assertTrue('next' in self.wizard.called)
-        self.assertEqual(self.ui.next, self.wizard.email_verification_id)
-
-    def test_next_id(self):
-        """Test if the object return the proper next id."""
-        email = '[e-mail]'
+        email = 'email@example'
+        password = 'password'
         self.ui.ui.email_edit.setText(email)
+        self.ui.ui.password_edit.setText(password)
+
+        def slot(email, password):
+            """Fake slot."""
+            self.signals_results.append((email, password))
+        self.ui.userNotValidated.connect(slot)
         self.ui.on_user_not_validated()
-        next_id = self.ui.nextId()
-        self.assertEqual(next_id, self.wizard.email_verification_id)
-        self.assertTrue(('set_titles', email) in self.wizard.called)
+        self.assertTrue((email, password) in self.signals_results)
 
     def test_initialize_page(self):
         """Test the initialization method."""
@@ -111,11 +118,6 @@
         self.assertTrue(button.properties['unpolish'])
         self.assertTrue(button.properties['polish'])
 
-    def test_cleanup_page(self):
-        """Test the cleanupPage method."""
-        self.ui.cleanupPage()
-        self.assertEqual(self.wizard._next_id, None)
-
     def test_set_translated_strings(self):
         """Test the translated string method."""
         self.ui._set_translated_strings()
@@ -191,11 +193,23 @@
     def test_on_logged_in(self):
         """Test the on_login_error method."""
         app_name = 'my_app'
+        email = 'email@example'
         self.ui.app_name = app_name
+        self.ui.ui.email_edit.setText(email)
+
+        def slot(app, email):
+            """Fake slot."""
+            self.signals_results.append((app, email))
+        self.ui.userLoggedIn.connect(slot)
         self.ui.on_logged_in(app_name, None)
-        self.assertEqual(self.ui.next, self.wizard.success_id)
+        self.assertTrue((app_name, email) in self.signals_results)
 
     def test_on_forgotten_password(self):
         """Test the on_login_error method."""
+
+        def slot():
+            """Fake slot."""
+            self.signals_results.append(1)
+        self.ui.passwordForgotten.connect(slot)
         self.ui.on_forgotten_password()
-        self.assertEqual(self.ui.next, self.wizard.forgotten_id)
+        self.assertTrue(1 in self.signals_results)

=== modified file 'ubuntu_sso/qt/tests/test_email_verification.py'
--- ubuntu_sso/qt/tests/test_email_verification.py	2012-02-10 21:27:52 +0000
+++ ubuntu_sso/qt/tests/test_email_verification.py	2012-02-10 21:27:52 +0000
@@ -26,6 +26,7 @@
     FakedBackend,
     FakedObject,
     FakePageUiStyle,
+    FakeSignal,
     FakeWizard,
 )
 from ubuntu_sso.qt.ui import email_verification_ui
@@ -38,7 +39,10 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(EmailVerificationTestCase, self).setUp()
+        self.signals_results = []
         self.patch(gui.main, "get_sso_client", FakedBackend)
+        self.patch(email_verification_page.EmailVerificationPage,
+            "registrationSuccess", FakeSignal())
         self.ui = email_verification_page.EmailVerificationPage(
             email_verification_ui.Ui_EmailVerificationPage(),
             parent=None)
@@ -149,3 +153,17 @@
         self.ui.on_email_validation_error(app_name, error)
         expected = ((self.ui, app_name, ''), {})
         self.assertTrue(expected, self._called)
+
+    def test_on_email_validated(self):
+        """Test the on_email_validated method."""
+        app_name = 'my_app'
+        email = 'email@example'
+        self.ui.app_name = app_name
+        self.ui.email = email
+
+        def slot(app, email):
+            """Fake slot."""
+            self.signals_results.append((app, email))
+        self.ui.registrationSuccess.connect(slot)
+        self.ui.on_email_validated(app_name)
+        self.assertTrue((app_name, email) in self.signals_results)

=== modified file 'ubuntu_sso/qt/tests/test_forgotten_password.py'
--- ubuntu_sso/qt/tests/test_forgotten_password.py	2012-02-10 21:27:52 +0000
+++ ubuntu_sso/qt/tests/test_forgotten_password.py	2012-02-10 21:27:52 +0000
@@ -26,6 +26,7 @@
     FakedBackend,
     FakedObject,
     FakePageUiStyle,
+    FakeSignal,
     FakeWizard,
 )
 from ubuntu_sso.qt.ui import forgotten_password_ui
@@ -38,6 +39,9 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(ForgottenPasswordTestCase, self).setUp()
+        self.signals_results = []
+        self.patch(forgotten_password_page.ForgottenPasswordPage,
+            "passwordResetTokenSent", FakeSignal())
         self.patch(gui.main, "get_sso_client", FakedBackend)
         self.ui = forgotten_password_page.ForgottenPasswordPage(
             forgotten_password_ui.Ui_ForgottenPasswordPage(),
@@ -201,8 +205,13 @@
 
     def test_on_password_reset_token_sent(self):
         """Test on_password_reset_token_sent method."""
+
+        def slot():
+            """Fake slot."""
+            self.signals_results.append(1)
+        self.ui.passwordResetTokenSent.connect(slot)
         self.ui.on_password_reset_token_sent()
-        self.assertEqual(self.ui.next, self.wizard.reset_password_id)
+        self.assertTrue(1 in self.signals_results)
 
     def test_on_password_reset_error(self):
         """Test on_password_reset_error method."""

=== modified file 'ubuntu_sso/qt/tests/test_setup_account.py'
--- ubuntu_sso/qt/tests/test_setup_account.py	2012-02-10 21:27:52 +0000
+++ ubuntu_sso/qt/tests/test_setup_account.py	2012-02-10 21:27:52 +0000
@@ -26,7 +26,9 @@
 from ubuntu_sso.qt.tests import (
     BaseTestCase,
     FakedBackend,
+    FakedObject,
     FakeOverlay,
+    FakeSignal,
     FakeWizard,
 )
 from ubuntu_sso.qt.ui import setup_account_ui
@@ -39,6 +41,9 @@
     def setUp(self):
         yield super(SetupAccountTestCase, self).setUp()
         self.patch(gui.main, "get_sso_client", FakedBackend)
+        self.signals_results = []
+        self.patch(setup_account_page.SetupAccountPage,
+            "userRegistered", FakeSignal())
         self.ui = setup_account_page.SetupAccountPage(
             setup_account_ui.Ui_SetUpAccountPage(),
             'subtitle',
@@ -126,6 +131,46 @@
         self.ui.focus_changed(self.ui.ui.confirm_password_edit, None)
         self.assertTrue(self._called)
 
+    def test_on_user_registered(self):
+        """Test on_user_registered method."""
+        exposed_methods = ['register_user']
+        self.patch(FakedObject, "exposed_methods", exposed_methods)
+        faked_object = FakedObject()
+        self.patch(self.ui, "backend", faked_object)
+        self.patch(self.ui, "validate_form", lambda: True)
+
+        email = 'email@example'
+        password = 'password'
+        name = 'name'
+        captcha_id = 1
+        captcha_solution = 'solution'
+        self.ui.ui.email_edit.setText(email)
+        self.ui.ui.password_edit.setText(password)
+        self.ui.ui.name_edit.setText(name)
+        self.ui.captcha_id = captcha_id
+        self.ui.ui.captcha_solution_edit.setText(captcha_solution)
+
+        def slot(email, password):
+            """Fake slot."""
+            self.signals_results.append((email, password))
+        self.ui.userRegistered.connect(slot)
+        self.ui.set_next_validation()
+        self.assertTrue((email, password) in self.signals_results)
+
+    def test_set_next_validation(self):
+        """Test on_user_registered method."""
+        email = 'email@example'
+        password = 'password'
+        self.ui.ui.email_edit.setText(email)
+        self.ui.ui.password_edit.setText(password)
+
+        def slot(email, password):
+            """Fake slot."""
+            self.signals_results.append((email, password))
+        self.ui.userRegistered.connect(slot)
+        self.ui.on_user_registered('app_name', None)
+        self.assertTrue((email, password) in self.signals_results)
+
 
 class SetupAccountFakeWizardTestCase(BaseTestCase):
     """Test the SetupAccountPage code."""

=== modified file 'ubuntu_sso/qt/tests/test_sign_in_page.py'
--- ubuntu_sso/qt/tests/test_sign_in_page.py	2012-02-10 21:27:52 +0000
+++ ubuntu_sso/qt/tests/test_sign_in_page.py	2012-02-10 21:27:52 +0000
@@ -21,7 +21,7 @@
 
 from ubuntu_sso.qt import sign_in_page as gui
 from ubuntu_sso.qt.ui.choose_sign_in_ui import Ui_ChooseSignInPage
-from ubuntu_sso.qt.tests import BaseTestCase, FakeMainWindow
+from ubuntu_sso.qt.tests import BaseTestCase, FakeMainWindow, FakeSignal
 
 
 class SignInPageTestCase(BaseTestCase):
@@ -31,6 +31,10 @@
     def setUp(self):
         """Initialize this test instance."""
         yield super(SignInPageTestCase, self).setUp()
+        self.signals_results = []
+        self.patch(gui.SignInPage, "existingAccountSelected", FakeSignal())
+        self.patch(gui.SignInPage, "newAccountSelected", FakeSignal())
+        self.patch(gui.SignInPage, "singInCanceled", FakeSignal())
         self.ui = gui.SignInPage(Ui_ChooseSignInPage(), QtGui.QPixmap())
 
     def test_show_event(self):
@@ -41,3 +45,25 @@
         self.ui.show()
         self.addCleanup(self.ui.hide)
         self.assertTrue(self.ui.ui.existing_account_button.isDefault())
+
+    # pylint: disable=W0212
+    def test_set_next_existing(self):
+        """Test _set_next_existing method."""
+
+        def slot():
+            """Fake slot."""
+            self.signals_results.append(1)
+        self.ui.existingAccountSelected.connect(slot)
+        self.ui._set_next_existing()
+        self.assertTrue(1 in self.signals_results)
+
+    def test_set_next_new(self):
+        """Test _set_next_existing method."""
+
+        def slot():
+            """Fake slot."""
+            self.signals_results.append(1)
+        self.ui.newAccountSelected.connect(slot)
+        self.ui._set_next_new()
+        self.assertTrue(1 in self.signals_results)
+    # pylint: enable=W0212

=== modified file 'ubuntu_sso/qt/ubuntu_sso_wizard.py'
--- ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-02-10 21:27:52 +0000
+++ ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-02-10 21:27:52 +0000
@@ -58,6 +58,7 @@
         """Create a new wizard."""
         parent = kwargs.get('parent')
         super(UbuntuSSOWizard, self).__init__(parent)
+        self._next_id = -1
 
         # store common useful data provided by the app
         self.app_name = app_name
@@ -77,18 +78,36 @@
                                        app_name=self.app_name,
                                        title='Sign in',
                                        parent=self)
+        self.sign_in_page.singInCanceled.connect(self.reject)
+        self.sign_in_page.existingAccountSelected.connect(
+            self._move_to_login_page)
+        self.sign_in_page.newAccountSelected.connect(
+            self._move_to_setup_account_page)
+
         self.setup_account = SetupAccountPage(Ui_SetUpAccountPage(),
                                               self.help_text,
                                               self.tc_url,
                                               self.policy_url,
                                               app_name=self.app_name,
                                               parent=self)
+        self.setup_account.userRegistered.connect(
+            self._move_to_email_verification_page)
+
         self.current_user = CurrentUserSignInPage(Ui_CurrentUserSignInPage(),
                                                   app_name=self.app_name,
                                                   parent=self)
+        self.current_user.userNotValidated.connect(
+            self._move_to_email_verification_page)
+        self.current_user.userLoggedIn.connect(self._move_to_success_page)
+        self.current_user.passwordForgotten.connect(
+            self._move_to_forgotten_page)
+
         self.email_verification = EmailVerificationPage(
                                                 Ui_EmailVerificationPage(),
                                                 app_name=self.app_name)
+        self.email_verification.registrationSuccess.connect(
+            self._move_to_success_page)
+
         self.success = SuccessPage(Ui_SuccessPage(),
                                    app_name=self.app_name, parent=self)
         self.error = ErrorPage(Ui_ErrorPage(),
@@ -96,9 +115,14 @@
         self.forgotten = ForgottenPasswordPage(Ui_ForgottenPasswordPage(),
                                                app_name=self.app_name,
                                                parent=self)
+        self.forgotten.passwordResetTokenSent.connect(
+            self._move_to_forgotten_page)
+
         self.reset_password = ResetPasswordPage(Ui_ResetPasswordPage(),
                                                 app_name=self.app_name,
                                                 parent=self)
+        self.reset_password.passwordChanged.connect(
+            self._go_back_to_current_page)
         # store the ids of the pages so that it is easier to access them later
         pages = [self.sign_in_page, self.setup_account,
                      self.email_verification, self.current_user, self.success,
@@ -118,8 +142,61 @@
         self.setWizardStyle(QWizard.ModernStyle)
         self.button(QWizard.CancelButton).clicked.connect(
                                                     self.on_user_cancelation)
-        self.loginSuccess.connect(self.on_login_success)
-        self.registrationSuccess.connect(self.on_registration_success)
+
+    # pylint: disable=C0103
+    def nextId(self):
+        """Return the id of the next page."""
+        return self._next_id
+    # pylint: enable=C0103
+
+    def _go_back_to_current_page(self, email):
+        """Move back until it reaches the current user sign in page. """
+        self.current_user.ui.email_edit.setText(email)
+        current_user_id = self.current_user_page_id
+        visited_pages = self.visitedPages()
+        for index in reversed(visited_pages):
+            if index == current_user_id:
+                break
+            self.back()
+
+    def _move_to_reset_password_page(self):
+        """Move to the reset password page wizard."""
+        self._next_id = self.reset_password_page_id
+        self.next()
+        self._next_id = -1
+
+    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.email_verification.set_titles(email)
+        self.next()
+        self._next_id = -1
+
+    def _move_to_setup_account_page(self):
+        """Move to the setup account page wizard."""
+        self._next_id = self.setup_account_page_id
+        self.next()
+        self._next_id = -1
+
+    def _move_to_login_page(self):
+        """Move to the login page wizard."""
+        self._next_id = self.current_user_page_id
+        self.next()
+        self._next_id = -1
+
+    def _move_to_success_page(self, app_name='', email=''):
+        """Move to the success page wizard."""
+        self._next_id = self.success_page_id
+        self.next()
+        self._next_id = -1
+
+    def _move_to_forgotten_page(self):
+        """Move to the forgotten page wizard."""
+        self._next_id = self.forgotten_password_page_id
+        self.next()
+        self._next_id = -1
 
     @property
     def sign_in_page_id(self):