Merge lp:~diegosarmentero/ubuntu-sso-client/network-page into lp:ubuntu-sso-client

[Diego Sarmentero]

- Fixed: Check network connection when the wizard starts (LP: 996025)

[Roberto Alsina (ralsina)]

+1

review: Approve

[Manuel de la Peña (mandel)]

Ran in all 3 supported platforms and all tests pass. Code looks ok.

review: Approve

=== modified file 'ubuntu_sso/qt/network_detection_page.py'
--- ubuntu_sso/qt/network_detection_page.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/network_detection_page.py	2012-05-11 18:39:19 +0000
@@ -29,7 +29,7 @@
 """Pages from SSO."""
 
 from twisted.internet import defer
-from PyQt4 import QtGui
+from PyQt4 import QtGui, QtCore
 
 from ubuntu_sso import networkstate
 from ubuntu_sso.logger import setup_logging
@@ -51,6 +51,7 @@
     """Widget to show if we don't detect a network connection."""
 
     ui_class = network_detection_ui.Ui_Form
+    connectionDetected = QtCore.pyqtSignal()
 
     def __init__(self, *args, **kwargs):
         super(NetworkDetectionPage, self).__init__(*args, **kwargs)
@@ -64,7 +65,7 @@
     def initializePage(self):
         """Set UI details."""
         logger.debug('initializePage - About to show NetworkDetectionPage')
-        self.wizard()._next_id = None
+        self.wizard()._next_id = -1
 
         self.setButtonText(QtGui.QWizard.CustomButton1, TRY_AGAIN_BUTTON)
         self.setButtonText(QtGui.QWizard.CancelButton,
@@ -94,9 +95,7 @@
         if button_id == QtGui.QWizard.CustomButton1:
             d = yield networkstate.is_machine_connected()
             if d:
-                self.wizard()._next_id = self.wizard().SIGN_IN_PAGE_ID
-                self.wizard().next()
-                self.wizard()._next_id = None
+                self.connectionDetected.emit()
 
     def _set_translated_strings(self):
         """Implement in each child."""

=== modified file 'ubuntu_sso/qt/tests/test_network_detection.py'
--- ubuntu_sso/qt/tests/test_network_detection.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/tests/test_network_detection.py	2012-05-11 18:39:19 +0000
@@ -32,6 +32,7 @@
 
 from ubuntu_sso.qt import network_detection_page
 from ubuntu_sso.qt.tests import (
+    FakeSignal,
     PageBaseTestCase,
     FakeWizardButtonStyle,
 )
@@ -50,7 +51,7 @@
     def test_initialize_page(self):
         """Check Network detection initialize page."""
         self.ui.initializePage()
-        self.assertEqual(self.wizard._next_id, None)
+        self.assertEqual(self.wizard._next_id, -1)
         self.assertTrue(('setButtonLayout', ([
             QtGui.QWizard.Stretch,
             QtGui.QWizard.CustomButton1,
@@ -66,20 +67,18 @@
         """Check try again method with connection."""
         self.patch(network_detection_page.networkstate, 'is_machine_connected',
             lambda: True)
-        self.wizard._next_id = -1
-        if 'next' in self.wizard.data:
-            self.wizard.data.pop('next')
+        fake_signal = FakeSignal()
+        fake_signal.target = self._set_called
+        self.patch(self.ui, 'connectionDetected', fake_signal)
         self.ui.try_again()
-        self.assertEqual(self.wizard._next_id, None)
-        self.assertTrue(self.wizard.data.get('next', False))
+        self.assertEqual(self._called, ((), {}))
 
     def test_try_again_without_connection(self):
         """Check try again method without connection."""
         self.patch(network_detection_page.networkstate, 'is_machine_connected',
             lambda: False)
-        self.wizard._next_id = -1
-        if 'next' in self.wizard.data:
-            self.wizard.data.pop('next')
+        fake_signal = FakeSignal()
+        fake_signal.target = self._set_called
+        self.patch(self.ui, 'connectionDetected', fake_signal)
         self.ui.try_again()
-        self.assertEqual(self.wizard._next_id, -1)
-        self.assertFalse(self.wizard.data.get('next', False))
+        self.assertFalse(self._called)

=== modified file 'ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py'
--- ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py	2012-05-11 18:39:19 +0000
@@ -56,6 +56,8 @@
 
     @defer.inlineCallbacks
     def setUp(self):
+        self.patch(ubuntu_sso_wizard.networkstate, 'is_machine_connected',
+            lambda: True)
         yield super(UbuntuSSOClientGUITestCase, self).setUp()
         self.patch(ubuntu_sso_wizard.sys, 'exit', self._set_called)
 
@@ -119,6 +121,8 @@
 
     @defer.inlineCallbacks
     def setUp(self):
+        self.patch(ubuntu_sso_wizard.networkstate, 'is_machine_connected',
+            lambda: True)
         self.patch(ubuntu_sso_wizard, 'LoadingOverlay', FakeOverlay)
         yield super(UbuntuSSOWizardTestCase, self).setUp()
 
@@ -183,8 +187,24 @@
 
     def test_email_verification_page_params_from_setup(self):
         """Tests that email_verification_page receives the proper params."""
+        self.ui._next_id = self.ui.setup_account_page_id
+        self.ui.next()
         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)
+
+    def test_check_network_connection(self):
+        """Test that _connection_detected is executed with connection."""
+        self.patch(self.ui, "_connection_detected", self._set_called)
+        self.ui.check_network_connection()
+        self.assertEqual(self._called, ((), {}))
+
+    def test_check_network_connection_without_connection(self):
+        """Test that _connection_detected is executed without connection."""
+        self.patch(self.ui, "_connection_detected", self._set_called)
+        self.patch(ubuntu_sso_wizard.networkstate, 'is_machine_connected',
+            lambda: False)
+        self.ui.check_network_connection()
+        self.assertFalse(self._called)

=== modified file 'ubuntu_sso/qt/ubuntu_sso_wizard.py'
--- ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-05-11 18:39:19 +0000
@@ -36,8 +36,10 @@
     QVBoxLayout,
     QWizard,
 )
+from twisted.internet import defer
 
 from ubuntu_sso import (
+    networkstate,
     USER_CANCELLATION,
     USER_SUCCESS,
 )
@@ -48,6 +50,7 @@
 from ubuntu_sso.qt.error_page import ErrorPage
 from ubuntu_sso.qt.forgotten_password_page import ForgottenPasswordPage
 from ubuntu_sso.qt.loadingoverlay import LoadingOverlay
+from ubuntu_sso.qt.network_detection_page import NetworkDetectionPage
 from ubuntu_sso.qt.reset_password_page import ResetPasswordPage
 from ubuntu_sso.qt.setup_account_page import SetupAccountPage
 from ubuntu_sso.qt.success_page import SuccessPage
@@ -87,6 +90,10 @@
         kwargs['app_name'] = self.app_name
         kwargs['parent'] = self
 
+        self.network_page = NetworkDetectionPage(self.app_name)
+        self.network_page.connectionDetected.connect(self._connection_detected)
+        self.addPage(self.network_page)
+
         # set the diff pages of the QWizard
         if not self.login_only:
             self.setup_account = SetupAccountPage(**kwargs)
@@ -136,8 +143,29 @@
         self.setMinimumSize(PREFERED_UI_SIZE['width'],
             PREFERED_UI_SIZE['height'])
 
+    @defer.inlineCallbacks
+    def check_network_connection(self):
+        """Check if the NetworkDetectionPage is needed to be shown."""
+        d = yield networkstate.is_machine_connected()
+        if d:
+            self._connection_detected()
+
+    def _connection_detected(self):
+        """Connection restablished, move to the proper page."""
+        if self.login_only:
+            self._next_id = self.current_user_page_id
+        else:
+            self._next_id = self.setup_account_page_id
+        self.next()
+        self._next_id = -1
+
     # pylint: disable=C0103
 
+    def showEvent(self, event):
+        """Check the network connection before the ui is shown."""
+        super(UbuntuSSOWizard, self).showEvent(event)
+        self.check_network_connection()
+
     def nextId(self):
         """Return the id of the next page."""
         return self._next_id