Merge lp:~elopio/u1-test-utils/qa_anchors into lp:u1-test-utils

[Leo Arias]

Updated all the SSO pages to use the QA anchors.

Now we use a special QA anchor on the html tag of the pages to identify them. It's no longer needed to assert for their title and headings.

This branch requires https://code.launchpad.net/~elopio/canonical-identity-provider/qa_anchors/+merge/166636

[lp:~elopio/u1-test-utils/qa_anchors]

76. By Leo Arias on 2013-05-31

Allow to open the login page.

77. By Leo Arias on 2013-05-31

Now we don't need the user name to instantiate pages.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'u1testutils/sso/sst/__init__.py'
--- u1testutils/sso/sst/__init__.py	2013-05-03 16:17:38 +0000
+++ u1testutils/sso/sst/__init__.py	2013-05-31 04:30:38 +0000
@@ -99,7 +99,7 @@
         site_not_recognized.yes_sign_me_in()
 
 
-def log_out(user_name):
+def log_out():
     """Log out from the Ubuntu Single Sign On site.
 
     The browser must be on the Single Sign On site, and the user must have the
@@ -108,9 +108,6 @@
     If the log out succeeds, the browser will be on the Ubuntu Single Sign On
     logout page.
 
-    Keyword arguments:
-    user_name -- The name of the logged in user.
-
     """
-    your_account = pages.YourAccount(user_name)
+    your_account = pages.YourAccount()
     return your_account.subheader.log_out()
 
=== modified file 'u1testutils/sso/sst/pages.py'
--- u1testutils/sso/sst/pages.py	2013-05-23 15:05:28 +0000
+++ u1testutils/sso/sst/pages.py	2013-05-31 04:30:38 +0000
@@ -32,12 +32,20 @@
 
     """
 
-    title = 'Log in'
     url_path = '(/|/\+login)'
     is_url_path_regex = True
-    headings1 = ['Ubuntu Single Sign On']
-    headings2 = ['Log in to Ubuntu Single Sign On', 'Are you new?']
-    qa_anchor = 'ubuntu_login_title'
+    qa_anchor = 'login'
+
+    @log_action(logging.info)
+    def _open_page(self):
+        """Open the page.
+
+        This overwrites the method from the base Page class in order to choose
+        one of the possible URL paths to open the page.
+
+        """
+        sst.actions.go_to('/+login')
+        return self
 
     @log_action(logging.info)
     def log_in_to_site_recognized(self, user=None):
@@ -103,8 +111,6 @@
 
     url_path = '/.*/\+decide'
     is_url_path_regex = True
-    headings2 = ['Log in', 'Are you new?']
-    qa_anchor = 'ubuntu_login_title'
 
     @log_action(logging.info)
     def go_to_create_new_account(self):
@@ -156,9 +162,7 @@
 
     """
 
-    title = 'Create account'
     url_path = '/+new_account'
-    headings1 = ['Ubuntu Single Sign On', 'Create an account']
     qa_anchor = 'new_account'
 
     @log_action(logging.info)
@@ -209,10 +213,7 @@
 
     """
 
-    title = 'Account creation mail sent'
     url_path = '/+new_account'
-    headings1 = ['Account creation mail sent']
-    headings2 = ["Haven't received it?"]
     qa_anchor = 'new_account'
 
     @log_action(logging.info)
@@ -287,9 +288,9 @@
 
     """
 
-    title = "Complete email address validation"
     url_path = '/token/.+/\+newemail/.+@.+'
     is_url_path_regex = True
+    qa_anchor = 'confirm_email'
 
     def __init__(self, open_page=False):
         super(CompleteEmailValidation, self).__init__(open_page)
@@ -306,13 +307,11 @@
     @log_action(logging.info)
     def confirm(self):
         self._click_continue_button()
-        user_name = self.subheader.get_user_name()
-        return YourAccount(user_name)
+        return YourAccount()
 
     @log_action(logging.info)
     def cancel(self):
-        user_name = self.subheader.get_user_name()
-        return YourAccount(user_name)
+        return YourAccount()
 
 
 class SiteNotRecognized(u1testutils.sst.Page):
@@ -324,9 +323,9 @@
 
     """
 
-    title = '^Authenticate to .+'
     url_path = '/.+/\+decide'
     is_url_path_regex = True
+    qa_anchor = 'decide'
 
     def assert_title(self):
         """Assert that the page is open.
@@ -376,19 +375,15 @@
 
     """
 
-    title = "{0}'s details"
     url_path = '/'
     qa_anchor = 'edit_account'
 
-    def __init__(self, user_name, open_page=False):
-        self.title = self.title.format(user_name)
+    def __init__(self, open_page=False):
         super(YourAccount, self).__init__(open_page)
 
 
 class YouHaveBeenLoggedOut(PageWithAnonymousSubheader):
     """Your account page of the Ubuntu Single Sign On website."""
 
-    title = 'You have been logged out'
     url_path = '/+logout'
-    headings1 = ['Ubuntu Single Sign On', 'You have been logged out']
     qa_anchor = 'logout'