Merge lp:~diegosarmentero/ubuntu-sso-client/ensure-overlay into lp:ubuntu-sso-client

[Diego Sarmentero]

- Fixed: Qt UI: there is not loading overvaly while validating an email address
  (LP: #944767).

[lp:~diegosarmentero/ubuntu-sso-client/ensure-overlay]

896. By Diego Sarmentero on 2012-03-02

adding hide_overlay when the process ends.

[Roberto Alsina (ralsina)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

Looks and works good!

review: Approve

=== modified file 'ubuntu_sso/qt/email_verification_page.py'
--- ubuntu_sso/qt/email_verification_page.py	2012-03-01 20:46:34 +0000
+++ ubuntu_sso/qt/email_verification_page.py	2012-03-02 18:40:22 +0000
@@ -107,6 +107,7 @@
         code = unicode(self.ui.verification_code_edit.text())
         args = (self.app_name, self.email, self.password, code)
         self.hide_error()
+        self.show_overlay()
         if self.ping_url:
             f = self.backend.validate_email_and_ping
             args = args + (self.ping_url,)
@@ -123,10 +124,12 @@
     def on_email_validated(self, app_name, *args, **kwargs):
         """Signal thrown after the email is validated."""
         logger.info('EmailVerificationController.on_email_validated')
+        self.hide_overlay()
         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."""
+        self.hide_overlay()
         msg = error.pop(ERROR_EMAIL_TOKEN, '')
         msg += build_general_error_message(error)
         self.show_error(self.app_name, msg)

=== modified file 'ubuntu_sso/qt/tests/test_email_verification.py'
--- ubuntu_sso/qt/tests/test_email_verification.py	2012-03-01 20:46:34 +0000
+++ ubuntu_sso/qt/tests/test_email_verification.py	2012-03-02 18:40:22 +0000
@@ -20,7 +20,7 @@
 
 from ubuntu_sso.qt import email_verification_page
 from ubuntu_sso.qt.tests import (
-    BaseTestCase,
+    BaseTestCasePage,
     FakePageUiStyle,
 )
 
@@ -28,7 +28,7 @@
 # pylint: disable=W0212
 
 
-class EmailVerificationTestCase(BaseTestCase):
+class EmailVerificationTestCase(BaseTestCasePage):
     """Test the SetupAccountPage code."""
 
     ui_class = email_verification_page.EmailVerificationPage
@@ -105,6 +105,7 @@
         self.ui.on_email_validation_error(app_name, error)
         expected = ((self.ui, app_name, ''), {})
         self.assertTrue(expected, self._called)
+        self.assertEqual(self._overlay_hide_counter, 1)
 
     def test_on_email_validated(self):
         """Test the on_email_validated method."""
@@ -119,6 +120,7 @@
         self.ui.registrationSuccess.connect(slot)
         self.ui.on_email_validated(app_name)
         self.assertIn((app_name, email), self.signals_results)
+        self.assertEqual(self._overlay_hide_counter, 1)
 
     def test_validate_email_with_ping(self):
         """Test the login method."""
@@ -136,6 +138,7 @@
             self.app_name, email, password, code, self.ping_url)
         expected = ((), {})
         self.assertEqual(expected, self._called)
+        self.assertEqual(self._overlay_show_counter, 1)
 
     def test_validate_email_without_ping(self):
         """Test the login method."""
@@ -154,3 +157,4 @@
             self.app_name, email, password, code)
         expected = ((), {})
         self.assertEqual(expected, self._called)
+        self.assertEqual(self._overlay_show_counter, 1)