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

[Leo Arias]

Fixed the page open verification for site not recognized, a typo and the __init__ order.

Fixed the page open verification for site not recognized.

[lp:~elopio/u1-test-utils/fix-site_not_recognized]

23. By Leo Arias on 2013-01-29

Fixed a typo.

24. By Leo Arias on 2013-01-29

Inverted the order of the calls to set the right title before it is asserted.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'u1testutils/sst/sso/pages.py'
--- u1testutils/sst/sso/pages.py	2013-01-24 17:07:25 +0000
+++ u1testutils/sst/sso/pages.py	2013-01-29 17:09:20 +0000
@@ -186,7 +186,7 @@
         return SiteNotRecognized()
 
     def _confirm_email(self, confirmation_code):
-        self._enter_confirmaiton_code(confirmation_code)
+        self._enter_confirmation_code(confirmation_code)
         self._click_continue_button()
 
     def _enter_confirmation_code(self, confirmation_code):
@@ -204,13 +204,27 @@
 class SiteNotRecognized(Page):
     """Site not Recognized page of the Ubuntu Single Sign On website.
 
-    This is a subclass of the Page object. It adds methods for the actions
-    available in this page.
+    This is a subclass of the Page object. It overrides the assert_page_is_open
+    method to check only the first part of the title, and adds methods for the
+    actions available in this page.
 
     Instance variables:
-    title -- The title of the page.
+    title -- The regular expression of the title of the page.
 
     """
+
+    title = 'Authenticate to .+'
+
+    def assert_page_is_open(self):
+        """Assert that the page is open.
+
+        We use a regular expression because the title has the URL of the site
+        that requested the log in plus some tokens, and we don't need to check
+        that.
+
+        """
+        sst.actions.assert_title_contains(self.title, regex=True)
+
     def make_all_information_available_to_website(self):
         """Select all the user available information.
 
@@ -252,8 +266,8 @@
     title = "{0}'s details"
 
     def __init__(self, user_name):
+        self.title = self.title.format(user_name)
         super(YourAccount, self).__init__()
-        self.title = self.title.format(user_name)
         self.sub_header = _UserSubHeader()