Merge lp:~nataliabidart/canonical-identity-provider/more-qa-anchors-for-sso into lp:canonical-identity-provider/release

[Natalia Bidart]

- Adding lots of data-qa-id attrs to several HTML elements for ubuntu, launchpad and ubuntuone templates.
- Bumped revno of u1testutils to 80.
- Unified login/logout template rendering mechanism between ubuntu and launchpad.

[Leo Arias (elopio)]

You have done a huge amount of work. Thank you very much!
I like the data-qa-ids you are using, as they make more readable the tests helpers. Thanks for that too.

Some comments:

286 +for i, token in enumerate((TOKEN_1, TOKEN_2, TOKEN_3)):
287 + assert_text_contains(applications[i + 1], token)

Here, I suppose we are not checking the first application because it's the one added when creating the account. A comment about this will be nice to make it easier to understand the test in the case of a failure.

333 + if device_names is None:
334 + device_names = ['2F Required Generic Device']

Can you please explain this change to me? I thought having a default value for devices names would make it faster to understand. It's not a complaint, I'm just wondering if this is the style we should follow.

402 +if helpers.get_current_brand() == 'launchpad':
403 + click_button(logout_element)
404 +else:
405 + click_link(logout_element)

Maybe this can be changed to click_element(logout_element) and we can remove the if. From the user point of view, I think it's not important if it's a link or a button. With CSS we make some buttons look like links and also the other way around.

473 +# wait for animation
474 +sleep(0.5)

I don't like this. Maybe we can wait for the element to be visible, or do some other trick. I'm now used with fighting animations, so feel free to open a bug and assign it to me with low priority. I'll take a look when I'm bored waiting for runs.

540 \ No newline at end of file

A newline here would be nice.

731 + self.assertEqual(button.text_content().strip(), 'Yes, log me in')

Here it would be nice if you comment why the content has to be stripped.

844 + <a href="./+remove-email?id={{ email.id }}" class="btn-sm" data-qa-id="remove_verified_email">
845 + <span>{% trans "Delete" %}</span>
846 + </a>

Shouldn't this be indented one more level, because it's inside the if?

[Natalia Bidart (nataliabidart)]

> You have done a huge amount of work. Thank you very much!
> I like the data-qa-ids you are using, as they make more readable the tests
> helpers. Thanks for that too.

:-)

> 286 +for i, token in enumerate((TOKEN_1, TOKEN_2, TOKEN_3)):
> 287 + assert_text_contains(applications[i + 1], token)
>
> Here, I suppose we are not checking the first application because it's the one
> added when creating the account. A comment about this will be nice to make it
> easier to understand the test in the case of a failure.

Yes, comment added.

> 333 + if device_names is None:
> 334 + device_names = ['2F Required Generic Device']
>
> Can you please explain this change to me? I thought having a default value for
> devices names would make it faster to understand. It's not a complaint, I'm
> just wondering if this is the style we should follow.

Followed up in the irc channel, but basically we need to avoid having mutable objects as default value for parameters.

> 402 +if helpers.get_current_brand() == 'launchpad':
> 403 + click_button(logout_element)
> 404 +else:
> 405 + click_link(logout_element)
>
> Maybe this can be changed to click_element(logout_element) and we can remove
> the if. From the user point of view, I think it's not important if it's a link
> or a button. With CSS we make some buttons look like links and also the other
> way around.

Done!

> 473 +# wait for animation
> 474 +sleep(0.5)
>
> I don't like this. Maybe we can wait for the element to be visible, or do some
> other trick. I'm now used with fighting animations, so feel free to open a bug
> and assign it to me with low priority. I'll take a look when I'm bored waiting
> for runs.

Done, LP: #1190411.

> 540 \ No newline at end of file
>
> A newline here would be nice.

Is added now (the "No newline at end of file" refers to the old version of the file).

> 731 + self.assertEqual(button.text_content().strip(), 'Yes, log me in')
>
> Here it would be nice if you comment why the content has to be stripped.

Added!

> 844 + <a href="./+remove-email?id={{ email.id }}" class="btn-sm" data-qa-
> id="remove_verified_email">
> 845 + <span>{% trans "Delete" %}</span>
> 846 + </a>
>
> Shouldn't this be indented one more level, because it's inside the if?

It is already indented... perhaps am I missing something?

Thanks for all the time you out on this!

[Leo Arias (elopio)]

land land land.

review: Approve

=== modified file 'acceptance/actions/subheader.py'
--- acceptance/actions/subheader.py	2013-05-13 07:41:43 +0000
+++ acceptance/actions/subheader.py	2013-06-13 00:15:30 +0000
@@ -2,27 +2,33 @@
 
 
 def _assert_full_name_in_account_link(full_name):
-    sst.actions.assert_text(_get_my_account_link(), full_name[:40])
+    sst.actions.assert_text(_get_my_account_section(), full_name[:40])
+
+
+def _get_my_account_section():
+    return sst.actions.get_element_by_css(
+        '*[data-qa-id="account"] *[data-qa-id="user_name"]')
 
 
 def _get_my_account_link():
-    return sst.actions.get_element(id='account')
+    return sst.actions.get_element_by_css('*[data-qa-id="account_link"]')
 
 
 def _get_devices_link():
-    return sst.actions.get_element(id='devices-link')
+    return sst.actions.get_element_by_css('*[data-qa-id="devices_link"]')
 
 
 def _get_applications_link():
-    return sst.actions.get_element(id='applications-link')
+    return sst.actions.get_element_by_css('*[data-qa-id="applications_link"]')
 
 
 def _get_log_out_link():
-    return sst.actions.get_element(id='logout-link')
+    return sst.actions.get_element_by_css('*[data-qa-id="logout_link"]')
 
 
 def assert_log_in(full_name):
     _assert_full_name_in_account_link(full_name)
+    _get_my_account_link()
     _get_log_out_link()
 
 

=== modified file 'acceptance/helpers.py'
--- acceptance/helpers.py	2013-05-17 20:45:52 +0000
+++ acceptance/helpers.py	2013-06-13 00:15:30 +0000
@@ -328,3 +328,23 @@
 
     link = match.groups()[0]
     return link
+
+
+# this is a temporarly helper so we can detect brands at UI rendering time
+# since we can not access flags properly from within the acceptance run
+def get_current_brand():
+    try:
+        get_element_by_css('*[data-qa-id="brand_ubuntuone"]')
+    except:
+        pass
+    else:
+        return 'ubuntuone'
+
+    try:
+        get_element_by_css('*[data-qa-id="brand_launchpad"]')
+    except:
+        pass
+    else:
+        return 'launchpad'
+
+    return 'ubuntu'

=== modified file 'acceptance/pages.py'
--- acceptance/pages.py	2013-06-08 06:26:43 +0000
+++ acceptance/pages.py	2013-06-13 00:15:30 +0000
@@ -20,18 +20,14 @@
         self.menu = Menu()
 
     def get_user_name(self):
-        try:
-            # This is present on the ubuntuone and launchpad templates.
-            user_name_element = sst.actions.get_element_by_css(
-                '*[data-qa-id="user_name"]')
-        except AssertionError:
-            # This is present on the ubuntu template.
-            user_name_element = sst.actions.get_element(id='account')
+        user_name_element = sst.actions.get_element_by_css(
+            '*[data-qa-id="user_name"]')
         return user_name_element.text
 
     @log_action(logging.info)
     def log_out(self):
-        sst.actions.click_link('logout-link')
+        link = sst.actions.get_element_by_css('*[data-qa-id="logout_link"]')
+        sst.actions.click_link(link)
         return YouHaveBeenLoggedOut()
 
 
@@ -40,12 +36,14 @@
 
     @log_action(logging.info)
     def go_to_authentication_devices(self):
-        sst.actions.click_link('devices-link')
+        link = sst.actions.get_element_by_css('*[data-qa-id="devices_link"]')
+        sst.actions.click_link(link)
         return YourAuthenticationDevices()
 
     @log_action(logging.info)
     def go_to_your_account(self):
-        sst.actions.click_link('account-link')
+        link = sst.actions.get_element_by_css('*[data-qa-id="account_link"]')
+        sst.actions.click_link(link)
         return YourAccount()
 
 
@@ -144,7 +142,8 @@
 
     @log_action(logging.info)
     def click_log_in_or_create_account(self):
-        sst.actions.click_link('login-link')
+        link = sst.actions.get_element_by_css('*[data-qa-id="login_link"]')
+        sst.actions.click_link(link)
         return LogIn()
 
 
@@ -186,7 +185,8 @@
     @log_action(logging.info)
     def add_email(self, email_address):
         sst.actions.write_textfield('id_newemail', email_address)
-        sst.actions.click_button(sst.actions.get_element(name='continue'))
+        sst.actions.click_button(
+            sst.actions.get_element_by_css('*[data-qa-id="add_new_email"]'))
 
     @log_action(logging.info)
     def delete_email(self):
@@ -212,7 +212,8 @@
         sst.actions.write_textfield('id_email', email_address)
 
     def _continue(self):
-        sst.actions.click_button(sst.actions.get_element(name='continue'))
+        sst.actions.click_button(sst.actions.get_element_by_css(
+            '*[data-qa-id="confirm_enter_token"]'))
 
     @log_action(logging.info)
     def confirm_with_error(self, confirmation_code, email_address):
@@ -223,12 +224,13 @@
 
 class DeleteEmail(LoggedUserPage):
 
+    url_path = '/+remove-email'
     qa_anchor = 'delete_email'
-    url_path = '/+remove-email'
 
     @log_action(logging.info)
     def confirm(self):
-        confirm_button = sst.actions.get_element(name='delete')
+        confirm_button = sst.actions.get_element_by_css(
+            '*[data-qa-id="confirm_delete_email"]')
         sst.actions.click_button(confirm_button)
         return YourEmailAddresses()
 
@@ -244,7 +246,8 @@
         # Even though the recaptcha field is ignored for our tests, we do
         # want to verify that it is on the page.
         sst.actions.write_textfield('recaptcha_response_field', 'ignored')
-        sst.actions.click_button(sst.actions.get_element(name='continue'))
+        sst.actions.click_button(sst.actions.get_element_by_css(
+            '*[data-qa-id="send_password_reset_token"]'))
 
 
 class LogInFromRedirect(u1testutils.sso.sst.pages.LogIn):
@@ -279,17 +282,17 @@
         return AddNewAuthenticationDevice()
 
     @log_action(logging.info)
-    def delete_authentication_device(self, index=0):
+    def delete_authentication_device(self, device_index=0):
         delete_link = sst.actions.get_elements_by_css(
             '*[data-qa-id="delete_device"]')
-        sst.actions.click_link(delete_link[index])
+        sst.actions.click_link(delete_link[device_index])
         return DeleteAuthenticationDevice()
 
     @log_action(logging.info)
-    def rename_authentication_device(self, index=0):
+    def rename_authentication_device(self, device_index=0):
         rename_link = sst.actions.get_elements_by_css(
             '*[data-qa-id="rename_device"]')
-        sst.actions.click_link(rename_link[index])
+        sst.actions.click_link(rename_link[device_index])
         return RenameAuthenticationDevice()
 
     def is_warning_displayed(self):
@@ -369,7 +372,8 @@
 
     @log_action(logging.info)
     def cancel(self):
-        cancel_link = sst.actions.get_element_by_css('*[data-qa-id="cancel"]')
+        cancel_link = sst.actions.get_element_by_css(
+            '*[data-qa-id="cancel_add_device_from_type"]')
         sst.actions.click_link(cancel_link)
         return YourAuthenticationDevices()
 
@@ -411,8 +415,8 @@
 
     def _add_device(self, device_radio_identifier):
         sst.actions.set_radio_value(device_radio_identifier)
-        add_button = sst.actions.get_element(
-            tag='button', text_regex='Add device')
+        add_button = sst.actions.get_element_by_css(
+            '*[data-qa-id="add_device_from_type"]')
         sst.actions.click_button(add_button)
 
 
@@ -436,7 +440,7 @@
 
     def _click_add_device(self):
         add_button = sst.actions.get_element_by_css(
-            '*[data-qa-id="add_generic_device"]')
+            '*[data-qa-id="confirm_add_device"]')
         sst.actions.click_button(add_button)
 
     @log_action(logging.info)
@@ -471,7 +475,8 @@
 
     @log_action(logging.info)
     def cancel(self):
-        cancel_link = sst.actions.get_element_by_css('*[data-qa-id="cancel"]')
+        cancel_link = sst.actions.get_element_by_css(
+            '*[data-qa-id="cancel_add_device"]')
         sst.actions.click_link(cancel_link)
         return YourAuthenticationDevices()
 
@@ -550,12 +555,12 @@
     # TODO This test is really small and gives no real value to a user, so it's
     # a perfect candidate to be converted into a django unit test.
     def assert_print_button_visible(self):
-        sst.actions.assert_element('*[data-qa-id="print_btn"]')
+        sst.actions.assert_element('*[data-qa-id="print_codes"]')
 
     @log_action(logging.info)
     def go_back_to_device_list(self):
         device_list_link = sst.actions.get_element_by_css(
-            '*[data-qa-id="go_back"]')
+            '*[data-qa-id="cancel_print_codes"]')
         sst.actions.click_link(device_list_link)
         return YourAuthenticationDevices()
 
@@ -587,13 +592,14 @@
     @log_action(logging.info)
     def confirm_new_codes(self):
         confirm_button = sst.actions.get_element_by_css(
-            '*[data-qa-id="confirm-codes"]')
+            '*[data-qa-id="confirm_new_codes"]')
         sst.actions.click_button(confirm_button)
         return PaperDevice()
 
     @log_action(logging.info)
     def cancel(self):
-        cancel_link = sst.actions.get_element_by_css('*[data-qa-id="cancel"]')
+        cancel_link = sst.actions.get_element_by_css(
+            '*[data-qa-id="cancel_new_codes"]')
         sst.actions.click_link(cancel_link)
         return PaperDevice()
 

=== modified file 'acceptance/tests/applications/create_multiple_apps.py'
--- acceptance/tests/applications/create_multiple_apps.py	2013-05-02 17:20:14 +0000
+++ acceptance/tests/applications/create_multiple_apps.py	2013-06-13 00:15:30 +0000
@@ -9,6 +9,7 @@
 from sst.actions import (
     assert_text_contains,
     get_base_url,
+    get_elements_by_css,
     go_to,
 )
 from u1testutils.sst import config
@@ -49,6 +50,8 @@
 # Now log in and check that the apps are associated with the account.
 helpers.login(email_address, PASSWORD)
 go_to(urls.APPLICATIONS)
-assert_text_contains('content', 'chupacabra')
-assert_text_contains('content', "leviathan")
-assert_text_contains('content', "behemoth")
+
+applications = get_elements_by_css('*[data-qa-id="application_token"]')
+for i, token in enumerate((TOKEN_1, TOKEN_2, TOKEN_3)):
+    # skip the first token which is the "web login" token
+    assert_text_contains(applications[i + 1], token)

=== modified file 'acceptance/tests/applications/delete_app.py'
--- acceptance/tests/applications/delete_app.py	2013-05-16 15:09:51 +0000
+++ acceptance/tests/applications/delete_app.py	2013-06-13 00:15:30 +0000
@@ -8,7 +8,7 @@
     click_button,
     fails,
     get_base_url,
-    get_elements,
+    get_elements_by_css,
     go_to,
 )
 from u1testutils.sst import config
@@ -41,12 +41,16 @@
 # now test that the app is there and that  we can delete it
 helpers.login(email_address, PASSWORD)
 go_to(urls.APPLICATIONS)
-assert_text_contains('content', TOKEN_NAME)
-delete_buttons = get_elements(css_class='btn-sm', name='Delete')
+token_names = get_elements_by_css('*[data-qa-id="application_token"]')
+assert_text_contains(token_names[-1], TOKEN_NAME)
+delete_buttons = get_elements_by_css('*[data-qa-id="delete_application"]')
 # delete application token
-click_button(delete_buttons[0])
+click_button(delete_buttons[-1])
 # log back in and should have no app
 helpers.logout()
 helpers.login(email_address, PASSWORD)
+
 go_to(urls.APPLICATIONS)
-fails(assert_text_contains, 'content', TOKEN_NAME)
+token_names = get_elements_by_css('*[data-qa-id="application_token"]')
+for token_name in token_names:
+    fails(assert_text_contains, token_name, TOKEN_NAME)

=== modified file 'acceptance/tests/devices/__init__.py'
--- acceptance/tests/devices/__init__.py	2013-06-07 21:07:00 +0000
+++ acceptance/tests/devices/__init__.py	2013-06-13 00:15:30 +0000
@@ -77,8 +77,10 @@
 
 class TwoFactorPageOpenedWithTwoFactorRequired(fixtures.Fixture):
 
-    def __init__(self, device_names=['2F Required Generic Device'], user=None):
+    def __init__(self, device_names=None, user=None):
         super(TwoFactorPageOpenedWithTwoFactorRequired, self).__init__()
+        if device_names is None:
+            device_names = ['2F Required Generic Device']
         self.device_names = device_names
         self.user = user
 

=== removed directory 'acceptance/tests/devices/scripts'
=== modified file 'acceptance/tests/devices/testcases/test_device_login.py'
--- acceptance/tests/devices/testcases/test_device_login.py	2013-06-10 18:47:00 +0000
+++ acceptance/tests/devices/testcases/test_device_login.py	2013-06-13 00:15:30 +0000
@@ -2,11 +2,11 @@
 # This software is licensed under the GNU Affero General Public License
 # version 3 (see the file LICENSE).
 
+import sst.actions
+
 from acceptance import base, pages
 from acceptance.tests import devices
 
-import sst.actions
-
 
 class TestDeviceLogin(base.SSTTestCaseWithLogIn):
 

=== modified file 'acceptance/tests/logout/logout_deep_pages.py'
--- acceptance/tests/logout/logout_deep_pages.py	2013-05-15 11:42:01 +0000
+++ acceptance/tests/logout/logout_deep_pages.py	2013-06-13 00:15:30 +0000
@@ -16,8 +16,6 @@
     click_delete_button,
 )
 
-from identityprovider.utils import get_current_brand
-
 
 config.set_base_url_from_env()
 
@@ -37,9 +35,7 @@
 # logout by clicking on link
 click_link('logout-link')
 
-# no link present in ubuntuone brand
-if get_current_brand() != 'ubuntuone':
-    assert_element(href="/+login")
+assert_element(href="/+login")
 
 # make sure we're logged out
 go_to(urls.HOME)

=== modified file 'acceptance/tests/logout/logout_ubuntu.py'
--- acceptance/tests/logout/logout_ubuntu.py	2013-06-05 17:09:49 +0000
+++ acceptance/tests/logout/logout_ubuntu.py	2013-06-13 00:15:30 +0000
@@ -5,7 +5,7 @@
     assert_element,
     assert_title,
     click_button,
-    click_link,
+    click_element,
     get_element_by_css,
     go_to,
     write_textfield,
@@ -14,8 +14,6 @@
 
 from acceptance import urls
 
-from identityprovider.utils import get_current_brand
-
 
 # Set to Production, Staging, VPS, Developer etc..
 config.set_base_url_from_env()
@@ -27,11 +25,10 @@
 click_button(get_element_by_css('*[data-qa-id="login_button"]'))
 
 # logout by clicking on link
-click_link('logout-link')
+logout_element = get_element_by_css('*[data-qa-id="logout_link"]')
+click_element(logout_element)
 
-# no link present in ubuntuone brand
-if get_current_brand() != 'ubuntuone':
-    assert_element(href="/+login")
+assert_element(href="/+login")
 
 # make sure we're logged out
 go_to(urls.HOME)
@@ -45,9 +42,7 @@
 # logout by hitting url directly
 go_to(urls.LOGOUT)
 
-# no link present in ubuntuone brand
-if get_current_brand() != 'ubuntuone':
-    assert_element(href="/+login")
+assert_element(href="/+login")
 
 # make sure we're logged out
 go_to(urls.HOME)

=== modified file 'acceptance/tests/new_account/passwords_bad_client-side.csv'
--- acceptance/tests/new_account/passwords_bad_client-side.csv	2012-03-06 13:10:19 +0000
+++ acceptance/tests/new_account/passwords_bad_client-side.csv	2013-06-13 00:15:30 +0000
@@ -1,6 +1,6 @@
 password^error
 'foo'^'Password too short'
-'foobar123'^'Strength: good'
 'Foo123'^'Password too short'
 ' '^'Password too short'
 '12345678'^'Strength: fair'
+'aA12_3555aA'^'Strength: strong'

=== modified file 'acceptance/tests/new_account/passwords_bad_client-side.py'
--- acceptance/tests/new_account/passwords_bad_client-side.py	2013-05-14 13:17:20 +0000
+++ acceptance/tests/new_account/passwords_bad_client-side.py	2013-06-13 00:15:30 +0000
@@ -6,20 +6,15 @@
     assert_text,
     assert_title,
     assert_url,
-    get_element,
+    get_element_by_css,
     go_to,
-    skip,
+    sleep,
     write_textfield,
 )
 from u1testutils.sst import config
 
 from acceptance import urls
 
-from identityprovider.utils import get_current_brand
-
-
-if get_current_brand() == 'ubuntuone':
-    skip('Test not compatible with ubuntuone brand')
 
 config.set_base_url_from_env()
 
@@ -27,7 +22,11 @@
 assert_url(urls.NEW_ACCOUNT)
 assert_title('Create account')
 
-elem = get_element(id='password_strength')
+elem = get_element_by_css('*[data-qa-id="password_strength"]')
 
 write_textfield('id_password', password)
+
+# wait for animation
+sleep(0.5)
+
 assert_text(elem, error)

=== removed file 'acceptance/tests/new_account/passwords_bad_client-side_ubuntuone.csv'
--- acceptance/tests/new_account/passwords_bad_client-side_ubuntuone.csv	2013-05-10 10:13:09 +0000
+++ acceptance/tests/new_account/passwords_bad_client-side_ubuntuone.csv	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-password^error
-'fooo'^'Password too short'
-'foobar123'^'Strength: fair'
-'Foo123'^'Password too short'
-'12345678'^'Strength: weak'
-'aA12_3555aA'^'Strength: strong'

=== removed file 'acceptance/tests/new_account/passwords_bad_client-side_ubuntuone.py'
--- acceptance/tests/new_account/passwords_bad_client-side_ubuntuone.py	2013-05-15 09:38:24 +0000
+++ acceptance/tests/new_account/passwords_bad_client-side_ubuntuone.py	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-#  password tests: client-side validation
-#
-#  rules:
-#    Password must be at least 8 characters long.
-from sst.actions import (
-    assert_text,
-    assert_title,
-    assert_url,
-    get_element_by_css,
-    go_to,
-    skip,
-    sleep,
-    write_textfield,
-)
-from u1testutils.sst import config
-
-from acceptance import urls
-
-from identityprovider.utils import get_current_brand
-
-
-if get_current_brand() != 'ubuntuone':
-    skip('Test only compatible with ubuntuone brand')
-
-config.set_base_url_from_env()
-
-go_to(urls.NEW_ACCOUNT)
-assert_url(urls.NEW_ACCOUNT)
-assert_title('Create account')
-
-elem = get_element_by_css('.yui3-passwordmeter-indicatorNode p')
-
-write_textfield('id_password', password)
-
-# wait for animation
-sleep(1)
-
-assert_text(elem, error)

=== modified file 'acceptance/tests/new_account/passwords_bad_server-side.csv'
--- acceptance/tests/new_account/passwords_bad_server-side.csv	2012-12-18 20:15:44 +0000
+++ acceptance/tests/new_account/passwords_bad_server-side.csv	2013-06-13 00:15:30 +0000
@@ -1,4 +1,4 @@
 password
 foo
 Foo123
-""
\ No newline at end of file
+" "

=== modified file 'acceptance/tests/new_account/passwords_bad_server-side.py'
--- acceptance/tests/new_account/passwords_bad_server-side.py	2013-05-14 13:17:20 +0000
+++ acceptance/tests/new_account/passwords_bad_server-side.py	2013-06-13 00:15:30 +0000
@@ -3,12 +3,12 @@
 # rules:
 #   Password must be at least 8 characters long.
 from sst.actions import (
-    assert_attribute,
     assert_text,
+    assert_text_contains,
     assert_title,
     assert_url,
     click_button,
-    get_element,
+    get_element_by_css,
     go_to,
 )
 from u1testutils import mail
@@ -16,8 +16,6 @@
 
 from acceptance import helpers, urls
 
-from identityprovider.utils import get_current_brand
-
 
 EMAIL = mail.make_unique_test_email_address()
 NAME = 'Some Name'
@@ -26,15 +24,11 @@
 go_to(urls.NEW_ACCOUNT)
 assert_title('Create account')
 helpers.fill_registration_form(EMAIL, displayname=NAME, password=password)
-click_button(get_element(name='continue'))
+click_button(get_element_by_css('*[data-qa-id="register_button"]'))
 
 assert_url(urls.NEW_ACCOUNT)
 assert_text('id_displayname', NAME)
 assert_text('id_email', EMAIL)
 
-if get_current_brand() == 'ubuntuone':
-    msg = 'Password with at least 8 characters'
-    assert_attribute('id_password', 'placeholder', msg)
-else:
-    msg = 'Password must be at least 8 characters long.'
-    assert_text(get_element(css_class='formHelp'), msg)
+msg = 'at least 8 characters'
+assert_text_contains(get_element_by_css('span.error'), msg)

=== modified file 'acceptance/tests/root/links.py'
--- acceptance/tests/root/links.py	2013-05-14 13:17:20 +0000
+++ acceptance/tests/root/links.py	2013-06-13 00:15:30 +0000
@@ -12,9 +12,7 @@
 )
 from u1testutils.sst import config
 
-from acceptance import urls
-
-from identityprovider.utils import get_current_brand
+from acceptance import helpers, urls
 
 
 config.set_base_url_from_env()
@@ -22,9 +20,9 @@
 go_to(urls.HOME)
 wait_for(assert_title, 'Log in')
 
-if get_current_brand() == 'ubuntuone':
+if helpers.get_current_brand() == 'ubuntuone':
     links = (
-        ('Terms of use', 'https://one.ubuntu.com/terms/'),
+        ('Terms of service', 'https://one.ubuntu.com/terms/'),
         ('Privacy', 'https://one.ubuntu.com/privacy/'),
         ('Login support', 'https://forms.canonical.com/sso-support/'),
         ('Choose your language', urls.get_base_url() + '/set_language'),

=== modified file 'requirements/testing.txt'
--- requirements/testing.txt	2013-06-05 17:11:48 +0000
+++ requirements/testing.txt	2013-06-13 00:15:30 +0000
@@ -31,5 +31,5 @@
 zope.schema==4.2.0
 zope.testbrowser==3.5.1
 bzr+http://bazaar.launchpad.net/~canonical-isd-qa/selenium-simple-test/trunk/@413
-bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/u1-test-utils/trunk@78
+bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/u1-test-utils/trunk@80
 bzr+ssh://bazaar.launchpad.net/~bloodearnest/+junk/test-email-server/

=== modified file 'scripts/acceptance-dev.sh'
--- scripts/acceptance-dev.sh	2013-06-11 11:04:05 +0000
+++ scripts/acceptance-dev.sh	2013-06-13 00:15:30 +0000
@@ -24,7 +24,7 @@
 
 while getopts ":b:t:hfcp:" opt; do
   case $opt in
-    b) BRAND="brand:"$OPTARG ;;
+    b) BRAND=$OPTARG ;;
     t) TESTCASE=$OPTARG ;;
     h) HEADLESS="true" ;;
     f) HEADLESS="false" ;;
@@ -68,6 +68,11 @@
   fab manage:add_openid_rp_config,$SST_BASE_URL/consumer,--allow-unverified,--allowed-user-attribs="fullname\,nickname\,email\,language,account_verified"
 fi
 
+if [ $BRAND ]; then
+    fab manage:add_switch,"brand_"$BRAND
+    BRAND="brand:"$BRAND
+fi
+
 # handle exit cleanly (mainly Ctrl-C)
 trap clean_up SIGHUP SIGINT SIGTERM
 

=== modified file 'scripts/run-acceptance-tests'
--- scripts/run-acceptance-tests	2013-06-11 10:14:59 +0000
+++ scripts/run-acceptance-tests	2013-06-13 00:15:30 +0000
@@ -47,6 +47,9 @@
 if [ ${TARGET} = "dev" ]; then
     # dev is special: we need to start it up.
     ./scripts/acceptance-dev.sh
+if [ ${TARGET} = "dev-u1" ]; then
+    # dev is special: we need to start it up.
+    ./scripts/acceptance-dev.sh -b ubuntuone
 else
     SST_BASE_URL="$SST_BASE_URL" fab acceptance:screenshot=true,report=xml
 fi

=== modified file 'src/identityprovider/media/ubuntu/styles.css'
--- src/identityprovider/media/ubuntu/styles.css	2013-05-22 14:13:01 +0000
+++ src/identityprovider/media/ubuntu/styles.css	2013-06-13 00:15:30 +0000
@@ -606,7 +606,8 @@
     color: #dd4814;
 }
 
-#subheader ul li a, #subheader ul li span, #subheader ul li input {
+#subheader ul li span,
+#subheader ul li input {
     padding: 14px 8px 0;
     display: block;
     height: 28px;

=== modified file 'src/identityprovider/templates/server/decide.html'
--- src/identityprovider/templates/server/decide.html	2013-06-04 16:35:37 +0000
+++ src/identityprovider/templates/server/decide.html	2013-06-13 00:15:30 +0000
@@ -17,7 +17,9 @@
 {% block content %}
     <div id="trust-root">
         <h2 class="main" data-qa-id="rp_login_title">
-            {% blocktrans %} You are logging in to <a data-qa-id="rp_backlink" href="{{ trust_root }}">{{ trust_root }}</a>{% endblocktrans %}
+            {% blocktrans %} You are logging in to
+            <a data-qa-id="rp_backlink" href="{{ trust_root }}">{{ trust_root }}</a>
+            {% endblocktrans %}
         </h2>
     </div>
 
@@ -62,7 +64,9 @@
 
             <p>
                 <input type="hidden" name="ok" />
-                <button type="submit" class="btn" name="yes" data-qa-id="rp_confirm_login"><span><span>{% trans "Yes, log me in" %}</span></span></button>
+                <button type="submit" class="btn" name="yes" data-qa-id="rp_confirm_login">
+                    <span><span>{% trans "Yes, log me in" %}</span></span>
+                </button>
                 {% trans "or" %}
                 <a href="+cancel">{% trans "cancel" %}</a>
             </p>

=== modified file 'src/identityprovider/templatetags/menu_item.py'
--- src/identityprovider/templatetags/menu_item.py	2010-07-12 21:23:42 +0000
+++ src/identityprovider/templatetags/menu_item.py	2013-06-13 00:15:30 +0000
@@ -7,8 +7,9 @@
 
 
 @register.inclusion_tag('menu_item.html', takes_context=True)
-def menu_item(context, section, label, link):
+def menu_item(context, section, label, link, extra_qa_data_id=None):
     return {'current_section': context.get('current_section', None),
             'section': section,
             'label': label,
-            'link': link}
+            'link': link,
+            'extra_qa_data_id': extra_qa_data_id}

=== modified file 'src/identityprovider/tests/test_views_server.py'
--- src/identityprovider/tests/test_views_server.py	2013-05-21 19:05:32 +0000
+++ src/identityprovider/tests/test_views_server.py	2013-06-13 00:15:30 +0000
@@ -1066,6 +1066,8 @@
         trust_root = tree.find('div#trust-root')
         self.assertEqual(len(trust_root), 1)
         trust_root = trust_root[0]
+        # we need to strip the element text to avoid having a test failure
+        # caused by newlines inside the html template
         self.assertEqual(trust_root[0].text.strip(), 'You are logging in to')
 
         link = trust_root.getchildren()[0].find('a')
@@ -1074,7 +1076,7 @@
         button = tree.find('button[type="submit"][name="yes"]')
         self.assertEqual(len(button), 1)
         button = button[0]
-        self.assertEqual(button.text_content(), 'Yes, log me in')
+        self.assertEqual(button.text_content().strip(), 'Yes, log me in')
 
     def test_user_unverified_no_rpconfig(self):
         assert OpenIDRPConfig.objects.count() == 0

=== modified file 'src/webui/templates/account/applications.html'
--- src/webui/templates/account/applications.html	2013-04-17 13:23:35 +0000
+++ src/webui/templates/account/applications.html	2013-06-13 00:15:30 +0000
@@ -12,7 +12,6 @@
   <h1 class="main">{% trans "Applications you use" %}</h1>
 {% endblock %}
 
-
 {% block content %}
 {% if tokens %}
 <p>
@@ -31,13 +30,13 @@
     <tbody>
       {% for token in tokens %}
       <tr>
-        <td>{{ token.name }}</td>
+        <td data-qa-id="application_token">{{ token.name }}</td>
         <td>{{ token.created_at|date:"Y-m-d" }}</td>
         <td class="actions">
           <form action="{% url 'applications' %}" method="post">
             {% csrf_token %}
             <input type="hidden" name="token_id" value="{{ token.token }}" />
-            <button type="submit" class="btn-sm" name="Delete">
+            <button type="submit" class="btn-sm" name="Delete" data-qa-id="delete_application">
               <span>{% trans "Delete" %}</span>
             </button>
           </form>

=== modified file 'src/webui/templates/account/confirm_email_invalidation.html'
--- src/webui/templates/account/confirm_email_invalidation.html	2013-02-22 20:30:24 +0000
+++ src/webui/templates/account/confirm_email_invalidation.html	2013-06-13 00:15:30 +0000
@@ -21,7 +21,9 @@
   <form action="" method="POST">
     {% csrf_token %}
     <p>
-      <button type="submit" class="btn" name="invalidate"><span><span>{% trans "Yes, invalidate" %}</span></span></button>
+      <button type="submit" class="btn" name="invalidate" data-qa-id="confirm_email_invalidation">
+        <span><span>{% trans "Yes, invalidate" %}</span></span>
+      </button>
       {% trans "or" %} {% include "common/cancel_link.html" %}
     </p>
   </form>

=== modified file 'src/webui/templates/account/confirm_new_email.html'
--- src/webui/templates/account/confirm_new_email.html	2013-05-31 03:30:26 +0000
+++ src/webui/templates/account/confirm_new_email.html	2013-06-13 00:15:30 +0000
@@ -26,11 +26,11 @@
     {% csrf_token %}
     <p>
       <input type="hidden" name="post" value="yes" />
-      <button type="submit" name="continue" class="btn">
+      <button type="submit" name="continue" class="btn" data-qa-id="confirm_email_validation">
         <span><span>{% trans "Yes, I'm sure" %}</span></span>
       </button>
       {% trans "or" %}
-      <a href="{% if token %}/{{ token }}{% endif %}/">{% trans "cancel" %}</a>
+      <a href="{% if token %}/{{ token }}{% endif %}/" data-qa-id="cancel_email_validation">{% trans "cancel" %}</a>
     </p>
   </form>
 </div>

=== modified file 'src/webui/templates/account/delete_email.html'
--- src/webui/templates/account/delete_email.html	2013-05-31 03:13:32 +0000
+++ src/webui/templates/account/delete_email.html	2013-06-13 00:15:30 +0000
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% comment %}
-Copyright 2010 Canonical Ltd.  This software is licensed under the
+Copyright 2010-2013 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file  LICENSE).
 {% endcomment %}
 
@@ -26,7 +26,9 @@
         <form action="" method="POST">
             {% csrf_token %}
             <p>
-                <button type="submit" class="btn" name="delete"><span><span>{% trans "Yes, delete" %}</span></span></button>
+                <button type="submit" class="btn" name="delete" data-qa-id="confirm_delete_email">
+                    <span><span>{% trans "Yes, delete" %}</span></span>
+                </button>
                 {% trans "or" %}
                 {% include "common/cancel_link.html" %}
             </p>

=== modified file 'src/webui/templates/account/edit.html'
--- src/webui/templates/account/edit.html	2013-06-07 03:39:56 +0000
+++ src/webui/templates/account/edit.html	2013-06-13 00:15:30 +0000
@@ -145,7 +145,9 @@
 
     <p class="actions">
     {% if not readonly %}
-        <button type="submit" class="btn" name="update" data-qa-id="update_preferences"><span><span>{% trans "Update" %}</span></span></button>
+        <button type="submit" class="btn" name="update" data-qa-id="update_preferences">
+            <span><span>{% trans "Update" %}</span></span>
+        </button>
     {% endif %}
     {% if token %}
         {% trans "or" %}

=== modified file 'src/webui/templates/account/emails.html'
--- src/webui/templates/account/emails.html	2013-05-15 11:07:23 +0000
+++ src/webui/templates/account/emails.html	2013-06-13 00:15:30 +0000
@@ -51,7 +51,9 @@
         {% if not readonly %}
           <td class="actions">
             {% if not email.is_preferred %}
-              <a href="./+remove-email?id={{ email.id }}" class="btn-sm" data-qa-id="remove_verified_email"><span>{% trans "Delete" %}</span></a>
+            <a href="./+remove-email?id={{ email.id }}" class="btn-sm" data-qa-id="remove_verified_email">
+              <span>{% trans "Delete" %}</span>
+            </a>
             {% endif %}
           </td>
         {% endif %}
@@ -74,7 +76,9 @@
             {% if email.is_verifiable %}
             <a href="./+verify-email?id={{ email.id }}" data-qa-id="verify_unverified_{{ email }}" class="verify-email btn-sm"><span>{% trans "Verify" %}</span></a>
             {% endif %}
-            <a href="./+remove-email?id={{ email.id }}" data-qa-id="delete_unverified_{{ email }}" class="btn-sm"><span>{% trans "Delete" %}</span></a>
+            <a href="./+remove-email?id={{ email.id }}" data-qa-id="delete_unverified_{{ email }}" class="btn-sm">
+              <span>{% trans "Delete" %}</span>
+            </a>
           </td>
         {% endif %}
       </tr>
@@ -99,7 +103,7 @@
       {% endif %}
     </p>
     <p class="actions">
-      <button type="submit" class="btn" name="continue">
+      <button type="submit" class="btn" name="continue" data-qa-id="add_new_email">
         <span><span>{% trans "Add address" %}</span></span>
       </button>
       {% blocktrans %}or <a href="/">cancel</a>{% endblocktrans %}

=== modified file 'src/webui/templates/account/new_email.html'
--- src/webui/templates/account/new_email.html	2013-04-17 13:23:35 +0000
+++ src/webui/templates/account/new_email.html	2013-06-13 00:15:30 +0000
@@ -28,7 +28,9 @@
             {% endif %}
         </p>
         <p class="actions">
-            <button type="submit" class="btn" name="continue"><span><span>{% trans "Send instructions" %}</span></span></button>
+            <button type="submit" class="btn" name="continue" data-qa-id="send_instructions_confirm_email">
+                <span><span>{% trans "Send instructions" %}</span></span>
+            </button>
             {% trans "or" %}
             <a href=".">{% trans "cancel" %}</a>
         </p>

=== modified file 'src/webui/templates/device/addition-generic.html'
--- src/webui/templates/device/addition-generic.html	2013-05-15 07:47:10 +0000
+++ src/webui/templates/device/addition-generic.html	2013-06-13 00:15:30 +0000
@@ -74,10 +74,11 @@
   <p>
     <input type="hidden" name="type" value="{{ type }}">
     <input type="hidden" name="hex_key" value="{{ hex_key }}">
-    <button class="btn" type="submit" data-qa-id="add_generic_device">
+    <button class="btn" type="submit" data-qa-id="confirm_add_device">
       <span><span>{% trans "Add device" %}</span></span>
     </button>
-    {% trans "or" %} <a data-qa-id="cancel" href="{{ device_list_path }}">{% trans "cancel" %}</a>
+    {% trans "or" %}
+    <a data-qa-id="cancel_add_device" href="{{ device_list_path }}">{% trans "cancel" %}</a>
   </p>
 
 </form>

=== modified file 'src/webui/templates/device/generate-codes.html'
--- src/webui/templates/device/generate-codes.html	2013-05-31 03:13:32 +0000
+++ src/webui/templates/device/generate-codes.html	2013-06-13 00:15:30 +0000
@@ -29,10 +29,11 @@
 <form method="post">
   {% csrf_token %}
   <p>
-    <button class="btn" type="submit" data-qa-id="confirm-codes">
+    <button class="btn" type="submit" data-qa-id="confirm_new_codes">
       <span><span>{% trans "Confirm new codes" %}</span></span>
     </button>
-    {% trans "or" %} <a href="{% url 'device-print' device_id %}" data-qa-id="cancel">{% trans "cancel" %}</a>
+    {% trans "or" %}
+    <a href="{% url 'device-print' device_id %}" data-qa-id="cancel_new_codes">{% trans "cancel" %}</a>
   </p>
 </form>
 {% endblock %}

=== modified file 'src/webui/templates/device/list.html'
--- src/webui/templates/device/list.html	2013-06-07 21:07:00 +0000
+++ src/webui/templates/device/list.html	2013-06-13 00:15:30 +0000
@@ -56,7 +56,7 @@
               <span>{% trans "Delete" %}</span>
             </a>
             {% if device.device_type == 'paper' %}
-            <a class="btn-sm" href="{% url 'device-print' device.id %}">
+            <a class="btn-sm" href="{% url 'device-print' device.id %}" data-qa-id="print_device">
               <span>{% trans "View Codes" %}</span>
             </a>
             {% endif %}

=== modified file 'src/webui/templates/device/print-codes.html'
--- src/webui/templates/device/print-codes.html	2013-05-21 15:50:20 +0000
+++ src/webui/templates/device/print-codes.html	2013-06-13 00:15:30 +0000
@@ -23,13 +23,15 @@
 {% include 'device/code-list.html' %}
 
 <p>
-  <a class="btn" id="printbtn" onclick="window.print()" data-qa-id="print_btn"><span><span>{% trans "Print Codes" %}</span></span>
+  <a class="btn" id="printbtn" onclick="window.print()" data-qa-id="print_codes">
+    <span><span>{% trans "Print Codes" %}</span></span>
   </a>
   {% if generation_enabled %}
   <a class="btn" href="{% url 'device-generate' device_id %}" data-qa-id="generate_codes">
     <span><span>{% trans "Generate new codes" %}</span></span>
   </a>
   {% endif %}
-  {% trans "or" %} <a href="{% url 'device-list' %}" data-qa-id="go_back">{% trans "go back to device list" %}</a>
+  {% trans "or" %}
+  <a href="{% url 'device-list' %}" data-qa-id="cancel_print_codes">{% trans "go back to device list" %}</a>
 </p>
 {% endblock %}

=== modified file 'src/webui/templates/device/removal.html'
--- src/webui/templates/device/removal.html	2013-05-15 07:47:10 +0000
+++ src/webui/templates/device/removal.html	2013-06-13 00:15:30 +0000
@@ -30,7 +30,8 @@
     <button class="btn" type="submit" data-qa-id="delete_this_device">
       <span><span>{% trans "Delete this device" %}</span></span>
     </button>
-    {% trans "or" %} <a data-qa-id="cancel_deleting_this_device" href="{{ device_list_path }}">{% trans "cancel" %}</a>
+    {% trans "or" %}
+    <a data-qa-id="cancel_deleting_this_device" href="{{ device_list_path }}">{% trans "cancel" %}</a>
   </p>
 </form>
 

=== modified file 'src/webui/templates/device/rename.html'
--- src/webui/templates/device/rename.html	2013-06-07 21:07:00 +0000
+++ src/webui/templates/device/rename.html	2013-06-13 00:15:30 +0000
@@ -22,7 +22,7 @@
 <form method="post" action="">
   {% csrf_token %}
 
-  <p><label>
+  <p><label for="id_name">
       {% trans "Name:" %}<br>
       {{ form.name }}
       {% if form.name.errors %}

=== modified file 'src/webui/templates/device/types.html'
--- src/webui/templates/device/types.html	2013-05-22 19:42:47 +0000
+++ src/webui/templates/device/types.html	2013-06-13 00:15:30 +0000
@@ -62,7 +62,8 @@
     <button class="btn" type="submit" data-qa-id="add_device_from_type">
       <span><span>{% trans "Add device" %}</span></span>
     </button>
-    {% trans "or" %} <a data-qa-id="cancel" href="{{ device_list_path }}">{% trans "cancel" %}</a>
+    {% trans "or" %}
+    <a data-qa-id="cancel_add_device_from_type" href="{{ device_list_path }}">{% trans "cancel" %}</a>
   </p>
   <p>
     {% blocktrans with "twofactor_faq"|static_url as 2FFAQ %}

=== modified file 'src/webui/templates/enter_token.html'
--- src/webui/templates/enter_token.html	2013-05-31 03:13:32 +0000
+++ src/webui/templates/enter_token.html	2013-06-13 00:15:30 +0000
@@ -20,14 +20,14 @@
 
 <form method="post">
   {% csrf_token %}
-  <p>
+  <p class="input-row">
       <label for="id_token">{% trans "Confirmation code" %}</label><br />
       {{ form.confirmation_code }}
       {% if form.confirmation_code.errors %}
           <span class="error">{{ form.confirmation_code.errors|join:"" }}</span>
       {% endif %}
   </p>
-  <p>
+  <p class="input-row">
       <label for="id_email">{% trans "Email address" %}</label><br />
       {{ form.email }}
       {% if form.email.errors %}
@@ -35,7 +35,7 @@
       {% endif %}
   </p>
 
-  <p><button class="btn" type="submit" name="continue">
+  <p><button class="btn" type="submit" name="continue" data-qa-id="confirm_enter_token">
       <span><span>{% trans "Confirm" %}</span></span></button></p>
 </form>
 

=== modified file 'src/webui/templates/launchpad/base.html'
--- src/webui/templates/launchpad/base.html	2013-05-15 08:30:15 +0000
+++ src/webui/templates/launchpad/base.html	2013-06-13 00:15:30 +0000
@@ -9,7 +9,7 @@
 {% load i18n %}
 {% load static_url %}
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr" {% block html_extra %}{% endblock %}>
-    <head>
+    <head data-qa-id="brand_launchpad">
         <title>{% block title %}{% trans "Log in" %}{% endblock %}</title>
         <link rel="shortcut icon" href="{{ STATIC_URL }}identityprovider/launchpad/favicon.png" />
         <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}identityprovider/launchpad/styles.css"/>
@@ -38,7 +38,7 @@
                         {% if user.is_authenticated %}
                             {% include "widgets/launchpad/logout-button.html" %}
                         {% else %}
-                            <a href="/+login">{% trans "Log in or create account" %}</a>
+                            {% include "widgets/launchpad/login-button.html" %}
                         {% endif %}
                     </div>
                 </div>
@@ -71,12 +71,6 @@
                         {% endfor %}
                     {% endif %}
 
-                    {% if readonly %}
-                        <div class="message">
-                            {% blocktrans %}We are currently in read-only mode. That means that at the moment you can't create new accounts, update your personal information, or request password reminders.{% endblocktrans %}
-                        </div>
-                    {% endif %}
-
                     <div id="{% block content_id %}box{% endblock %}">
                         {% block content %}{% endblock %}
                     </div>

=== modified file 'src/webui/templates/launchpad/registration/confirm_new_account.html'
--- src/webui/templates/launchpad/registration/confirm_new_account.html	2013-05-15 07:25:13 +0000
+++ src/webui/templates/launchpad/registration/confirm_new_account.html	2013-06-13 00:15:30 +0000
@@ -6,6 +6,8 @@
 GNU Affero General Public License version 3 (see the file  LICENSE).
 {% endcomment %}
 
+{% block html_extra %}data-qa-id="confirm_new_account"{% endblock %}
+
 {% block title %}{% trans "Complete creating your account" %}{% endblock %}
 
 {% block extra_header_top %}
@@ -15,7 +17,7 @@
 {% endblock %}
 
 {% block text_title %}
-  <h1 class="main" data-qa-id="confirm_new_account">{% blocktrans %}Complete creating your {{ brand_description }} account{% endblocktrans %}</h1>
+  <h1 class="main">{% blocktrans %}Complete creating your {{ brand_description }} account{% endblocktrans %}</h1>
 {% endblock %}
 
 {% block content_id %}auth{% endblock %}
@@ -26,7 +28,9 @@
 <form id="login-form" class="longfields" method="post" name="loginform">
   {% csrf_token %}
   <p class="actions">
-    <button type="submit" name="continue" class="btn"><span><span>{% trans "Complete account creation" %}</span></span></button>
+    <button type="submit" name="continue" class="btn" data-qa-id="complete_account_creation">
+        <span><span>{% trans "Complete account creation" %}</span></span>
+    </button>
     {% trans "or" %}
     {% include "common/cancel_link.html" %}
   </p>

=== modified file 'src/webui/templates/launchpad/registration/email_sent.html'
--- src/webui/templates/launchpad/registration/email_sent.html	2013-04-17 13:23:35 +0000
+++ src/webui/templates/launchpad/registration/email_sent.html	2013-06-13 00:15:30 +0000
@@ -7,6 +7,8 @@
 GNU Affero General Public License version 3 (see the file  LICENSE).
 {% endcomment %}
 
+{% block html_extra %}data-qa-id="forgot_password_step_2"{% endblock %}
+
 {% block title %}{{ email_heading }}{% endblock %}
 
 {% block text_title %}
@@ -36,7 +38,7 @@
         <input id="confirmation_code" name="confirmation_code" type="text" class="textType" />
         <input type="hidden" name="email" value="{{ email }}" />
       </p>
-      <p><button id="submit" type="submit" class="btn" disabled="true">
+      <p><button id="submit" type="submit" class="btn" data-qa-id="confirm_email_from_code">
           <span><span>{% trans "Confirm" %}</span></span>
         </button>
         {% url 'account-emails' as emails_url %}

=== modified file 'src/webui/templates/launchpad/registration/forgot_password.html'
--- src/webui/templates/launchpad/registration/forgot_password.html	2013-02-27 20:45:16 +0000
+++ src/webui/templates/launchpad/registration/forgot_password.html	2013-06-13 00:15:30 +0000
@@ -6,6 +6,8 @@
 GNU Affero General Public License version 3 (see the file  LICENSE).
 {% endcomment %}
 
+{% block html_extra %}data-qa-id="forgot_password_step_1"{% endblock %}
+
 {% block title %}{% trans "Reset password" %}{% endblock %}
 
 {% block text_title %}
@@ -32,7 +34,9 @@
             </span>
         </p>
         <p class="actions">
-            <button type="submit" name="continue" class="btn"><span><span>{% trans "Send instructions" %}</span></span></button>
+            <button type="submit" name="continue" class="btn" data-qa-id="send_password_reset_token">
+                <span><span>{% trans "Send instructions" %}</span></span>
+            </button>
             {% trans "or" %}
             {% include "common/cancel_link.html" %}
         </p>

=== modified file 'src/webui/templates/launchpad/registration/login.html'
--- src/webui/templates/launchpad/registration/login.html	2013-06-05 17:09:49 +0000
+++ src/webui/templates/launchpad/registration/login.html	2013-06-13 00:15:30 +0000
@@ -74,7 +74,9 @@
 {% endif %}
         <div class="actions">
             {% if next %}<input type="hidden" name="next" value="{{ next }}" />{% endif %}
-            <button type="submit" class="btn" name="continue" data-qa-id="login_button"><span><span>{% trans "Log in" %}</span></span></button>
+            <button type="submit" class="btn" name="continue" data-qa-id="login_button">
+                <span><span>{% trans "Log in" %}</span></span>
+            </button>
             {% if token %}{% trans "or" %}
             {% include "common/cancel_link.html" %}{% endif %}
         </div>

=== modified file 'src/webui/templates/launchpad/registration/logout.html'
--- src/webui/templates/launchpad/registration/logout.html	2013-02-27 20:45:16 +0000
+++ src/webui/templates/launchpad/registration/logout.html	2013-06-13 00:15:30 +0000
@@ -6,6 +6,8 @@
 GNU Affero General Public License version 3 (see the file  LICENSE).
 {% endcomment %}
 
+{% block html_extra %}data-qa-id="logout"{% endblock %}
+
 {% block title %}{% trans "You have been logged out" %}{% endblock %}
 
 {% block text_title %}

=== modified file 'src/webui/templates/launchpad/registration/new_account.html'
--- src/webui/templates/launchpad/registration/new_account.html	2013-05-03 15:30:36 +0000
+++ src/webui/templates/launchpad/registration/new_account.html	2013-06-13 00:15:30 +0000
@@ -8,6 +8,8 @@
 LICENSE).
 {% endcomment %}
 
+{% block html_extra %}data-qa-id="new_account"{% endblock %}
+
 {% block title %}{% trans "Create account" %}{% endblock %}
 
 {% block extra_header_top %}
@@ -75,7 +77,9 @@
             <input type="hidden" name="old" value="old">
             {% endif %}
 
-            <button type="submit" class="btn" name="continue"><span><span>{% trans "Send instructions" %}</span></span></button>
+            <button type="submit" class="btn" name="continue" data-qa-id="register_button">
+                <span><span>{% trans "Send instructions" %}</span></span>
+            </button>
             {% trans "or" %}
             {% include "common/cancel_link.html" %}
         </p>

=== modified file 'src/webui/templates/launchpad/registration/reset_password.html'
--- src/webui/templates/launchpad/registration/reset_password.html	2013-04-10 13:32:29 +0000
+++ src/webui/templates/launchpad/registration/reset_password.html	2013-06-13 00:15:30 +0000
@@ -6,6 +6,8 @@
 GNU Affero General Public License version 3 (see the file  LICENSE).
 {% endcomment %}
 
+{% block html_extra %}data-qa-id="reset_password"{% endblock %}
+
 {% block title %}{% trans "Reset password" %}{% endblock %}
 
 {% block extra_header_top %}
@@ -61,7 +63,7 @@
     {% csrf_token %}
     {% include "widgets/passwords.html" %}
         <p class="actions">
-          <button type="submit" name="continue" class="btn">
+          <button type="submit" name="continue" class="btn" data-qa-id="reset_password">
             <span><span>{% trans "Reset password" %}</span></span>
           </button>
           {% trans "or" %}

=== modified file 'src/webui/templates/launchpad/registration/twofactor.html'
--- src/webui/templates/launchpad/registration/twofactor.html	2013-04-17 13:23:35 +0000
+++ src/webui/templates/launchpad/registration/twofactor.html	2013-06-13 00:15:30 +0000
@@ -3,6 +3,8 @@
 {% load i18n %}
 {% load static_url %}
 
+{% block html_extra %}data-qa-id="two_factor_verify"{% endblock %}
+
 {% block content %}
 <div id="mainbar">
   <div id="auth">
@@ -41,7 +43,9 @@
 
         <div class="actions">
             {% if next %}<input type="hidden" name="next" value="{{ next }}" />{% endif %}
-            <button type="submit" class="btn" name="continue"><span><span>{% trans "Authenticate" %}</span></span></button>
+            <button type="submit" class="btn" name="continue" data-qa-id="auth_button">
+                <span><span>{% trans "Authenticate" %}</span></span>
+            </button>
             {% if token %}{% trans "or" %}
             {% include "common/cancel_link.html" %}{% endif %}
         </div>

=== modified file 'src/webui/templates/menu_item.html'
--- src/webui/templates/menu_item.html	2012-12-04 18:51:42 +0000
+++ src/webui/templates/menu_item.html	2013-06-13 00:15:30 +0000
@@ -3,10 +3,16 @@
 GNU Affero General Public License version 3 (see the file  LICENSE).
 {% endcomment %}
 
-<li id="{{ section }}">
+<li id="{{ section }}" data-qa-id="{{ section }}">
   {% ifequal section current_section %}
-    <span class="active">{{ label }}</span>
+    <span class="active" {% if extra_qa_data_id %}data-qa-id="{{ extra_qa_data_id }}"{% endif %}>
+        {{ label }}
+    </span>
   {% else %}
-    <a id="{{ section }}-link" href="{{ link }}">{{ label }}</a>
+    <a id="{{ section }}-link" data-qa-id="{{ section }}_link" href="{{ link }}">
+        <span {% if extra_qa_data_id %}data-qa-id="{{ extra_qa_data_id }}"{% endif %}>
+            {{ label }}
+        </span>
+    </a>
   {% endifequal %}
 </li>

=== modified file 'src/webui/templates/select_language.html'
--- src/webui/templates/select_language.html	2013-04-10 13:32:29 +0000
+++ src/webui/templates/select_language.html	2013-06-13 00:15:30 +0000
@@ -22,6 +22,7 @@
         <input type="hidden" name="next" value="{{next}}" />
         <input type="hidden" name="language" value="{{lang.0}}" />
         <div><input type="submit" name="submit" value="{{lang.1|capfirst}}"
+            data-qa-id="choose_language"
             style="background: transparent url('{{ STATIC_URL }}identityprovider/flags/{{lang.0}}.png') center left no-repeat" />
         </div>
     </form>

=== modified file 'src/webui/templates/ubuntu/base.html'
--- src/webui/templates/ubuntu/base.html	2013-05-15 07:47:10 +0000
+++ src/webui/templates/ubuntu/base.html	2013-06-13 00:15:30 +0000
@@ -9,7 +9,7 @@
 {% load i18n %}
 {% load static_url %}
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr" {% block html_extra %}{% endblock %}>
-    <head>
+    <head data-qa-id="brand_ubuntu">
         <title>{% block title %}{% trans "Log in" %}{% endblock %}</title>
         <link rel="icon" type="image/vnd.microsoft.icon" href="{{ STATIC_URL }}identityprovider/ubuntu/favicon.ico" />
         <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}identityprovider/reset.css"/>
@@ -46,7 +46,7 @@
         {% block extra_header %}{% endblock %}
         <meta name="viewport" content="width=400" />
     </head>
-    <body {% block bodyclass %}class="onecol"{% endblock %} {% if embedded %}onload="blank_targets()"{% endif %}>
+    <body data-qa-id="{% block qaid %}{% endblock %}" {% block bodyclass %}class="onecol"{% endblock %} {% if embedded %}onload="blank_targets()"{% endif %}>
         <div id="container">
             <div id="container-inner">
                 <div id="header">

=== modified file 'src/webui/templates/ubuntu/registration/confirm_new_account.html'
--- src/webui/templates/ubuntu/registration/confirm_new_account.html	2013-05-15 07:47:10 +0000
+++ src/webui/templates/ubuntu/registration/confirm_new_account.html	2013-06-13 00:15:30 +0000
@@ -28,7 +28,9 @@
 <form id="login-form" class="longfields" method="post" name="loginform">
   {% csrf_token %}
   <p class="actions">
-    <button type="submit" name="continue" class="btn"><span><span>{% trans "Complete account creation" %}</span></span></button>
+    <button type="submit" name="continue" class="btn" data-qa-id="complete_account_creation">
+        <span><span>{% trans "Complete account creation" %}</span></span>
+    </button>
     {% trans "or" %}
     {% include "common/cancel_link.html" %}
   </p>

=== modified file 'src/webui/templates/ubuntu/registration/email_sent.html'
--- src/webui/templates/ubuntu/registration/email_sent.html	2013-05-15 07:52:08 +0000
+++ src/webui/templates/ubuntu/registration/email_sent.html	2013-06-13 00:15:30 +0000
@@ -38,7 +38,7 @@
         <input id="confirmation_code" name="confirmation_code" type="text" class="textType" />
         <input type="hidden" name="email" value="{{ email }}" />
       </p>
-      <p><button id="submit" type="submit" class="btn" disabled="true">
+      <p><button id="submit" type="submit" class="btn" data-qa-id="confirm_email_from_code">
           <span><span>{% trans "Confirm" %}</span></span>
         </button>
         {% url 'account-emails' as emails_url %}

=== modified file 'src/webui/templates/ubuntu/registration/forgot_password.html'
--- src/webui/templates/ubuntu/registration/forgot_password.html	2013-05-15 07:47:10 +0000
+++ src/webui/templates/ubuntu/registration/forgot_password.html	2013-06-13 00:15:30 +0000
@@ -34,10 +34,11 @@
             </span>
         </p>
         <p class="actions">
-            <button type="submit" name="continue" class="btn"><span><span>{% trans "Send instructions" %}</span></span></button>
+            <button type="submit" name="continue" class="btn" data-qa-id="send_password_reset_token">
+                <span><span>{% trans "Send instructions" %}</span></span>
+            </button>
             {% trans "or" %}
             {% include "common/cancel_link.html" %}
         </p>
     </form>
-
 {% endblock %}

=== modified file 'src/webui/templates/ubuntu/registration/login.html'
--- src/webui/templates/ubuntu/registration/login.html	2013-06-05 17:09:49 +0000
+++ src/webui/templates/ubuntu/registration/login.html	2013-06-13 00:15:30 +0000
@@ -77,7 +77,9 @@
 
         <div class="actions">
             {% if next %}<input type="hidden" name="next" value="{{ next }}" />{% endif %}
-            <button type="submit" class="btn" name="continue" data-qa-id="login_button"><span><span>{% trans "Log in" %}</span></span></button>
+            <button type="submit" class="btn" name="continue" data-qa-id="login_button">
+                <span><span>{% trans "Log in" %}</span></span>
+            </button>
             {% if token %}{% trans "or" %}
             {% include "common/cancel_link.html" %}{% endif %}
         </div>

=== modified file 'src/webui/templates/ubuntu/registration/new_account.html'
--- src/webui/templates/ubuntu/registration/new_account.html	2013-05-15 07:52:08 +0000
+++ src/webui/templates/ubuntu/registration/new_account.html	2013-06-13 00:15:30 +0000
@@ -77,7 +77,9 @@
             <input type="hidden" name="old" value="old">
             {% endif %}
 
-            <button type="submit" class="btn" name="continue"><span><span>{% trans "Send instructions" %}</span></span></button>
+            <button type="submit" class="btn" name="continue" data-qa-id="register_button">
+                <span><span>{% trans "Send instructions" %}</span></span>
+            </button>
             {% trans "or" %}
             {% include "common/cancel_link.html" %}
         </p>
@@ -85,5 +87,4 @@
     <script type="text/javascript">
         document.newaccountform.displayname.focus();
     </script>
-
 {% endblock %}

=== modified file 'src/webui/templates/ubuntu/registration/reset_password.html'
--- src/webui/templates/ubuntu/registration/reset_password.html	2013-05-15 07:47:10 +0000
+++ src/webui/templates/ubuntu/registration/reset_password.html	2013-06-13 00:15:30 +0000
@@ -63,7 +63,7 @@
     {% csrf_token %}
     {% include "widgets/passwords.html" %}
         <p class="actions">
-          <button type="submit" name="continue" class="btn">
+          <button type="submit" name="continue" class="btn" data-qa-id="reset_password">
             <span><span>{% trans "Reset password" %}</span></span>
           </button>
           {% trans "or" %}
@@ -71,5 +71,4 @@
         </p>
         <div style="clear: both">&nbsp;</div>
     </form>
-
 {% endblock %}

=== modified file 'src/webui/templates/ubuntu/registration/twofactor.html'
--- src/webui/templates/ubuntu/registration/twofactor.html	2013-06-07 03:39:56 +0000
+++ src/webui/templates/ubuntu/registration/twofactor.html	2013-06-13 00:15:30 +0000
@@ -42,7 +42,9 @@
 
         <div class="actions">
             {% if next %}<input type="hidden" name="next" value="{{ next }}" />{% endif %}
-            <button type="submit" class="btn" name="continue" data-qa-id="auth_button"><span><span>{% trans "Authenticate" %}</span></span></button>
+            <button type="submit" class="btn" name="continue" data-qa-id="auth_button">
+                <span><span>{% trans "Authenticate" %}</span></span>
+            </button>
             {% if token %}{% trans "or" %}
             {% include "common/cancel_link.html" %}{% endif %}
         </div>

=== modified file 'src/webui/templates/ubuntuone/account/applications.html'
--- src/webui/templates/ubuntuone/account/applications.html	2013-05-15 07:52:08 +0000
+++ src/webui/templates/ubuntuone/account/applications.html	2013-06-13 00:15:30 +0000
@@ -28,13 +28,13 @@
         <tbody>
             {% for token in tokens %}
             <tr>
-                <td>{{ token.name }}</td>
+                <td data-qa-id="application_token">{{ token.name }}</td>
                 <td class="application-date">{{ token.created_at|date:"Y/m/d" }}</td>
                 <td class="actions">
                     <form action="{% url 'applications' %}" method="post">
                         {% csrf_token %}
                         <input type="hidden" name="token_id" value="{{ token.token }}" />
-                        <button type="submit" class="cta btn-sm secondary" name="Delete">
+                        <button type="submit" class="cta btn-sm secondary" name="Delete" data-qa-id="delete_application">
                             <span>{% trans "Delete" %}</span>
                         </button>
                     </form>
@@ -44,8 +44,6 @@
         </tbody>
     </table>
 </section>
-
-
 {% else %}
 <p>{% trans "You don't have any applications associated with this account." %}</p>
 {% endif %}

=== modified file 'src/webui/templates/ubuntuone/account/confirm_new_email.html'
--- src/webui/templates/ubuntuone/account/confirm_new_email.html	2013-05-31 03:30:26 +0000
+++ src/webui/templates/ubuntuone/account/confirm_new_email.html	2013-06-13 00:15:30 +0000
@@ -22,10 +22,10 @@
     {% csrf_token %}
     <p>
       <input type="hidden" name="post" value="yes" />
-      <button type="submit" name="continue" class="btn cta">
+      <button type="submit" name="continue" class="btn cta" data-qa-id="confirm_email_validation">
         <span>{% trans "Yes, I'm sure" %}</span>
       </button>
-      <a class="cta secondary" href="{% if token %}/{{ token }}{% endif %}/">{% trans "Cancel" %}</a>
+      <a class="cta secondary" href="{% if token %}/{{ token }}{% endif %}/" data-qa-id="cancel_email_validation">{% trans "Cancel" %}</a>
     </p>
   </form>
 </div>

=== modified file 'src/webui/templates/ubuntuone/account/delete_email.html'
--- src/webui/templates/ubuntuone/account/delete_email.html	2013-05-31 03:13:32 +0000
+++ src/webui/templates/ubuntuone/account/delete_email.html	2013-06-13 00:15:30 +0000
@@ -24,7 +24,9 @@
         <form action="" method="POST">
             {% csrf_token %}
             <p>
-                <button type="submit" class="cta" name="delete"><span>{% trans "Yes, delete" %}</span></button>
+                <button type="submit" class="btn cta" name="delete" data-qa-id="confirm_delete_email">
+                    <span>{% trans "Yes, delete" %}</span>
+                </button>
                 {% include "common/cancel_link.html" %}
             </p>
         </form>

=== modified file 'src/webui/templates/ubuntuone/account/edit.html'
--- src/webui/templates/ubuntuone/account/edit.html	2013-05-30 09:21:29 +0000
+++ src/webui/templates/ubuntuone/account/edit.html	2013-06-13 00:15:30 +0000
@@ -118,7 +118,9 @@
 
     <p class="actions">
     {% if not readonly %}
-        <button type="submit" class="btn cta" name="update"><span>{% trans "Save changes" %}</span></button>
+        <button type="submit" class="btn cta" name="update" data-qa-id="update_preferences">
+            <span>{% trans "Save changes" %}</span>
+        </button>
     {% endif %}
     {% if token %}
         {% trans "or" %}

=== modified file 'src/webui/templates/ubuntuone/account/emails.html'
--- src/webui/templates/ubuntuone/account/emails.html	2013-05-15 11:07:23 +0000
+++ src/webui/templates/ubuntuone/account/emails.html	2013-06-13 00:15:30 +0000
@@ -46,7 +46,9 @@
           {% if not readonly %}
             <td class="actions">
               {% if not email.is_preferred %}
-                <a href="./+remove-email?id={{ email.id }}" class="btn-sm" data-qa-id="remove_verified_email"><span>{% trans "Delete" %}</span></a>
+                <a href="./+remove-email?id={{ email.id }}" class="btn-sm" data-qa-id="remove_verified_email">
+                    <span>{% trans "Delete" %}</span>
+                </a>
               {% endif %}
             </td>
           {% endif %}
@@ -73,7 +75,9 @@
               {% if email.is_verifiable %}
               <a href="./+verify-email?id={{ email.id }}" data-qa-id="verify_unverified_{{ email }}" class="verify-email btn-sm"><span>{% trans "Verify" %}</span></a>
               {% endif %}
-              <a href="./+remove-email?id={{ email.id }}" data-qa-id="delete_unverified_{{ email }}" class="btn-sm"><span>{% trans "Delete" %}</span></a>
+              <a href="./+remove-email?id={{ email.id }}" data-qa-id="delete_unverified_{{ email }}" class="btn-sm">
+                <span>{% trans "Delete" %}</span>
+              </a>
             </td>
           {% endif %}
         </tr>
@@ -101,7 +105,7 @@
         {% endif %}
       </div>
       <p class="actions">
-        <button type="submit" class="btn cta" name="continue">
+        <button type="submit" class="btn cta" name="continue" data-qa-id="add_new_email">
           <span>{% trans "Add address" %}</span>
         </button>
         <a class="cta secondary" href="/">{% trans "Cancel" %}</a>

=== modified file 'src/webui/templates/ubuntuone/account/new_email.html'
--- src/webui/templates/ubuntuone/account/new_email.html	2013-05-14 13:11:47 +0000
+++ src/webui/templates/ubuntuone/account/new_email.html	2013-06-13 00:15:30 +0000
@@ -25,7 +25,9 @@
             {% endif %}
         </p>
         <p class="actions">
-            <button type="submit" class="btn cta" name="continue"><span>{% trans "Send instructions" %}</span></button>
+            <button type="submit" class="btn cta" name="continue" data-qa-id="send_instructions_confirm_email">
+                <span>{% trans "Send instructions" %}</span>
+            </button>
             <a class="cta secondary" href=".">{% trans "Cancel" %}</a>
         </p>
     </form>

=== modified file 'src/webui/templates/ubuntuone/base.html'
--- src/webui/templates/ubuntuone/base.html	2013-06-10 07:32:53 +0000
+++ src/webui/templates/ubuntuone/base.html	2013-06-13 00:15:30 +0000
@@ -3,7 +3,7 @@
 <!--[if IE 8 ]><html class="ie8" lang="en" dir="ltr"><![endif]-->
 <!--[if (gte IE 9)|!(IE)]><!--><html lang="en" dir="ltr" {% block html_extra %}{% endblock %}><!--<![endif]-->
 {% comment %}Copyright 2013 Canonical Ltd. This software is licensed under the GNU Affero General Public License version 3 (see the file LICENSE).{% endcomment %}
-<head>
+<head data-qa-id="brand_ubuntuone">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
     {% block extra_meta %}{% endblock %}

=== modified file 'src/webui/templates/ubuntuone/device/list.html'
--- src/webui/templates/ubuntuone/device/list.html	2013-05-15 07:52:08 +0000
+++ src/webui/templates/ubuntuone/device/list.html	2013-06-13 00:15:30 +0000
@@ -44,14 +44,14 @@
         <tr>
           <td class="name">{{ device.name }}</td>
           <td class="actions">
-              <a class="btn-sm" href="{% url 'device-rename' device.id %}">
+              <a class="btn-sm" href="{% url 'device-rename' device.id %}" data-qa-id="rename_device">
               <span>{% trans "Rename" %}</span>
             </a>
             <a class="btn-sm" href="{% url 'device-removal' device.id %}" data-qa-id="delete_device">
               <span>{% trans "Delete" %}</span>
             </a>
             {% if device.device_type == 'paper' %}
-            <a class="btn-sm" href="{% url 'device-print' device.id %}">
+            <a class="btn-sm" href="{% url 'device-print' device.id %}" data-qa-id="print_device">
               <span>{% trans "View Codes" %}</span>
             </a>
             {% endif %}
@@ -66,7 +66,9 @@
     <p>{% trans "You don't have any authentication devices associated with this account." %}</p>
   {% endif %}
 
-  <p><a data-qa-id="add_new_device" href="{{ device_addition_path }}">{% trans "Add a new authentication device" %}</a></p>
+  <p><a data-qa-id="add_new_device" href="{{ device_addition_path }}">
+    {% trans "Add a new authentication device" %}
+  </a></p>
 
   <p><a href="{% url 'device-help' %}">{% trans "Report a lost or stolen device" %}</a></p>
 

=== modified file 'src/webui/templates/ubuntuone/device/print-codes.html'
--- src/webui/templates/ubuntuone/device/print-codes.html	2013-05-21 15:50:20 +0000
+++ src/webui/templates/ubuntuone/device/print-codes.html	2013-06-13 00:15:30 +0000
@@ -27,12 +27,14 @@
 {% include 'device/code-list.html' %}
 
 <p>
-  <button class="btn cta" id="printbtn" onclick="window.print()" data-qa-id="print_btn"><span>{% trans "Print Codes" %}</span></button>
+  <button class="btn cta" id="printbtn" onclick="window.print()" data-qa-id="print_codes">
+    <span>{% trans "Print Codes" %}</span>
+  </button>
+  <a class="cta secondary" href="{% url 'device-list' %}" data-qa-id="cancel_print_codes">{% trans "Go back" %}</a>
   {% if generation_enabled %}
+  <a class="btn cta secondary print-new-codes" href="{% url 'device-generate' device_id %}" data-qa-id="generate_codes">
+    <span>{% trans "Generate new codes" %}</span>
+  </a>
   {% endif %}
-  <a class="cta secondary" href="{% url 'device-list' %}">{% trans "Go back" %}</a>
-  <a class="cta secondary print-new-codes" href="{% url 'device-generate' device_id %}">
-    <span>{% trans "Generate new codes" %}</span>
-</a>
 </p>
 {% endblock %}

=== modified file 'src/webui/templates/ubuntuone/device/rename.html'
--- src/webui/templates/ubuntuone/device/rename.html	2013-04-24 08:09:34 +0000
+++ src/webui/templates/ubuntuone/device/rename.html	2013-06-13 00:15:30 +0000
@@ -6,6 +6,8 @@
 Affero General Public License version 3 (see the file LICENSE).
 {% endcomment %}
 
+{% block html_extra %}data-qa-id="device_rename"{% endblock %}
+
 {% block title %}
   {% blocktrans %}{{ user }}'s devices{% endblocktrans %}
 {% endblock %}
@@ -27,10 +29,10 @@
   </label></p>
 
   <p>
-    <button class="btn cta" type="submit">
+    <button class="btn cta" type="submit" data-qa-id="rename_this_device">
       <span>{% trans "Rename" %}</span>
     </button>
-    <a class="cta secondary" href="{{ device_list_path }}">{% trans "Cancel" %}</a>
+    <a class="cta secondary" href="{{ device_list_path }}" data-qa-id="cancel_renaming_this_device">{% trans "Cancel" %}</a>
   </p>
 
 </form>

=== modified file 'src/webui/templates/ubuntuone/device/types.html'
--- src/webui/templates/ubuntuone/device/types.html	2013-05-22 19:42:47 +0000
+++ src/webui/templates/ubuntuone/device/types.html	2013-06-13 00:15:30 +0000
@@ -60,7 +60,7 @@
     <button class="btn cta" type="submit" data-qa-id="add_device_from_type">
       <span>{% trans "Add device" %}</span>
     </button>
-    <a class="cta secondary" data-qa-id="cancel" href="{{ device_list_path }}">{% trans "Cancel" %}</a>
+    <a class="cta secondary" data-qa-id="cancel_add_device_from_type" href="{{ device_list_path }}">{% trans "Cancel" %}</a>
   </p>
   <p>
     {% blocktrans with "twofactor_faq"|static_url as 2FFAQ %}

=== modified file 'src/webui/templates/ubuntuone/enter_token.html'
--- src/webui/templates/ubuntuone/enter_token.html	2013-05-31 03:13:32 +0000
+++ src/webui/templates/ubuntuone/enter_token.html	2013-06-13 00:15:30 +0000
@@ -35,7 +35,7 @@
       {% endif %}
   </p>
 
-  <p><button class="btn cta" type="submit" name="continue">
+  <p><button class="btn" type="submit" name="continue" data-qa-id="confirm_enter_token">
       <span><span>{% trans "Confirm" %}</span></span></button></p>
 </form>
 

=== modified file 'src/webui/templates/ubuntuone/registration/_create_account_form.html'
--- src/webui/templates/ubuntuone/registration/_create_account_form.html	2013-06-07 09:38:53 +0000
+++ src/webui/templates/ubuntuone/registration/_create_account_form.html	2013-06-13 00:15:30 +0000
@@ -66,7 +66,8 @@
         <input type="hidden" name="old" value="old">
         {% endif %}
 
-        <button type="submit" class="btn cta" name="continue"><span>{% trans "Create account" %}</span></button>
+        <button type="submit" class="btn cta" name="continue" data-qa-id="register_button">
+            <span>{% trans "Create account" %}</span>
+        </button>
     </div>
 </form>
-

=== modified file 'src/webui/templates/ubuntuone/registration/_login_form.html'
--- src/webui/templates/ubuntuone/registration/_login_form.html	2013-06-06 12:27:42 +0000
+++ src/webui/templates/ubuntuone/registration/_login_form.html	2013-06-13 00:15:30 +0000
@@ -40,7 +40,9 @@
 
     <div class="actions">
         {% if next %}<input type="hidden" name="next" value="{{ next }}">{% endif %}
-        <button type="submit" class="btn cta" name="continue" data-qa-id="login_button"><span>{% trans "Log in" %}</span></button>
+        <button type="submit" class="btn cta" name="continue" data-qa-id="login_button">
+            <span>{% trans "Log in" %}</span>
+        </button>
         <p class="forgot-password">{% include "common/forgot_password_link.html" %}</p>
 
         {% comment %}

=== modified file 'src/webui/templates/ubuntuone/registration/confirm_new_account.html'
--- src/webui/templates/ubuntuone/registration/confirm_new_account.html	2013-05-15 07:47:10 +0000
+++ src/webui/templates/ubuntuone/registration/confirm_new_account.html	2013-06-13 00:15:30 +0000
@@ -22,7 +22,9 @@
 <form id="login-form" class="longfields" method="post" name="loginform">
   {% csrf_token %}
   <p class="actions">
-    <button type="submit" name="continue" class="btn"><span><span>{% trans "Complete account creation" %}</span></span></button>
+    <button type="submit" name="continue" class="btn" data-qa-id="complete_account_creation">
+        <span><span>{% trans "Complete account creation" %}</span></span>
+    </button>
     {% trans "or" %}
     {% include "common/cancel_link.html" %}
   </p>

=== modified file 'src/webui/templates/ubuntuone/registration/email_sent.html'
--- src/webui/templates/ubuntuone/registration/email_sent.html	2013-05-28 16:59:50 +0000
+++ src/webui/templates/ubuntuone/registration/email_sent.html	2013-06-13 00:15:30 +0000
@@ -34,7 +34,7 @@
         <input id="confirmation_code" name="confirmation_code" type="text" class="textType" />
         <input type="hidden" name="email" value="{{ email }}" />
       </p>
-      <p><button id="submit" type="submit" class="btn cta" disabled="true">
+      <p><button id="submit" type="submit" class="btn cta" data-qa-id="confirm_email_from_code">
           <span>{% trans "Continue" %}</span>
         </button>
         {% url 'account-emails' as emails_url %}

=== modified file 'src/webui/templates/ubuntuone/registration/forgot_password.html'
--- src/webui/templates/ubuntuone/registration/forgot_password.html	2013-05-15 07:47:10 +0000
+++ src/webui/templates/ubuntuone/registration/forgot_password.html	2013-06-13 00:15:30 +0000
@@ -34,8 +34,9 @@
             </span>
         </p>
         <p class="actions">
-            <button type="submit" name="continue" class="btn cta"><span><span>{% trans "Continue" %}</span></span></button>
+            <button type="submit" name="continue" class="btn cta" data-qa-id="send_password_reset_token">
+                <span><span>{% trans "Continue" %}</span></span>
+            </button>
         </p>
     </form>
-
 {% endblock %}

=== modified file 'src/webui/templates/ubuntuone/registration/reset_password.html'
--- src/webui/templates/ubuntuone/registration/reset_password.html	2013-05-15 07:47:10 +0000
+++ src/webui/templates/ubuntuone/registration/reset_password.html	2013-06-13 00:15:30 +0000
@@ -18,15 +18,14 @@
 {% block content_id %}auth{% endblock %}
 
 {% block content %}
-    <p>8 characters minimum.</p>
+    <p>{% trans "8 characters minimum." %}</p>
     <form id="login-form" class="longfields" method="post">
     {% csrf_token %}
     {% include "widgets/ubuntuone/passwords.html" with edit_account_labels=1 fields=form %}
         <p class="actions">
-          <button type="submit" name="continue" class="btn cta">
+          <button type="submit" name="continue" class="btn cta" data-qa-id="reset_password">
             <span><span>{% trans "Continue" %}</span></span>
           </button>
         </p>
     </form>
-
 {% endblock %}

=== modified file 'src/webui/templates/ubuntuone/registration/twofactor.html'
--- src/webui/templates/ubuntuone/registration/twofactor.html	2013-05-15 07:52:08 +0000
+++ src/webui/templates/ubuntuone/registration/twofactor.html	2013-06-13 00:15:30 +0000
@@ -2,6 +2,8 @@
 
 {% load i18n %}
 
+{% block html_extra %}data-qa-id="two_factor_verify"{% endblock %}
+
 {% block extra_css %}
     {% if rpconfig and rpconfig.logo_url %}
     <style type="text/css" data-qa-id="test_2f_rp">
@@ -60,7 +62,9 @@
 
                 <div class="actions">
                     {% if next %}<input type="hidden" name="next" value="{{ next }}">{% endif %}
-                    <button type="submit" class="cta" name="continue"><span>{% trans "Authenticate" %}</span></button>
+                    <button type="submit" class="cta" name="continue" data-qa-id="auth_button">
+                        <span>{% trans "Authenticate" %}</span>
+                    </button>
                     {% if token %}{% trans "or" %}
                     {% include "common/cancel_link.html" %}{% endif %}
                 </div>

=== modified file 'src/webui/templates/ubuntuone/select_language.html'
--- src/webui/templates/ubuntuone/select_language.html	2013-04-11 10:43:00 +0000
+++ src/webui/templates/ubuntuone/select_language.html	2013-06-13 00:15:30 +0000
@@ -48,7 +48,9 @@
                 </p>
             {% endfor %}
 
-            <button type="submit" name="submit" class="cta">{% trans "Choose language" %}</button>
+            <button type="submit" name="submit" data-qa-id="choose_language" class="btn cta">
+                {% trans "Choose language" %}
+            </button>
         </form>
 
     </div>

=== modified file 'src/webui/templates/ubuntuone/server/decide.html'
--- src/webui/templates/ubuntuone/server/decide.html	2013-05-31 03:30:26 +0000
+++ src/webui/templates/ubuntuone/server/decide.html	2013-06-13 00:15:30 +0000
@@ -22,22 +22,23 @@
 
 
 <div class="info">
-    {% blocktrans %} You are logging in to <a data-qa-id="rp_backlink"
-        href="{{ trust_root }}">{{ trust_root }}</a>{% endblocktrans %}
+    <p data-qa-id="rp_login_title">{% blocktrans %} You are logging in to
+        <a data-qa-id="rp_backlink" href="{{ trust_root }}">{{ trust_root }}</a>
+    {% endblocktrans %}</p>
     {% if rpconfig %}
-    <p>{% blocktrans with site_name=rpconfig.displayname %}{{ site_name }} has
-    requested some personal information, please choose what you would like to
-    share:{% endblocktrans %}</p>
+        <p>{% blocktrans with site_name=rpconfig.displayname %}{{ site_name }} has
+        requested some personal information, please choose what you would like to
+        share:{% endblocktrans %}</p>
     {% else %}
-    <p>{% blocktrans %} The site has requested some personal information,
-    please choose what you would like to share:{% endblocktrans %}</p>
+        <p>{% blocktrans %} The site has requested some personal information,
+        please choose what you would like to share:{% endblocktrans %}</p>
     {% endif %}
 </div>
 
     <div class="actions">
         <form action="{{ action }}" method="POST" name="decideform">
             {% csrf_token %}
-            <div class="info-items">
+            <div data-qa-id="info-items" class="info-items">
                 {% if user_attribs_form.has_data or teams_form.has_data %}
                 <ul class="list">
                     {% if user_attribs_form.has_data %}
@@ -69,7 +70,9 @@
 
             <p>
                 <input type="hidden" name="ok" />
-                <button type="submit" class="cta" name="yes" data-qa-id="rp_confirm_login"><span><span>{% trans "Yes, log me in" %}</span></span></button>
+                <button type="submit" class="btn cta" name="yes" data-qa-id="rp_confirm_login">
+                    <span><span>{% trans "Yes, log me in" %}</span></span>
+                </button>
                 {% trans "or" %}
                 <a href="+cancel">{% trans "cancel" %}</a>
             </p>

=== added file 'src/webui/templates/widgets/launchpad/login-button.html'
--- src/webui/templates/widgets/launchpad/login-button.html	1970-01-01 00:00:00 +0000
+++ src/webui/templates/widgets/launchpad/login-button.html	2013-06-13 00:15:30 +0000
@@ -0,0 +1,12 @@
+{% comment %}
+Copyright 2010 Canonical Ltd.  This software is licensed under the
+GNU Affero General Public License version 3 (see the file  LICENSE).
+{% endcomment %}
+
+{% load i18n %}
+
+<span id="login" data-qa-id="login">
+    <a id="login-link" data-qa-id="login_link" href="{% url 'login' %}">
+        {% trans "Log in or create account" %}
+    </a>
+</span>

=== modified file 'src/webui/templates/widgets/launchpad/logout-button.html'
--- src/webui/templates/widgets/launchpad/logout-button.html	2013-06-05 15:22:18 +0000
+++ src/webui/templates/widgets/launchpad/logout-button.html	2013-06-13 00:15:30 +0000
@@ -1,16 +1,19 @@
 {% comment %}
-Copyright 2010 Canonical Ltd.  This software is licensed under the
-GNU Affero General Public License version 3 (see the file  LICENSE).
+Copyright 2010-2013 Canonical Ltd.  This software is licensed under
+the GNU Affero General Public License version 3 (see the file
+LICENSE).
 {% endcomment %}
 
 {% load i18n %}
 
-<form action="/+logout" method="post">
+<form action="{% url 'logout' %}" method="post" id="account" data-qa-id="account">
     {% csrf_token %}
     <input type="hidden" name="loggingout" value="1" />
-    {% if not readonly %}<a href="/+edit" class="sprite person">{% endif %}
+    {% if not readonly %}
+    <a href="{% url 'account-index' %}" id="account-link" data-qa-id="account_link" class="sprite person">
+    {% endif %}
     <span data-qa-id="user_name">{% if user.username %}{{ user.username }}{% else %}{{ user.displayname }}{% endif %}</span>
     {% if not readonly %}</a>{% endif %}
     &bull;
-    <input type="submit" name="logout" value="Log Out" />
+    <input type="submit" name="logout" id="logout-link" data-qa-id="logout_link" value="Log Out" />
 </form>

=== modified file 'src/webui/templates/widgets/passwords.html'
--- src/webui/templates/widgets/passwords.html	2012-12-18 18:37:03 +0000
+++ src/webui/templates/widgets/passwords.html	2013-06-13 00:15:30 +0000
@@ -22,7 +22,7 @@
     {% if form.password.errors %}
         <span class="error">{{ form.password.errors|first }}</span>
     {% endif %}
-    <span id="password_strength"></span>
+    <span id="password_strength" data-qa-id="password_strength"></span>
     <span class="formHelp">{{ form.password.help_text }}</span>
 </p>
 

=== modified file 'src/webui/templates/widgets/ubuntu/login-button.html'
--- src/webui/templates/widgets/ubuntu/login-button.html	2013-04-17 13:23:35 +0000
+++ src/webui/templates/widgets/ubuntu/login-button.html	2013-06-13 00:15:30 +0000
@@ -4,9 +4,9 @@
 {% endcomment %}
 
 {% load i18n %}
+{% load menu_item %}
 
 <ul>
-  <li id="login">
-    <a href="{% url 'login' %}" id="login-link">{% trans "Log in or create account" %}</a>
-  </li>
-</ul>
+  {% url 'login' as login_url %}
+  {% menu_item "login" _("Log in or create account") login_url %}
+<ul>

=== modified file 'src/webui/templates/widgets/ubuntu/logout-button.html'
--- src/webui/templates/widgets/ubuntu/logout-button.html	2013-04-17 13:23:35 +0000
+++ src/webui/templates/widgets/ubuntu/logout-button.html	2013-06-13 00:15:30 +0000
@@ -1,5 +1,5 @@
 {% comment %}
-Copyright 2010, 2012 Canonical Ltd.  This software is licensed under
+Copyright 2010-2013 Canonical Ltd.  This software is licensed under
 the GNU Affero General Public License version 3 (see the file
 LICENSE).
 {% endcomment %}
@@ -15,7 +15,7 @@
 {% else %}
     {% url 'account-index' as account_url %}
 {% endif %}
-{% menu_item "account" user.displayname account_url %}
+{% menu_item "account" user.displayname account_url extra_qa_data_id="user_name" %}
 
 {% if token and not readonly %}
     {% url 'account-edit' token=token as edit_url %}

=== modified file 'src/webui/templates/widgets/ubuntuone/header-me-menu.html'
--- src/webui/templates/widgets/ubuntuone/header-me-menu.html	2013-06-10 07:32:53 +0000
+++ src/webui/templates/widgets/ubuntuone/header-me-menu.html	2013-06-13 00:15:30 +0000
@@ -1,9 +1,15 @@
 {% load i18n %}
+{% load menu_item %}
+
 <ul>
 {% if user.is_authenticated %}
-    <li>
-        <span data-qa-id="user_name" class="user-name">{{user.displayname}}</span> <a href="{% url 'account-index' %}">{% trans "My account" %}</a> <span class="sep">|</span>
-        <a href="{% url 'logout' %}" id="logout-link">{% trans "Log out" %}</a>
+    <li id="account" data-qa-id="account">
+        <span data-qa-id="user_name" class="user-name">{{user.displayname}}</span>
+        <a href="{% url 'account-index' %}" id="account-link" data-qa-id="account_link">{% trans "My account" %}</a> <span class="sep">|</span>
+        <a href="{% url 'logout' %}" id="logout-link" data-qa-id="logout_link">{% trans "Log out" %}</a>
     </li>
+{% else %}
+  {% url 'login' as login_url %}
+  {% menu_item "login" _("Log in or Sign up") login_url %}
 {% endif %}
 </ul>

=== modified file 'src/webui/templates/widgets/ubuntuone/personal-menu.html'
--- src/webui/templates/widgets/ubuntuone/personal-menu.html	2013-06-03 06:32:02 +0000
+++ src/webui/templates/widgets/ubuntuone/personal-menu.html	2013-06-13 00:15:30 +0000
@@ -15,7 +15,7 @@
 {% else %}
     {% url 'account-index' as account_url %}
 {% endif %}
-{% menu_item "account" _("Personal details") account_url %}
+{% menu_item "account2" _("Personal details") account_url %}
 
 {% if not token and not readonly %}
   {% ifswitch TWOFACTOR %}

=== modified file 'src/webui/views/account.py'
--- src/webui/views/account.py	2013-05-16 13:24:00 +0000
+++ src/webui/views/account.py	2013-06-13 00:15:30 +0000
@@ -52,6 +52,7 @@
     get_rpconfig_from_request,
     require_testing_enabled,
 )
+from identityprovider.utils import get_current_brand
 
 from webui.decorators import (
     check_readonly,
@@ -334,7 +335,7 @@
 @sso_login_required
 @check_readonly
 def applications(request):
-    if settings.BRAND not in ('ubuntu', 'ubuntuone'):
+    if get_current_brand() not in ('ubuntu', 'ubuntuone'):
         raise Http404
 
     if request.method == 'POST':
@@ -349,7 +350,7 @@
                 pass
         return HttpResponseRedirect('/+applications')
     else:
-        tokens = request.user.oauth_tokens()
+        tokens = request.user.oauth_tokens().order_by('created_at')
         context = RequestContext(request, {
             'current_section': 'applications',
             'tokens': tokens,

=== modified file 'src/webui/views/ui.py'
--- src/webui/views/ui.py	2013-06-07 14:51:46 +0000
+++ src/webui/views/ui.py	2013-06-13 00:15:30 +0000
@@ -872,7 +872,7 @@
 
 
 def static_page(request, page_name):
-    if settings.BRAND not in ('ubuntu', 'ubuntuone'):
+    if get_current_brand() not in ('ubuntu', 'ubuntuone'):
         raise Http404
 
     return render_to_response('static/%s.html' % page_name,