Merge lp:~nataliabidart/ubuntu-sso-client/verify-works-when-login-only into lp:ubuntu-sso-client/stable-1-0

[Natalia Bidart]

The verify email page should be always built, not only on registration.

To test, run the dbus daemon from this branch with:

killall ubuntu-sso-login; DEBUG=True PYTHONPATH=. ./bin/ubuntu-sso-login

Be sure to have a non-validated SSO user. If you don't have one, first register a new user but do not enter the verification code (just close the SSO window when prompted for email token). After doing this, be sure to kill the dbus daemon and restart it.

Then, execute the 'login_to_get_credentials' method in the ApplicationCredentials interface (dbus address com.ubuntu.sso/credentials) using d-feet. Parameters should be:

'Any app name', '', 0

Try to login with the non validated email address. You should get the email verification screen. If you weren't running this branch, you'd get an exception like this one:

    if current_page.default_widget is not None:
exceptions.AttributeError: 'gtk.VBox' object has no attribute 'default_widget'

[Alejandro J. Cura (alecu)]

Nice!

review: Approve

[John Lenton (chipaca)]

Awesome.

review: Approve

=== modified file 'ubuntu_sso/gui.py'
--- ubuntu_sso/gui.py	2010-11-01 21:01:14 +0000
+++ ubuntu_sso/gui.py	2010-11-03 17:56:49 +0000
@@ -321,13 +321,13 @@
         self._append_page(self._build_login_page())
         self._append_page(self._build_request_password_token_page())
         self._append_page(self._build_set_new_password_page())
+        self._append_page(self._build_verify_email_page())
 
         window_size = None
         if not login_only:
             window_size = (550, 500)
             self._append_page(self._build_enter_details_page())
             self._append_page(self._build_tc_page())
-            self._append_page(self._build_verify_email_page())
             self.login_button.grab_focus()
             self._set_current_page(self.enter_details_vbox)
         else:

=== modified file 'ubuntu_sso/tests/test_gui.py'
--- ubuntu_sso/tests/test_gui.py	2010-11-01 21:01:14 +0000
+++ ubuntu_sso/tests/test_gui.py	2010-11-03 17:56:49 +0000
@@ -1011,6 +1011,17 @@
                           dict(reply_handler=gui.NO_OP,
                                error_handler=gui.NO_OP)))
 
+    def test_on_verify_token_button_clicked(self):
+        """Verify token uses cached user_email and user_password."""
+        self.ui.user_email = '[e-mail]'
+        self.ui.user_password = 'yadda-yedda'
+        self.ui.on_verify_token_button_clicked()
+        self.assertEqual(self.ui.backend._called['validate_email'],
+                         ((APP_NAME, self.ui.user_email,
+                           self.ui.user_password, EMAIL_TOKEN),
+                          dict(reply_handler=gui.NO_OP,
+                               error_handler=gui.NO_OP)))
+
     def test_on_verify_token_button_shows_processing_page(self):
         """Verify token button triggers call to backend."""
         self.click_verify_email_with_valid_data()
@@ -1085,7 +1096,7 @@
 
 
 class VerifyEmailValidationTestCase(UbuntuSSOClientTestCase):
-    """Test suite for the user registration (verify email page)."""
+    """Test suite for the user registration validation (verify email page)."""
 
     def setUp(self):
         """Init."""
@@ -1120,6 +1131,20 @@
         self.assert_warnings_visibility()
 
 
+class VerifyEmailLoginOnlyTestCase(VerifyEmailTestCase):
+    """Test suite for the user login (verify email page)."""
+
+    kwargs = dict(app_name=APP_NAME, tc_uri=TC_URI, help_text=HELP_TEXT,
+                  login_only=True)
+
+
+class VerifyEmailValidationLoginOnlyTestCase(VerifyEmailValidationTestCase):
+    """Test suite for the user login validation (verify email page)."""
+
+    kwargs = dict(app_name=APP_NAME, tc_uri=TC_URI, help_text=HELP_TEXT,
+                  login_only=True)
+
+
 class RegistrationValidationTestCase(UbuntuSSOClientTestCase):
     """Test suite for the user registration  validations."""