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

[Diego Sarmentero]

- Executing hide_error when the user click the refresh captcha link, not inside of the _refresh_captcha method, because this is executed automatically when a captcha error is generated, so we will always miss the error message (LP: #955010).

[Roberto Alsina (ralsina)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

Branch looks great!

Can you please tweak the test to be:

    def test_hide_error_on_refresh_clicked(self):
        """Hide form errors when the user click to refresh the captcha."""
        self.ui.show_error('error')
        self.assert_error_correct(self.ui.form_errors_label, 'error', max_width=self.ui.header.max_title_width)

        self.ui.ui.refresh_label.linkActivated.emit('error')

        self.assert_error_correct(self.ui.form_errors_label, ' ', max_width=self.ui.header.max_title_width)

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'ubuntu_sso/qt/setup_account_page.py'
--- ubuntu_sso/qt/setup_account_page.py	2012-03-14 13:08:53 +0000
+++ ubuntu_sso/qt/setup_account_page.py	2012-03-15 13:24:55 +0000
@@ -233,6 +233,7 @@
                                                  self.ui.password_assistance,
                                                  common.NORMAL))
 
+        self.ui.refresh_label.linkActivated.connect(self.hide_error)
         self.ui.refresh_label.linkActivated.connect(lambda url: \
                                           self._refresh_captcha())
         # We need to check if we enable the button on many signals
@@ -275,7 +276,6 @@
     def _refresh_captcha(self):
         """Refresh the captcha image shown in the ui."""
         logger.debug('SetUpAccountPage._refresh_captcha')
-        self.hide_error()
         # lets clean behind us, do we have the old file arround?
         if self.captcha_file and os.path.exists(self.captcha_file):
             os.unlink(self.captcha_file)

=== modified file 'ubuntu_sso/qt/tests/test_setup_account.py'
--- ubuntu_sso/qt/tests/test_setup_account.py	2012-03-14 12:16:06 +0000
+++ ubuntu_sso/qt/tests/test_setup_account.py	2012-03-15 13:24:55 +0000
@@ -47,6 +47,17 @@
         self.assert_error_correct(self.ui.ui.name_assistance, gui.EMPTY_NAME,
                                   max_width=self.ui.header.max_title_width)
 
+    def test_hide_error_on_refresh_clicked(self):
+        """Hide form errors when the user click to refresh the captcha."""
+        self.ui.show_error('error')
+        self.assert_error_correct(self.ui.form_errors_label, 'error',
+            max_width=self.ui.header.max_title_width)
+
+        self.ui.ui.refresh_label.linkActivated.emit('error')
+
+        message = unicode(self.ui.form_errors_label.text())
+        self.assertEqual(message, ' ')
+
     def test_enable_setup_button_with_visible_check(self):
         """Test _enable_setup_button method with terms check visible."""
         self.patch(self.ui, "set_up_button", QtGui.QPushButton())