Merge lp:~diegosarmentero/ubuntuone-windows-installer/captcha-refresh into lp:ubuntuone-windows-installer

[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)]

Lint issues:

ubuntuone_installer/gui/qt/gui.py:
    88: [C0301] Line too long (88/79)

ubuntuone_installer/gui/qt/main/tests/test_windows.py:
    89: [W0621, CredsFailureMainTestCase.check_updates] Redefining name 'gui' from outer scope (line 24)

ubuntuone_installer/gui/qt/tests/test_gui.py:
    707: [C0301] Line too long (85/79)

review: Approve

[lp:~diegosarmentero/ubuntuone-windows-installer/captcha-refresh]

74. By Diego Sarmentero on 2011-09-26

Fixed lint issues.

[Natalia Bidart (nataliabidart)]

I'm now getting all these PEP8 issues:

./ubuntuone_installer/gui/qt/main/windows.py:47:1: E302 expected 2 blank lines, found 1
./ubuntuone_installer/gui/qt/main/windows.py:87:1: E302 expected 2 blank lines, found 1
./ubuntuone_installer/gui/qt/main/windows.py:93:66: W291 trailing whitespace
./ubuntuone_installer/gui/qt/utils/__init__.py:39:56: W291 trailing whitespace
./ubuntuone_installer/gui/qt/utils/__init__.py:40:50: W291 trailing whitespace
./ubuntuone_installer/gui/qt/utils/windows.py:34:51: W291 trailing whitespace
./ubuntuone_installer/gui/qt/utils/tests/test_windows.py:250:1: W291 trailing whitespace
./ubuntuone_installer/gui/qt/utils/tests/test_windows.py:273:26: E231 missing whitespace after ':'
./ubuntuone_installer/gui/qt/utils/tests/test_windows.py:276:5: E303 too many blank lines (2)
./ubuntuone_installer/gui/qt/utils/tests/test_windows.py:280:63: W291 trailing whitespace
./ubuntuone_installer/gui/qt/utils/tests/test_windows.py:291:5: E303 too many blank lines (2)
./ubuntuone_installer/gui/qt/utils/tests/test_windows.py:296:72: W291 trailing whitespace
./ubuntuone_installer/gui/qt/utils/tests/test_windows.py:316:1: W391 blank line at end of file

Seems like last week several errors were added to the repo.

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

Can you please add those, even those are not added by your branch?

Thanks!

[Diego Sarmentero (diegosarmentero)]

> Can you please add those, even those are not added by your branch?
>
> Thanks!

Yes, no problem!

[lp:~diegosarmentero/ubuntuone-windows-installer/captcha-refresh]

75. By Diego Sarmentero on 2011-09-27

Fixed PEP8 issues.

76. By Diego Sarmentero on 2011-09-27

Added bug number.

77. By Diego Sarmentero on 2011-09-27

Fixed PEP8 issues.

[Natalia Bidart (nataliabidart)]

Looks good!

One thing to fix:

10:30:55 AM) nessita: gatox: and what I see is that as soon as I open the installer, the overlay is shown, even if I did not click on register
(10:31:18 AM) nessita: gatox: that should not be there: the loading overlay shoul only be shown in the register screen (when loading captcha)
(10:31:41 AM) ralsina: that's because we are loading the captcha in __init__
(10:31:47 AM) ralsina: and we should load it in initializePage
(10:31:57 AM) ralsina: that's a sso fix

(10:32:19 AM) nessita: gatox: open the installer with your captcha branch, having the sso captcha branch in the PYTHONPATH
(10:32:34 AM) nessita: gatox: you will get the overlay in the first screen of the installer

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/captcha-refresh]

78. By Diego Sarmentero on 2011-09-28

Fixed overlay to only show if the captcha has not been received and the user reach the setup account page.

[Roberto Alsina (ralsina)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-09-22 19:05:56 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-09-28 17:34:23 +0000
@@ -85,7 +85,8 @@
 SKIP_TOUR = _("Skip tour, go to Dashboard")
 START_SETUP = _("Start setup")
 UPDATE_TITLE = _("Updates are available")
-UPDATE_SOFTWARE = _("There is a new version available. Do you want perform an upgrade?")
+UPDATE_SOFTWARE = _("There is a new version available. "
+                    "Do you want perform an upgrade?")
 # Invalid name logger
 # pylint: disable=C0103
 logger = setup_logging('qt.gui')
 
=== modified file 'ubuntuone_installer/gui/qt/main/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/main/tests/test_windows.py	2011-09-22 19:05:56 +0000
+++ ubuntuone_installer/gui/qt/main/tests/test_windows.py	2011-09-28 17:34:23 +0000
@@ -86,7 +86,7 @@
         """A fake stop."""
         self.stopped = True
 
-    def check_updates(self, gui, logger):
+    def check_updates(self, gui_ref, logger):
         """A fake check updates."""
         self.updates_checked = True
 
 
=== modified file 'ubuntuone_installer/gui/qt/main/windows.py'
--- ubuntuone_installer/gui/qt/main/windows.py	2011-09-22 19:40:28 +0000
+++ ubuntuone_installer/gui/qt/main/windows.py	2011-09-28 17:34:23 +0000
@@ -44,6 +44,7 @@
     'Error while getting the credentials: %r', exc)
     stop()
 
+
 @defer.inlineCallbacks
 def success_cb(creds, gui, installing, logger):
     """Handle credentials success."""
@@ -84,13 +85,14 @@
     else:
         yield success_cb(creds, gui, installer, logger)
 
+
 @defer.inlineCallbacks
 def check_updates(gui, logger):
     """Check for updates."""
     logger.info('Checking for updates.')
     # the idea is simple, check if there are updates, ask user if we perform
     # the update and continue.
-    are_updates_present = yield utils.are_updates_present(logger) 
+    are_updates_present = yield utils.are_updates_present(logger)
     logger.debug('Updates present: %r', are_updates_present)
     if are_updates_present:
         logger.info('Updates are present.')
 
=== modified file 'ubuntuone_installer/gui/qt/setup_account.py'
--- ubuntuone_installer/gui/qt/setup_account.py	2011-09-16 18:01:37 +0000
+++ ubuntuone_installer/gui/qt/setup_account.py	2011-09-28 17:34:23 +0000
@@ -70,6 +70,7 @@
         self.ui.hlayout_check.addWidget(self.terms_checkbox)
 
         self.set_up_button = None
+        self.captcha_received = False
 
     # Invalid name "initializePage"
     # pylint: disable=C0103
@@ -183,6 +184,8 @@
             QtCore.SIGNAL("focusChanged(QWidget*, QWidget*)"),
             self.focus_changed)
         super(SetupAccountPage, self).showEvent(event)
+        if not self.captcha_received:
+            self.wizard().overlay.show()
 
     def hideEvent(self, event):
         """Disconnect the focusChanged signal when the page change."""
@@ -196,6 +199,17 @@
             pass
         super(SetupAccountPage, self).hideEvent(event)
 
+    def on_captcha_refreshing(self):
+        """Show overlay when captcha is refreshing."""
+        if self.isVisible():
+            self.wizard().overlay.show()
+        self.captcha_received = False
+
+    def on_captcha_refresh_complete(self):
+        """Hide overlay when captcha finished refreshing."""
+        self.wizard().overlay.hide()
+        self.captcha_received = True
+
 
 def is_min_required_password(password):
     """Return if the password meets the minimum requirements."""
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-22 19:05:56 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-28 17:34:23 +0000
@@ -664,6 +664,7 @@
          QtGui.QWizard.FinishButton,
          QtGui.QWizard.NextButton])
 
+
 class UpgradeQuestion(BaseTestCase):
     """Test the dialog that ask the user if he wants to upgrade."""
 
@@ -672,7 +673,7 @@
         """Set the tests."""
         yield super(UpgradeQuestion, self).setUp()
         self.answer = 0
-        self.parent = None 
+        self.parent = None
         self.title = None
         self.text = None
         self.yes_button = None
@@ -704,7 +705,8 @@
     def user_wants_to_update_false(self):
         """Test the question."""
         self.answer = gui.QtGui.QMessageBox.No
-        self.assertFalse(gui.user_wants_to_update(), 'User DOES NOT want to update.')
+        self.assertFalse(gui.user_wants_to_update(),
+            'User DOES NOT want to update.')
         # lets assert the parameters
         self.assertTrue(None, self.parent)
         self.assertTrue(self.title, gui.UPDATE_TITLE)
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_setup_account.py'
--- ubuntuone_installer/gui/qt/tests/test_setup_account.py	2011-09-19 15:41:40 +0000
+++ ubuntuone_installer/gui/qt/tests/test_setup_account.py	2011-09-28 17:34:23 +0000
@@ -165,6 +165,8 @@
                         self.ui.set_up_button)
         self.assertFalse(self.ui.set_up_button.isEnabled())
 
+        self.assertFalse(self.ui.captcha_received)
+
         # labels
         self.assertEqual(self.ui.ui.name_label.text(), gui.NAME)
         self.assertEqual(self.ui.ui.email_label.text(), gui.EMAIL)
@@ -187,6 +189,7 @@
         """Validation and overlay is shown when the setupbutton is clicked."""
         self.patch(self.ui.controller, 'set_next_validation', self._set_called)
         self.ui.initializePage()
+        self.ui.captcha_received = True
         self.ui.show()
         self.addCleanup(self.ui.hide)
 
@@ -307,3 +310,21 @@
         """Check that show_event works when set_up_button is none."""
         self.assertEqual(self.ui.set_up_button, None)
         self.ui.showEvent(QtGui.QShowEvent())
+
+    def test_on_captcha_refreshing(self):
+        """Check the state of the overlay on captcha refreshing."""
+        self.assertEqual(self.ui.wizard().overlay.show_counter, 0)
+        self.ui.on_captcha_refreshing()
+        self.assertEqual(self.ui.wizard().overlay.show_counter, 0)
+        self.ui.captcha_received = True
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.assertEqual(self.ui.wizard().overlay.show_counter, 0)
+        self.ui.on_captcha_refreshing()
+        self.assertEqual(self.ui.wizard().overlay.show_counter, 1)
+
+    def test_on_captcha_refresh_complete(self):
+        """Check the state of the overlay on captcha refreshing complete."""
+        self.assertEqual(self.ui.wizard().overlay.hide_counter, 0)
+        self.ui.on_captcha_refresh_complete()
+        self.assertEqual(self.ui.wizard().overlay.hide_counter, 1)
 
=== modified file 'ubuntuone_installer/gui/qt/utils/__init__.py'
--- ubuntuone_installer/gui/qt/utils/__init__.py	2011-09-19 15:14:38 +0000
+++ ubuntuone_installer/gui/qt/utils/__init__.py	2011-09-28 17:34:23 +0000
@@ -36,5 +36,5 @@
     start_control_panel = linux.start_control_panel
     add_syncdaemon_to_autostart = linux.add_syncdaemon_to_autostart
     default_folders = linux.default_folders
-    are_updates_present = lambda *args, **kwargs: False 
-    perform_update = lambda *args, **kwargs: None 
+    are_updates_present = lambda *args, **kwargs: False
+    perform_update = lambda *args, **kwargs: None
 
=== modified file 'ubuntuone_installer/gui/qt/utils/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-09-22 19:40:28 +0000
+++ ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-09-28 17:34:23 +0000
@@ -196,7 +196,7 @@
         self.assertEqual(self.registry.set_args,
              [(('KEY', 'Ubuntu One', 0, 1,
              'C:\\Python27\\ubuntuone-syncdaemon.exe'), {}),
-             (('KEY',  'Ubuntu One Icon', 0, 1,
+             (('KEY', 'Ubuntu One Icon', 0, 1,
              'C:\\Python27\\ubuntuone-control-panel-qt.exe --minimized'),
              {})])
 
@@ -247,7 +247,7 @@
     def debug(self, message, *args, **kwargs):
         """Set a debug log message."""
         self.called_methods.append(('debug', message, args, kwargs))
-       
+
 
 class AutoupdaterTestCase(BaseTestCase):
     """Test the code that is used for the auto update process."""
@@ -270,14 +270,13 @@
         self.fake_logger = FakeLogger()
         self.patch(utils.windows, 'getProcessValue', fake_execute_process)
         self.patch(utils.windows, '_get_update_path',
-                   lambda:self.auto_update_path)
-
+                   lambda: self.auto_update_path)
 
     @defer.inlineCallbacks
     def test_are_updates_present_true(self):
         """Test when updates are present."""
         # the idea is simple, set the value to be returned from
-        # the fake call, assert that we get true and also that 
+        # the fake call, assert that we get true and also that
         # we did use the correct parameters.
         self.return_from_call = 0
         are_present = yield utils.are_updates_present(self.fake_logger)
@@ -287,13 +286,12 @@
         self.assertEqual(expected_args, self.args)
         self.assertEqual(self.command, self.auto_update_path)
 
-
     @defer.inlineCallbacks
     def test_are_updates_present_false(self):
         """Test when updates are not present."""
         # similar to test_are_updates_present_true but with diff retcode
         self.return_from_call = 40
-        are_present = yield utils.are_updates_present(self.fake_logger) 
+        are_present = yield utils.are_updates_present(self.fake_logger)
         self.assertFalse(are_present, 'Updates should NOT be present.')
         # lets assert that we did use the correct args
         expected_args = ('--mode', 'unattended')
@@ -312,5 +310,3 @@
 
     def test_get_auto_update_path(self):
         """Test the method used to get the autoupdate."""
-
-
 
=== modified file 'ubuntuone_installer/gui/qt/utils/windows.py'
--- ubuntuone_installer/gui/qt/utils/windows.py	2011-09-22 19:40:28 +0000
+++ ubuntuone_installer/gui/qt/utils/windows.py	2011-09-28 17:34:23 +0000
@@ -31,7 +31,7 @@
 # pylint: enable=F0401
 
 from twisted.internet import defer
-from twisted.internet.utils import getProcessValue 
+from twisted.internet.utils import getProcessValue
 
 AUTORUN_KEY = r"Software\Microsoft\Windows\CurrentVersion\Run"