Merge lp:~elopio/u1-test-utils/fix-already_logged_in into lp:u1-test-utils

[Leo Arias]

Fixed the case when the user is already logged in.

[Leo Arias (elopio)]

Tested with the pay acceptance tests.

review: Approve

=== modified file 'u1testutils/sst/sso/helpers.py'
--- u1testutils/sst/sso/helpers.py	2013-01-29 14:50:38 +0000
+++ u1testutils/sst/sso/helpers.py	2013-01-29 22:35:26 +0000
@@ -66,11 +66,22 @@
         information will be send to it. Default is True.
 
     """
-    log_in = pages.LogIn()
     if is_site_recognized:
-        log_in.log_in_to_site_recognized(user)
+        if user is not None:
+            log_in = pages.LogIn()
+            log_in.log_in_to_site_recognized(user)
+        else:
+            # User is already signed in so SSO will just redirect back to the
+            # main site.
+            pass
     else:
-        site_not_recognized = log_in.log_in_to_site_not_recognized(user)
+        if user is not None:
+            log_in = pages.LogIn()
+            site_not_recognized = log_in.log_in_to_site_not_recognized(user)
+        else:
+            # User is already signed in so SSO will just show the site not
+            # recognized page.
+            site_not_recognized = pages.SiteNotRecognized()
         site_not_recognized.make_all_information_available_to_website()
         site_not_recognized.yes_sign_me_in()