Merge lp:~ralsina/ubuntu-sso-client/fix_merge_27 into lp:ubuntu-sso-client

[Roberto Alsina]

Fix merge conflicts to trunk.

=== modified file '.bzrignore'
--- .bzrignore	2011-03-14 12:22:58 +0000
+++ .bzrignore	2011-04-14 08:48:33 +0000
@@ -10,3 +10,4 @@
 ubuntu_sso/qt/email_verification_ui.py
 ubuntu_sso/qt/setup_account_ui.py
 ubuntu_sso/qt/terms_and_conditions_ui.py
+ubuntu_sso/qt/success_message_ui.py

=== added file 'data/qt/success_message.ui'
--- data/qt/success_message.ui	1970-01-01 00:00:00 +0000
+++ data/qt/success_message.ui	2011-04-14 08:48:33 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SuccessPage</class>
+ <widget class="QWizardPage" name="SuccessPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>WizardPage</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="success_message_label">
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

=== modified file 'ubuntu_sso/qt/controllers.py'
--- ubuntu_sso/qt/controllers.py	2011-04-13 10:11:31 +0000
+++ ubuntu_sso/qt/controllers.py	2011-04-14 08:48:33 +0000
@@ -45,6 +45,7 @@
     SET_UP_ACCOUNT_BUTTON,
     SIGN_IN_BUTTON,
     SURNAME_ENTRY,
+    SUCCESS,
     TC_BUTTON,
     VERIFY_EMAIL_TITLE,
     VERIFY_EMAIL_CONTENT,
@@ -54,8 +55,6 @@
 
 
 logger = setup_logging('ubuntu_sso.controllers')
-# pylint: disable=W0511
-# disabled warnings about TODO comments
 
 # pylint: disable=W0511
 # disabled warnings about TODO comments
@@ -182,10 +181,12 @@
         logger.error('Got error when login %s, error: %s', app_name, error)
         self.message_box.critical(view, app_name, str(error))
 
+    @inlineCallbacks
     def on_logged_in(self, view, app_name, result):
         """We managed to log in."""
         logger.info('Logged in for %s', app_name)
         view.wizard().loginSuccess.emit(app_name, view.email)
+        logger.debug('Wizard.loginSuccess emitted.')
 
     # use an ugly name just so have a simlar api as found in PyQt
     #pylint: disable=C0103
@@ -313,6 +314,7 @@
         # error are returned as a dict with the data we want to show.
         self.message_box.critical(view, error['errtype'], error['email'])
 
+    @inlineCallbacks
     def on_user_registered(self, view, app_name, result):
         """Execute when the user did register."""
         logger.debug('SetUpAccountController.on_user_registered')
@@ -440,6 +442,20 @@
         view.wizard().next()
 
 
+class SuccessController(object):
+    """Controller used for the success page."""
+
+    def __init__(self):
+        """Create a new instance."""
+
+    #pylint: disable=C0103
+    def setupUi(self, view):
+        """Setup the view."""
+        view.next = -1
+        view.success_message_label.setText(SUCCESS)
+    #pylint: enable=C0103
+
+
 class UbuntuSSOWizardController(object):
     """Controller used for the overall wizard."""
 
@@ -458,18 +474,20 @@
         self.user_cancellation_callback(self.app_name)
         view.close()
 
-    def on_login_success(self, app_name, email):
+    @inlineCallbacks
+    def on_login_success(self, app_name, email, view):
         """Process the success of a login."""
         logger.debug('UbuntuSSOWizardController.on_login_success')
         result = yield self.login_success_callback(app_name, email)
-        # TODO: what to do?
         logger.debug('Result from callback is %s', result)
         if result == 0:
             logger.info('Success in calling the given success_callback')
+            self.show_success_message(view)
         else:
             logger.info('Error in calling the given success_callback')
 
-    def on_registration_success(self, app_name, email):
+    @inlineCallbacks
+    def on_registration_success(self, app_name, email, view):
         """Process the success of a registration."""
         logger.debug('UbuntuSSOWizardController.on_registration_success')
         result = yield self.registration_success_callback(app_name, email)
@@ -477,14 +495,30 @@
         logger.debug('Result from callback is %s', result)
         if result == 0:
             logger.info('Success in calling the given registration_callback')
+            self.show_success_message(view)
         else:
             logger.info('Success in calling the given registration_callback')
 
+    def show_success_message(self, view):
+        """Show the success message in the view."""
+        logger.info('Showing success message.')
+        # get the id of the success page, set it as the next id of the
+        # current page and let the wizard move to the next step
+        view.currentPage().next = view.success_page_id
+        view.next()
+        # show the finish button but with a close message
+        buttons_layout = []
+        buttons_layout.append(QWizard.Stretch)
+        buttons_layout.append(QWizard.FinishButton)
+        view.setButtonLayout(buttons_layout)
+
     #pylint: disable=C0103
     def setupUi(self, view):
         """Setup the view."""
         view.button(QWizard.CancelButton).clicked.connect(
                                         lambda: self.on_user_cancelation(view))
-        view.loginSuccess.connect(self.on_login_success)
-        view.registrationSuccess.connect(self.on_registration_success)
+        view.loginSuccess.connect(
+             lambda app, email: self.on_login_success(app, email, view))
+        view.registrationSuccess.connect(
+             lambda app, email: self.on_registration_success(app, email, view))
     #pylint: enable=C0103

=== modified file 'ubuntu_sso/qt/gui.py'
--- ubuntu_sso/qt/gui.py	2011-04-13 10:11:31 +0000
+++ ubuntu_sso/qt/gui.py	2011-04-14 08:48:33 +0000
@@ -36,12 +36,14 @@
 from ubuntu_sso.qt.email_verification_ui import Ui_EmailVerificationPage
 from ubuntu_sso.qt.setup_account_ui import Ui_SetUpAccountPage
 from ubuntu_sso.qt.terms_and_conditions_ui import Ui_TosPage
+from ubuntu_sso.qt.success_message_ui import Ui_SuccessPage
 # pylint: enable=F0401,E0611
 from ubuntu_sso.qt.controllers import (
     ChooseSignInController,
     CurrentUserController,
     EmailVerificationController,
     SetUpAccountController,
+    SuccessController,
     TosController,
     UbuntuSSOWizardController)
 
@@ -394,6 +396,30 @@
         return self.ui.set_up_button
 
 
+class SuccessPage(QWizardPage):
+    """Page used to display success message."""
+
+    def __init__(self, ui, controller, parent=None):
+        """Create a new instance."""
+        QWizardPage.__init__(self, parent)
+        self.ui = ui
+        self.ui.setupUi(self)
+        self.controller = controller
+        self.controller.setupUi(self)
+        self.next = -1
+
+    # pylint: disable=C0103
+    def nextId(self):
+        """Return the next page id."""
+        return self.next
+    # pylint: enable=C0103
+
+    @property
+    def success_message_label(self):
+        """Return the label used to show the message."""
+        return self.ui.success_message_label
+
+
 class UbuntuSSOWizard(QWizard):
     """Wizard used to create or use sso."""
 
@@ -428,9 +454,15 @@
         self.current_user = CurrentUserSignInPage(Ui_CurrentUserSignInPage(),
                                                   self.current_user_controller,
                                                   parent=self)
+        self.success_controller = SuccessController()
+        self.success = SuccessPage(Ui_SuccessPage(), self.success_controller,
+                                   parent=self)
+        # store the dis of the pages so that it is easier to access them later
+        self._pages = {}
         for page in [self.sign_in_page, self.setup_account, self.tos,
-                     self.email_verification, self.current_user]:
-            self.addPage(page)
+                     self.email_verification, self.current_user, self.success]:
+            self._pages[page] = self.addPage(page)
+
         # set the buttons layout to only have cancel and back since the next
         # buttons are the ones used in the diff pages.
         buttons_layout = []
@@ -439,7 +471,13 @@
         buttons_layout.append(QWizard.CancelButton)
         self.setButtonLayout(buttons_layout)
         self.setWindowTitle(app_name)
-        controller.setupUi(self)
+        self.controller = controller
+        self.controller.setupUi(self)
+
+    @property
+    def success_page_id(self):
+        """Return the id of the success page."""
+        return self._pages[self.success]
 
 
 class UbuntuSSOClientGUI(object):

=== modified file 'ubuntu_sso/qt/tests/test_qt_views.py'
--- ubuntu_sso/qt/tests/test_qt_views.py	2011-03-30 10:57:29 +0000
+++ ubuntu_sso/qt/tests/test_qt_views.py	2011-04-14 08:48:33 +0000
@@ -25,6 +25,7 @@
     CurrentUserSignInPage,
     EmailVerificationPage,
     SetupAccountPage,
+    SuccessPage,
     TosPage)
 # in linux we will be having a pylint warning because the code is not
 # compiled since we are just targeting windows with it, later
@@ -35,6 +36,7 @@
 from ubuntu_sso.qt.email_verification_ui import Ui_EmailVerificationPage
 from ubuntu_sso.qt.terms_and_conditions_ui import Ui_TosPage
 from ubuntu_sso.qt.setup_account_ui import Ui_SetUpAccountPage
+from ubuntu_sso.qt.success_message_ui import Ui_SuccessPage
 # pylint: enable=F0401
 
 
@@ -333,3 +335,29 @@
     def test_set_up_button(self):
         """Test the property that returns the set up button."""
         self.assertEqual(self.ui.set_up_button, self.widget.set_up_button)
+
+
+class SuccessPageTestCase(TestCase):
+    """Test that the correct widgets are used."""
+
+    def setUp(self):
+        """Setup tests."""
+        super(SuccessPageTestCase, self).setUp()
+        self.ui = Ui_SuccessPage()
+        self.controller = FakeController()
+        self.widget = SuccessPage(self.ui, self.controller)
+
+    def test_constructor(self):
+        """Test that the constructor works as expected."""
+        mocker = Mocker()
+        ui = mocker.mock()
+        controller = mocker.mock()
+        ui.setupUi(MATCH(lambda x: isinstance(x, SuccessPage)))
+        controller.setupUi(MATCH(lambda x: isinstance(x, SuccessPage)))
+        mocker.replay()
+        self.widget = SuccessPage(self.ui, self.controller)
+
+    def test_success_message_label(self):
+        """Test that the correct label is returned."""
+        self.assertEqual(self.ui.success_message_label,
+                         self.widget.success_message_label)

=== modified file 'ubuntu_sso/qt/tests/test_windows.py'
--- ubuntu_sso/qt/tests/test_windows.py	2011-04-13 10:11:31 +0000
+++ ubuntu_sso/qt/tests/test_windows.py	2011-04-14 08:48:33 +0000
@@ -24,6 +24,7 @@
     CurrentUserController,
     EmailVerificationController,
     SetUpAccountController,
+    SuccessController,
     TosController,
     UbuntuSSOWizardController)
 from ubuntu_sso.utils.ui import (
@@ -44,6 +45,7 @@
     SET_UP_ACCOUNT_BUTTON,
     SIGN_IN_BUTTON,
     SURNAME_ENTRY,
+    SUCCESS,
     TC_BUTTON,
     VERIFY_EMAIL_TITLE,
     VERIFY_EMAIL_CONTENT,
@@ -419,6 +421,25 @@
         self.controller.next_page(self.view)
 
 
+class SuccessControllerTestCase(MockerTestCase):
+    """Test the success page controller."""
+
+    def setUp(self):
+        """Set the tests."""
+        super(SuccessControllerTestCase, self).setUp()
+        self.controller = SuccessController()
+        self.view = self.mocker.mock()
+
+    def test_set_ui(self):
+        """Test the process that sets the ui."""
+        self.view.next = -1
+        self.view.success_message_label
+        self.mocker.result(self.view)
+        self.view.setText(SUCCESS)
+        self.mocker.replay()
+        self.controller.setupUi(self.view)
+
+
 class UbuntuSSOWizardControllerTestCase(MockerTestCase):
     """Test the wizard controller."""
 
@@ -456,13 +477,29 @@
         self.mocker.replay()
         self.controller.registration_success_callback(app_name, email)
 
+    def test_show_success_message(self):
+        """Test that the correct page will be shown."""
+        success_page_id = 0
+        # the buttons layout we expect to have
+        buttons_layout = []
+        buttons_layout.append(QWizard.Stretch)
+        buttons_layout.append(QWizard.FinishButton)
+        self.view.success_page_id
+        self.mocker.result(success_page_id)
+        self.view.currentPage()
+        self.mocker.result(self.view)
+        self.view.next = success_page_id
+        self.view.next()
+        self.view.setButtonLayout(buttons_layout)
+        self.mocker.replay()
+        self.controller.show_success_message(self.view)
+
     def test_setup_ui(self):
         """Test that the ui is connect."""
         self.view.button(QWizard.CancelButton)
         self.mocker.result(self.view)
         self.view.clicked.connect(MATCH(callable))
-        self.view.loginSuccess.connect(self.controller.on_login_success)
-        self.view.registrationSuccess.connect(
-                                    self.controller.on_registration_success)
+        self.view.loginSuccess.connect(MATCH(callable))
+        self.view.registrationSuccess.connect(MATCH(callable))
         self.mocker.replay()
         self.controller.setupUi(self.view)