Merge lp:~diegosarmentero/ubuntu-sso-client/clean-form into lp:ubuntu-sso-client

[Diego Sarmentero]

- Hide the errors label on refresh captcha (LP: #947202).

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

=== modified file 'ubuntu_sso/qt/setup_account_page.py'
--- ubuntu_sso/qt/setup_account_page.py	2012-03-02 14:42:06 +0000
+++ ubuntu_sso/qt/setup_account_page.py	2012-03-05 20:01:37 +0000
@@ -278,6 +278,7 @@
     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-02 14:42:06 +0000
+++ ubuntu_sso/qt/tests/test_setup_account.py	2012-03-05 20:01:37 +0000
@@ -389,3 +389,11 @@
         self.ui.on_captcha_refresh_complete()
         self.assertEqual(self._overlay_hide_counter, 1)
         self.assertTrue(self.ui.isEnabled())
+
+    def test_hide_error_on_refresh_captcha(self):
+        """Test that the errors are hidden on refresh captcha."""
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.ui.show_error(self.app_name, 'error-message')
+        self.ui.ui.refresh_label.linkActivated.emit('link')
+        self.assertEqual(self.ui.form_errors_label.text(), ' ')