Merge lp:~nataliabidart/ubuntu-sso-client/fix-960657-stable-3-0 into lp:ubuntu-sso-client/stable-3-0

[Natalia Bidart]

- When validating the registration screen (in the GTK+ UI), do not force
  accepting the T&C if the tc_url is not defined (LP: #960657).
- Added more logging entries to the registration screen (GTK+ UI) validation
  process.

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'ubuntu_sso/gtk/gui.py'
--- ubuntu_sso/gtk/gui.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/gtk/gui.py	2012-04-11 17:16:14 +0000
@@ -539,11 +539,12 @@
 
         msg = YES_TO_UPDATES % {'app_name': self.app_name}
         self.yes_to_updates_checkbutton.set_label(msg)
-        if self.tc_url:
-            msg = YES_TO_TC % {'app_name': self.app_name}
-            self.yes_to_tc_checkbutton.set_label(msg)
-            self.tc_button.set_label(TC_BUTTON)
-        else:
+
+        msg = YES_TO_TC % {'app_name': self.app_name}
+        self.yes_to_tc_checkbutton.set_label(msg)
+        self.tc_button.set_label(TC_BUTTON)
+
+        if not self.tc_url:
             self.tc_vbox.hide()
         self.login_button.set_label(LOGIN_BUTTON_LABEL)
 
@@ -741,6 +742,7 @@
         name = self.name_entry.get_text()
         if not name:
             self.name_entry.set_warning(FIELD_REQUIRED)
+            logger.warning('on_join_ok_button_clicked: name not set.')
             error = True
 
         # check email
@@ -750,6 +752,7 @@
         if msg is not None:
             self.email1_entry.set_warning(msg)
             self.email2_entry.set_warning(msg)
+            logger.warning('on_join_ok_button_clicked: email is not valid.')
             error = True
 
         # check password
@@ -759,22 +762,30 @@
         if msg is not None:
             self.password1_entry.set_warning(msg)
             self.password2_entry.set_warning(msg)
+            logger.warning('on_join_ok_button_clicked: password is not valid.')
             error = True
 
         # check T&C
-        if not self.yes_to_tc_checkbutton.get_active():
+        if self.tc_url and not self.yes_to_tc_checkbutton.get_active():
             self._set_warning_message(self.tc_warning_label,
                 TC_NOT_ACCEPTED % {'app_name': self.app_name})
+            logger.warning('on_join_ok_button_clicked: terms and conditions '
+                           'not accepted.')
             error = True
 
         captcha_solution = self.captcha_solution_entry.get_text()
         if not captcha_solution:
             self.captcha_solution_entry.set_warning(FIELD_REQUIRED)
+            logger.warning('on_join_ok_button_clicked: captcha solution not '
+                           'set.')
             error = True
 
         if error:
+            logger.warning('on_join_ok_button_clicked: validation failed.')
             return
 
+        logger.info('on_join_ok_button_clicked: validation success!')
+
         self._set_current_page(self.processing_vbox)
         self.user_email = email1
         self.user_password = password1

=== modified file 'ubuntu_sso/gtk/tests/test_gui.py'
--- ubuntu_sso/gtk/tests/test_gui.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/gtk/tests/test_gui.py	2012-04-11 17:16:14 +0000
@@ -473,8 +473,9 @@
         # match passwords
         self.ui.password1_entry.set_text(PASSWORD)
         self.ui.password2_entry.set_text(PASSWORD)
-        # agree to TC
-        self.ui.yes_to_tc_checkbutton.set_active(True)
+        if self.ui.tc_url:
+            # agree to TC, only if the tc_url is defined, so we catch errors
+            self.ui.yes_to_tc_checkbutton.set_active(True)
         # resolve captcha properly
         self.ui.captcha_solution_entry.set_text(CAPTCHA_SOLUTION)
 
@@ -694,15 +695,15 @@
         self.assertEqual(expected, actual,
                          msg % ('yes_to_tc_checkbutton', expected, actual))
 
-    def test_checkbutton_is_checked_at_startup(self):
-        """Checkbuttons are checked by default."""
+    def test_updates_checkbutton_is_checked_at_startup(self):
+        """The 'yes to updates' checkbutton is checked by default."""
         msg = '%r is checked by default.'
         name = 'yes_to_updates_checkbutton'
         widget = getattr(self.ui, name)
         self.assertTrue(widget.get_active(), msg % name)
 
-    def test_checkbutton_isnt_checked_at_startup(self):
-        """Checkbuttons are checked by default."""
+    def test_tc_checkbutton_is_not_checked_at_startup(self):
+        """The 'yes to T&C' checkbutton is not checked by default."""
         msg = '%r is checked by default.'
         name = 'yes_to_tc_checkbutton'
         widget = getattr(self.ui, name)
@@ -887,26 +888,22 @@
         self.ui.on_captcha_generated(app_name=APP_NAME, captcha_id=CAPTCHA_ID)
         self.assertEqual(self.ui.warning_label.get_text().decode('utf8'), '')
 
-
-class NoTermsAndConditionsTestCase(UbuntuSSOClientTestCase):
+    def test_has_tc_link(self):
+        """The T&C button and checkbox are shown if the link is provided"""
+        self.assertEqual(self.ui.tc_button.get_visible(), True)
+        self.assertEqual(self.ui.yes_to_tc_checkbutton.get_visible(), True)
+
+
+class NoTermsAndConditionsTestCase(EnterDetailsTestCase):
     """Test suite for the user registration (with no t&c link)."""
 
     kwargs = dict(app_name=APP_NAME, tc_url='', help_text=HELP_TEXT)
 
-    def test_no_tc_link(self):
+    def test_has_tc_link(self):
         """The T&C button and checkbox are not shown if no link is provided"""
         self.assertEqual(self.ui.tc_vbox.get_visible(), False)
 
 
-class TermsAndConditionsTestCase(UbuntuSSOClientTestCase):
-    """Test suite for the user registration (terms & conditions page)."""
-
-    def test_has_tc_link(self):
-        """The T&C button and checkbox are shown if the link is provided"""
-        self.assertEqual(self.ui.tc_button.get_visible(), True)
-        self.assertEqual(self.ui.yes_to_tc_checkbutton.get_visible(), True)
-
-
 class TermsAndConditionsBrowserTestCase(UbuntuSSOClientTestCase):
     """Test suite for the terms & conditions browser."""