Merge lp:~vila/ubuntuone-testing/trunk into lp:ubuntuone-testing

[Vincent Ladeuil]

Fix some tests after running against edge (6401)

This fixes issues encountered while running 'make test' with a config file pointing at the edge server.

Mostly there were cosmetic changes that requires some fixes to the tests (reminding me that we're mixing functional testing and design testing in our acceptance tests).

The -/+ buttons are currently missing on edge (and staging) in the /services/add-storage page, I've left the the mp url as a comment in the relevant tests (we probably need a better way to track that kind of bug with a pendig fix that will pass later).

I also fixed a couple of typos in the sso urls.

With these fixes in place, we went from:

 Ran 48 tests in 496.000s FAILED (failures=17, errors=1, skipped=12)

to

 Ran 48 tests in 935.033s FAILED (failures=12, errors=1, skipped=12)

The remaining failures are:

u1webf004_downloadfile
u1webp111_orderphotos
u1webp12_openphotostab
u1webp83_addphoto
u1webp107_openphoto

Only canonical employess can access the photos feature on edege, our <email address hidden> test user is only part of u1-hackers.

u1webf003_stoppublishingfile
u1webf002_publishfile
u1webf001_uploadfile
u1webf005_deletefile

I didn't fix these ones as I'm not sure on how do go there, roughly, it seems the tests should refresh the files tab before doing some assertions but it's unclear to me why this refresh wasn't needed before.

u1webse004_choosestorageamount

This one is still failing until the -/+ hidden buttons bug is fixed (see comment in the test for the mp url).

u1webc001_addcontact
u1webc002_editcontact
u1webc003_deletecontact

I suspect something has change in the page design but was unable to find a simple fix for them.

[Leo Arias (elopio)]

We moved the tests to ubuntuone-servers

Unmerged revisions

126. By Vincent Ladeuil on 2012-11-08

Fix some failures after running against edge (6401).

=== modified file '.bzrignore'
--- .bzrignore	2012-08-08 21:19:44 +0000
+++ .bzrignore	2012-11-08 08:24:33 +0000
@@ -7,6 +7,6 @@
 ubuntuone_testing_log
 testdata/*.file
 reports/*
-sourcecode
+sourcecode/*
 results
 local.cfg
\ No newline at end of file

=== added file 'EXPECTED_FAILURES'
--- EXPECTED_FAILURES	1970-01-01 00:00:00 +0000
+++ EXPECTED_FAILURES	2012-11-08 08:24:33 +0000
@@ -0,0 +1,32 @@
+u1webf004_downloadfile
+u1webp111_orderphotos
+u1webp12_openphotostab
+u1webp83_addphoto
+u1webp107_openphoto
+
+Only canonical employess can access the photos feature on edege, our
[e-mail] test user is only part of u1-hackers.
+
+u1webf003_stoppublishingfile
+u1webf002_publishfile
+u1webf001_uploadfile
+u1webf005_deletefile
+
+How to fix these ones is unclear: roughly, it seems the tests should refresh
+the files tab before doing some assertions but it's unclear to me why this
+refresh wasn't needed before.
+
+u1webse004_choosestorageamount
+
+Once
+https://code.launchpad.net/~stephen-stewart/ubuntuone-servers/one-services-strict-error/+merge/133299
+is deployed, this one is rumored to be fixed.
+
+u1webc001_addcontact
+u1webc002_editcontact
+u1webc003_deletecontact
+
+I suspect something has changed in the page design but was unable to find a
+simple fix for them.
+
+Ran 48 tests in 696.126s FAILED (failures=12, errors=2, skipped=12)
\ No newline at end of file

=== modified file 'ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py'
--- ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py	2012-08-08 21:18:53 +0000
+++ ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py	2012-11-08 08:24:33 +0000
@@ -20,14 +20,21 @@
 """
 
 from sst.actions import *
-import actions.setup as setup_actions
-import actions.account as account_actions
-from _passwords import full_name, email
-from config import environment
+from actions import (
+    account,
+    setup,
+)
+from config import (
+    schema,
+    environment,
+)
 
-setup_actions.setup()
-account_actions.open()
-account_actions.assert_account_details(full_name, email)
-account_actions.click_edit_account_details()
+setup.setup()
+account.open()
+config_values = schema.glue.schema_parser.values('DefaultUser')
+full_name = config_values.get('full_name')
+email = config_values.get('email_address')
+account.assert_account_details(full_name, email)
+account.click_edit_account_details()
 sso_url = environment.get_environment().sso_url
 assert_url(sso_url)

=== modified file 'ubuntuone/web/tests/sst/shared/actions/account.py'
--- ubuntuone/web/tests/sst/shared/actions/account.py	2011-12-09 18:19:11 +0000
+++ ubuntuone/web/tests/sst/shared/actions/account.py	2012-11-08 08:24:33 +0000
@@ -19,33 +19,41 @@
 from sst.actions import *
 import actions.header as header_actions
 
+
 def open():
     header_actions.open_my_account()
     assert_page_title(), 'My account should be opened'
 
+
 def assert_page_title():
     assert_title(u'Ubuntu One : Your Account')
 
+
 def assert_account_details(full_name, email):
     _assert_name(full_name)
     _assert_email(email)
     _assert_password('********')
 
+
 def _assert_name(full_name):
     name_element = _get_user_details_data_elements()[0]
     assert_text(name_element, full_name)
 
+
 def _assert_email(email):
     email_element = _get_user_details_data_elements()[1]
     assert_text(email_element, email)
 
+
 def _assert_password(password):
     password_element = _get_user_details_data_elements()[2]
     assert_text(password_element, password)
 
+
 def _get_user_details_data_elements():
     return get_elements_by_css('.user-details dd')
-             
+
+
 def click_edit_account_details():
     click_link(get_element(text='Edit your account details in Ubuntu Single '
                                 'Sign On'))

=== modified file 'ubuntuone/web/tests/sst/shared/actions/contacts.py'
--- ubuntuone/web/tests/sst/shared/actions/contacts.py	2012-07-12 18:10:29 +0000
+++ ubuntuone/web/tests/sst/shared/actions/contacts.py	2012-11-08 08:24:33 +0000
@@ -211,7 +211,7 @@
     if about_information.spouse_name:
         write_textfield('personal-spouse_name', about_information.spouse_name)
     if about_information.wedding_date:
-        write_textfield('personal-wedding_date', 
+        write_textfield('personal-wedding_date',
                         about_information.wedding_date)
     if about_information.notes:
         write_textfield('personal-notes', about_information.notes)

=== modified file 'ubuntuone/web/tests/sst/shared/actions/photos.py'
--- ubuntuone/web/tests/sst/shared/actions/photos.py	2012-08-06 19:52:17 +0000
+++ ubuntuone/web/tests/sst/shared/actions/photos.py	2012-11-08 08:24:33 +0000
@@ -52,18 +52,18 @@
 
 
 def _get_photo_link_in_list(photo_name):
-    return get_element('.photo-list a[data-u1name="%(name)s"]' 
+    return get_element('.photo-list a[data-u1name="%(name)s"]'
         % {'name': photo_name})
 
-        
+
 def _get_photo_links_in_list():
-    return get_elements('.photo-list a[data-u1name]') 
+    return get_elements('.photo-list a[data-u1name]')
 
 
 def get_photo_id(photo_name):
     photo_link = _get_photo_link_in_list(photo_name)
     return photo_link.get_attribute('data-u1nodekey')
-    
+
 
 def open_photo(photo_name):
     photo_element = _get_photo_element_in_list(photo_name)
@@ -83,7 +83,7 @@
        elem = photo_link.find_element_by_css_selector('img')
        elems.append(elem)
    return elems
-   
+
 
 # Gallery view actions.
 # TODO make sure we are viewing the photo gallery.
@@ -103,7 +103,7 @@
     photo_names = [str(elem.get_attribute('data-qa-id')) for elem in elems]
     return photo_names
 
-        
+
 def assert_photo_order_in_gallery(photo_names):
     names = _get_photo_names_from_gallery()
     assert_equal(names, list(photo_names))
@@ -116,7 +116,7 @@
 def sort_photo_order_oldest_first():
     set_dropdown_value('photo-order', 'Show oldest photos first')
 
-    
+
 def _get_photo_element_in_gallery(photo_id):
     photo_css_locator = _get_photo_element_css_locator_in_gallery(photo_id)
     return get_element_by_css(photo_css_locator)

=== modified file 'ubuntuone/web/tests/sst/shared/actions/privacy_policy.py'
--- ubuntuone/web/tests/sst/shared/actions/privacy_policy.py	2012-08-16 14:39:54 +0000
+++ ubuntuone/web/tests/sst/shared/actions/privacy_policy.py	2012-11-08 08:24:33 +0000
@@ -36,12 +36,13 @@
     assert_page_url()
     assert_page_title()
     assert_page_heading1()
-    
+
 
 def assert_page_url():
     base_url = get_base_url()
     assert_url(base_url + 'privacy/')
 
+
 def assert_page_title():
     assert_title(u'Ubuntu One : Privacy Policy')
 
@@ -50,4 +51,4 @@
     # XXX: There are many h1 elements on the page.
     # See https://bugs.launchpad.net/ubuntuone-servers/+bug/1037584
     heading1_element = get_element_by_css('header>h1')
-    assert_text(heading1_element, 'Privacy Policy')
+    assert_text(heading1_element, 'Canonical Privacy Policy')

=== modified file 'ubuntuone/web/tests/sst/shared/actions/services.py'
--- ubuntuone/web/tests/sst/shared/actions/services.py	2012-07-15 03:02:48 +0000
+++ ubuntuone/web/tests/sst/shared/actions/services.py	2012-11-08 08:24:33 +0000
@@ -66,10 +66,10 @@
     the expected.
 
     """
-    _assert_music_streaming_heading_text() 
-    get_element(css_class='try-free', text='Try for FREE')
+    _assert_music_streaming_heading_text()
+    get_element(css_class='six-free', text='6 months FREE')
     get_element(tag='li', text='Music streaming on your mobile')
-    get_element(tag='li', text='20 GB of Storage for all your data')
+    get_element(tag='li', text='20GB of Storage for all your data')
     get_element(tag='li', text='Listen offline')
     get_element(tag='li', text='$3.99 / month or $39.99 / year')
 
@@ -85,7 +85,7 @@
 
     """
     get_element(tag='h2', text='Storage')
-    get_element(tag='li', text='20 GB')
+    get_element(tag='li', text='20GB')
     get_element(tag='li', text='$2.99 / month')
     get_element(tag='li', text='$29.99 / year')
 
@@ -138,7 +138,7 @@
 
 
 def click_add_extra_storage():
-    add_extra_storage_link = get_element(text='Add extra Storage')
+    add_extra_storage_link = get_element(text='Add Extra Storage')
     click_link(add_extra_storage_link)
 
 
@@ -176,7 +176,7 @@
 
     """
     assert_text('qty', str(quantity))
-    assert_text('storage-gb', '%sGB' % (quantity * 20))
+    assert_text('total-storage', '%sGB' % (quantity * 20 + 5))
     monthly_price = quantity * 2.99
     assert_text('storage-monthly-price', '$%s' % monthly_price)
     annual_price = quantity * 29.99
@@ -185,6 +185,8 @@
 
 def increase_storage_quantity():
     """Click the button that increases the storage quantity to buy."""
+    # -/+ buttons missing on both edge and staging, told beuno
+    # https://code.launchpad.net/~stephen-stewart/ubuntuone-servers/one-services-strict-error/+merge/133299
     click_button('plus_qty')
 
 

=== modified file 'ubuntuone/web/tests/sst/shared/data/environment.py'
--- ubuntuone/web/tests/sst/shared/data/environment.py	2012-09-05 18:34:09 +0000
+++ ubuntuone/web/tests/sst/shared/data/environment.py	2012-11-08 08:24:33 +0000
@@ -17,9 +17,9 @@
 base_urls = {'staging': 'https://staging.one.ubuntu.com/',
              'edge': 'https://edge.one.ubuntu.com/',
              'production': 'https://one.ubuntu.com/'}
-sso_urls = {'staging': 'https://loging.staging.ubuntu.com/',
-            'edge': 'https://loging.ubuntu.com/',
-            'production': 'https://loging.ubuntu.com/'}
+sso_urls = {'staging': 'https://login.staging.ubuntu.com/',
+            'edge': 'https://login.ubuntu.com/',
+            'production': 'https://login.ubuntu.com/'}
 files_urls = {'staging': 'https://files.staging.one.ubuntu.com/',
               'edge': 'https://files.one.ubuntu.com/',
               'production': 'https://files.one.ubuntu.com/'}