Merge lp:~diegosarmentero/ubuntu-sso-client/captcha-qt-not-working into lp:ubuntu-sso-client

[Diego Sarmentero]

- Fixed: Captcha is failing for the Qt UI (LP: #933679).

[Natalia Bidart (nataliabidart)]

Looks good, though I found bug #934502 to be addressed next week.

review: Approve

=== modified file 'ubuntu_sso/qt/setup_account_page.py'
--- ubuntu_sso/qt/setup_account_page.py	2012-02-15 17:33:40 +0000
+++ ubuntu_sso/qt/setup_account_page.py	2012-02-17 17:24:27 +0000
@@ -125,8 +125,8 @@
                         privacy_policy=privacy_policy_link)
 
         self.terms_checkbox = enhanced_check_box.EnhancedCheckBox(terms)
+        self.ui.hlayout_check.addWidget(self.terms_checkbox)
         self.terms_checkbox.setVisible(bool(toc_link or policy_link))
-        self.ui.hlayout_check.addWidget(self.terms_checkbox)
 
         self.set_up_button = None
         self.captcha_received = False
@@ -261,7 +261,7 @@
         captcha_solution = unicode(self.ui.captcha_solution_edit.text())
 
         # Check for len(name) > 0 to ensure that a bool is assigned to enabled
-        if self.terms_checkbox.isVisible():
+        if not self.terms_checkbox.isVisible():
             checkbox_terms = True
         else:
             checkbox_terms = self.terms_checkbox.isChecked()
@@ -283,7 +283,7 @@
         # 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)
-        fd = tempfile.TemporaryFile(mode='r')
+        fd = tempfile.NamedTemporaryFile()
         file_name = fd.name
         self.captcha_file = file_name
         args = (self.app_name, file_name)

=== modified file 'ubuntu_sso/qt/tests/test_setup_account.py'
--- ubuntu_sso/qt/tests/test_setup_account.py	2012-02-16 14:37:19 +0000
+++ ubuntu_sso/qt/tests/test_setup_account.py	2012-02-17 17:24:27 +0000
@@ -77,6 +77,41 @@
             setup_account_page.ERROR % setup_account_page.EMPTY_NAME)
         self.ui.hide()
 
+    def test_enable_setup_button_with_visible_check(self):
+        """Test _enable_setup_button method with terms check visible."""
+        self.ui.ui.name_edit.setText('name')
+        email = '[e-mail]'
+        self.ui.ui.email_edit.setText(email)
+        self.ui.ui.confirm_email_edit.setText(email)
+        password = 'T3st3rqwe'
+        self.ui.ui.password_edit.setText(password)
+        self.ui.ui.confirm_password_edit.setText(password)
+        self.ui.ui.captcha_solution_edit.setText('captcha solution')
+        self.ui.terms_checkbox.setChecked(True)
+
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.ui.terms_checkbox.setVisible(True)
+        self.ui.ui.captcha_solution_edit.textEdited.emit('')
+        self.assertTrue(self.ui.set_up_button.isEnabled())
+
+    def test_enable_setup_button_without_visible_check(self):
+        """Test _enable_setup_button method with terms check not visible."""
+        self.ui.ui.name_edit.setText('name')
+        email = '[e-mail]'
+        self.ui.ui.email_edit.setText(email)
+        self.ui.ui.confirm_email_edit.setText(email)
+        password = 'T3st3rqwe'
+        self.ui.ui.password_edit.setText(password)
+        self.ui.ui.confirm_password_edit.setText(password)
+        self.ui.ui.captcha_solution_edit.setText('captcha solution')
+
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.ui.terms_checkbox.setVisible(False)
+        self.ui.ui.captcha_solution_edit.textEdited.emit('')
+        self.assertTrue(self.ui.set_up_button.isEnabled())
+
     def test_password_default_assistance(self):
         """Status when the password line edit receive focus and shows popup.