Merge lp:~diegosarmentero/ubuntu-sso-client/fix805460 into lp:ubuntu-sso-client

[Diego Sarmentero]

Adding message box when the email is not valid.

Adding message box when the email is not valid.

[Ubuntu One Auto Pilot (otto-pilot)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Pending.

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntu_sso/qt/controllers.py'
--- ubuntu_sso/qt/controllers.py	2011-07-27 19:20:57 +0000
+++ ubuntu_sso/qt/controllers.py	2011-07-28 20:41:44 +0000
@@ -482,6 +482,13 @@
 class EmailVerificationController(BackendController):
     """Controller used for the verification page."""
 
+    def __init__(self, message_box=None):
+        """Create a new instance."""
+        super(EmailVerificationController, self).__init__()
+        if message_box is None:
+            message_box = QMessageBox
+        self.message_box = message_box
+
     def _set_translated_strings(self):
         """Set the trnaslated strings."""
         logger.debug('EmailVerificationController._set_translated_strings')
@@ -540,9 +547,12 @@
         email = self.view.wizard().field('email_address').toString()
         self.view.wizard().registrationSuccess.emit(app_name, email)
 
-    def on_email_validation_error(self, app_name, raised_error):
+    def on_email_validation_error(self, app_name, error):
         """Signal thrown when there's a problem validating the email."""
-        pass
+        msg = error.get('email_token')
+        if msg is None:
+            msg = '\n'.join([v for _, v in sorted(error.iteritems())])
+        self.message_box.critical(self.view, app_name, msg)
 
     #pylint: disable=C0103
     def pageInitialized(self):

=== modified file 'ubuntu_sso/qt/tests/test_windows.py'
--- ubuntu_sso/qt/tests/test_windows.py	2011-07-06 16:39:03 +0000
+++ ubuntu_sso/qt/tests/test_windows.py	2011-07-28 20:41:44 +0000
@@ -499,7 +499,8 @@
         super(EmailVerificationControllerTestCase, self).setUp()
         self.view = self.mocker.mock()
         self.backend = self.mocker.mock()
-        self.controller = EmailVerificationController()
+        self.controller = EmailVerificationController(
+            message_box=self.mocker.mock())
         self.controller.view = self.view
         self.controller.backend = self.backend
 
@@ -550,6 +551,28 @@
         self.controller.validate_email()
 
 
+class EmailVerificationControllerTestCase2(TestCase):
+    """Tests for EmailVerificationController, but without Mocker"""
+
+    def setUp(self):
+        super(EmailVerificationControllerTestCase2, self).setUp()
+        self.message_box = FakeMessageBox()
+        self.controller = EmailVerificationController(
+            message_box=self.message_box)
+        self.patch(self.controller, 'view', FakeView())
+        self._called = False
+
+    def test_on_email_validation_error(self):
+        """Test that on_email_validation_error callback works as expected."""
+        error = dict(errtype='BadTokenError')
+        app_name = 'app_name'
+        self.controller.on_email_validation_error(app_name, error)
+        self.assertEqual(self.message_box.critical_args, ((
+            self.controller.view,
+            app_name,
+            'BadTokenError'), {}))
+
+
 class ErrorControllerTestCase(MockerTestCase):
     """Test the success page controller."""