Merge lp:~diegosarmentero/ubuntuone-windows-installer/not-validated-account into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Fixed: When logging in with an no-yet-validated account, there is no useful message (LP: #851885).

Fixed: When logging in with an no-yet-validated account, there is no useful message (LP: #851885).

[Alejandro J. Cura (alecu)]

+1

review: Approve

[Manuel de la Peña (mandel)]

I see an issue with the fact that the cleanupPage is using a private variable and is not present in a test class. Either move the method to the wizard class of make the _next_id attribute public.

review: Needs Information

[Diego Sarmentero (diegosarmentero)]

> I see an issue with the fact that the cleanupPage is using a private variable
> and is not present in a test class. Either move the method to the wizard class
> of make the _next_id attribute public.

Bug report created to do that refactor:
https://bugs.launchpad.net/ubuntuone-windows-installer/+bug/903668

[Manuel de la Peña (mandel)]

Ok, I'll approve the branch because is done everywhere, but please remember that the control flow of a page should be done in the nextId method.

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-11-11 20:36:16 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-11-22 17:54:30 +0000
@@ -213,6 +213,10 @@
         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
+
 
 class SuccessPage(SSOWizardPage):
     """Shown after SSO login, before setup."""
@@ -305,6 +309,7 @@
     # definition of the signals raised by the widget (for SSO)
     recoverableError = QtCore.pyqtSignal('QString', 'QString')
     loginSuccess = QtCore.pyqtSignal('QString', 'QString')
+    registrationIncomplete = QtCore.pyqtSignal('QString', 'QString')
     registrationSuccess = QtCore.pyqtSignal('QString', 'QString')
     userCancellation = QtCore.pyqtSignal('QString')
 
@@ -412,6 +417,7 @@
         self.reset_password_page_id = self.addPage(self.reset_password)
 
         self.loginSuccess.connect(self.login_success_slot)
+        self.registrationIncomplete.connect(self.registration_incomplete)
         self.registrationSuccess.connect(self.registration_success_slot)
 
         # End of SSO pages
@@ -470,6 +476,12 @@
         self.next()
         self._next_id = self.SYNC_NOW_OR_LATER_PAGE
 
+    def registration_incomplete(self):
+        """Called when registration wasn't completed."""
+        self._next_id = self.email_verification_page_id
+        self.next()
+        self._next_id = self.SUCCESS_PAGE
+
     def registration_success_slot(self):
         """Called on successful registration."""
         self._next_id = self.SUCCESS_PAGE

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-11-11 20:36:16 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-11-22 17:54:30 +0000
@@ -347,6 +347,32 @@
         folders_page.on_check_settings_button_clicked()
         self.assertEqual(self.ui.currentId(), self.ui.preferences_page_id)
 
+    def test_current_user_sign_in_page_clenaup(self):
+        """Check CurrentUserSignIn cleanupPage method."""
+        current_signin_page = self.ui.page(self.ui.current_user_page_id)
+
+        # Show the current id page
+        self.ui.setStartId(self.ui.current_user_page_id)
+        self.ui.restart()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+
+        self.ui._next_id = self.ui.SUCCESS_PAGE
+        current_signin_page.cleanupPage()
+        self.assertEqual(self.ui._next_id, None)
+
+    def test_registration_incomplete(self):
+        """Check the registration_incomplete slot."""
+        self.ui.setStartId(self.ui.current_user_page_id)
+        self.ui.restart()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+
+        self.ui.registration_incomplete()
+        self.assertEqual(self.ui.currentId(),
+            self.ui.email_verification_page_id)
+        self.assertEqual(self.ui._next_id, self.ui.SUCCESS_PAGE)
+
     def test_critical(self):
         """Show a critical popup, but first hide the overlay."""
         self.assertEqual(self.ui.overlay.hide_counter, 1)
@@ -615,6 +641,7 @@
 
     currentIdChanged = FakeSignal()
     loginSuccess = FakeSignal()
+    registrationIncomplete = FakeSignal()
     registrationSuccess = FakeSignal()
     userCancellation = FakeSignal()
     shown = False