Merge lp:~diegosarmentero/ubuntu-sso-client/captcha-refresh into lp:ubuntu-sso-client

[Diego Sarmentero]

- Fixed: There is no feedback on captcha loading/refreshing (LP: #852105).

- Fixed: There is no feedback on captcha loading/refreshing (LP: #852105).

[Natalia Bidart (nataliabidart)]

I'm getting this lint issue:

== Python Lint Notices ==

ubuntu_sso/qt/tests/test_controllers.py:
    742: [W0622, FakeSetupAccountView.save] Redefining built-in 'format'

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

I see that you're not testing the captcha_refreshing new call. Can you please add a test for that?

[Natalia Bidart (nataliabidart)]

I see that you're not testing the captcha_refreshing new call. Can you please add a test for that?

[Natalia Bidart (nataliabidart)]

(sorry for the duplicated comment, LP was acting up)

[lp:~diegosarmentero/ubuntu-sso-client/captcha-refresh]

796. By Diego Sarmentero on 2011-09-26

Adding more tests.

[Natalia Bidart (nataliabidart)]

oh no! no again! :-)

ubuntu_sso/qt/tests/test_controllers.py:
    756: [C0103, FakeControllerForCaptcha.addErrback] Invalid name "addErrback" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    758: [W0201, FakeControllerForCaptcha.addErrback] Attribute 'callback_error' defined outside __init__

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-sso-client/captcha-refresh]

797. By Diego Sarmentero on 2011-09-26

lint issues fixed.

798. By Diego Sarmentero on 2011-09-26

lint issues fixed.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[lp:~diegosarmentero/ubuntu-sso-client/captcha-refresh]

799. By Diego Sarmentero on 2011-09-27

Added bug number.

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntu_sso/qt/controllers.py'
--- ubuntu_sso/qt/controllers.py	2011-09-21 21:41:04 +0000
+++ ubuntu_sso/qt/controllers.py	2011-09-27 12:14:24 +0000
@@ -374,6 +374,7 @@
         if old_file:
             d.addCallback(lambda x: os.unlink(old_file))
         d.addErrback(self.on_captcha_generation_error)
+        self.view.on_captcha_refreshing()
 
     def _set_titles(self):
         """Set the diff titles of the view."""
@@ -408,11 +409,13 @@
         pixmap_image = QPixmap()
         pixmap_image.loadFromData(string_io.getvalue())
         self.view.captcha_image = pixmap_image
+        self.view.on_captcha_refresh_complete()
 
     def on_captcha_generation_error(self, error):
         """An error ocurred."""
         logger.debug('SetUpAccountController.on_captcha_generation_error')
         self.message_box.critical(CAPTCHA_LOAD_ERROR, self.view)
+        self.view.on_captcha_refresh_complete()
 
     def on_user_registration_error(self, app_name, error):
         """Let the user know we could not register."""

=== modified file 'ubuntu_sso/qt/tests/test_controllers.py'
--- ubuntu_sso/qt/tests/test_controllers.py	2011-09-21 21:41:04 +0000
+++ ubuntu_sso/qt/tests/test_controllers.py	2011-09-27 12:14:24 +0000
@@ -24,6 +24,13 @@
 from mocker import MATCH, MockerTestCase
 from PyQt4.QtGui import QWizard
 
+# pylint: disable=F0401
+try:
+    from PIL import Image
+except ImportError:
+    import Image
+# pylint: enable=F0401
+
 from ubuntu_sso.qt.controllers import (
     BackendController,
     ChooseSignInController,
@@ -711,6 +718,52 @@
         """Simulate to add the message to the label as SetupAccount do."""
 
 
+class FakeSetupAccountView(FakeView):
+
+    """A Fake view."""
+
+    captcha_file = None
+    captcha_image = None
+    captcha_refresh_executed = False
+    captcha_refreshing_value = False
+
+    def on_captcha_refresh_complete(self):
+        """Fake the call to refresh finished."""
+        self.captcha_refresh_executed = True
+
+    def on_captcha_refreshing(self):
+        """Fake the call to refreshing."""
+        self.captcha_refreshing_value = True
+
+    def fake_open(self, filename):
+        """Fake open for Image."""
+        return self
+
+    # pylint: disable=W0622
+    def save(self, io, format):
+        """Fake save for Image."""
+    # pylint: enable=W0622
+
+
+class FakeControllerForCaptcha(object):
+
+    """Fake controller to test refresh_captcha method."""
+
+    def __init__(self):
+        """Initialize FakeControllerForCaptcha."""
+        self.callback_error = False
+
+    def generate_captcha(self, *args):
+        """Fake generate deferred for captcha."""
+        return self
+
+    # pylint: disable=C0103
+    def addErrback(self, call):
+        """Fake addErrback."""
+        self.callback_error = call is not None
+    # pylint: enable=C0103
+
+
 class FakeEmailVerificationView(FakePageUiStyle):
     """Fake EmailVerification Page."""
 
@@ -721,6 +774,26 @@
         self.next_button = self
 
 
+class SetupAccountControllerCaptchaTest(BaseTestCase):
+    """Tests for SetupAccountController, but without Mocker."""
+
+    def setUp(self):
+        """Set the different tests."""
+        super(SetupAccountControllerCaptchaTest, self).setUp()
+        self.message_box = FakeMessageBox()
+        self.controller = SetUpAccountController(message_box=self.message_box)
+        self.patch(self.controller, 'view', FakeSetupAccountView())
+        self.fake_backend = FakeControllerForCaptcha()
+        self.patch(self.controller, 'backend', self.fake_backend)
+
+    def test_refresh_captcha(self):
+        """Test the Refresh Captcha function."""
+        self.assertFalse(self.controller.view.captcha_refreshing_value)
+        self.controller._refresh_captcha()
+        self.assertTrue(self.controller.view.captcha_refreshing_value)
+        self.assertTrue(self.fake_backend.callback_error)
+
+
 class SetupAccountControllerValidationTest(BaseTestCase):
     """Tests for SetupAccountController, but without Mocker."""
 
@@ -730,7 +803,7 @@
         self.message_box = FakeMessageBox()
         self.controller = SetUpAccountController(message_box=self.message_box)
         self.patch(self.controller, '_refresh_captcha', self._set_called)
-        self.patch(self.controller, 'view', FakeView())
+        self.patch(self.controller, 'view', FakeSetupAccountView())
 
     def test_on_user_registration_refresh_captcha(self):
         """If there is a user reg. error, captcha should refresh."""
@@ -764,6 +837,19 @@
         expected = (('', self.controller.view), {})
         self.assertEqual(self.message_box.critical_args, expected)
 
+    def test_on_captcha_generated(self):
+        """Test if the method that shows the overlay is executed."""
+        self.patch(Image, "open", self.controller.view.fake_open)
+        self.assertFalse(self.controller.view.captcha_refresh_executed)
+        self.controller.on_captcha_generated('app_name', 'captcha_id')
+        self.assertTrue(self.controller.view.captcha_refresh_executed)
+
+    def test_on_captcha_generation_error(self):
+        """Test if the method that hides the overlay is executed."""
+        self.assertFalse(self.controller.view.captcha_refresh_executed)
+        self.controller.on_captcha_generation_error({})
+        self.assertTrue(self.controller.view.captcha_refresh_executed)
+
 
 class EmailVerificationControllerTestCase(MockerTestCase):
     """Test the controller."""