Merge lp:~elopio/ubuntuone-testing/api-refactor into lp:ubuntuone-testing

[Leo Arias]

Bumped to new version of SST and did the whole renaming refactor.

Bumped to new version of SST and did the whole renaming refactor.

[Rick McBride (rmcbride)]

cool

review: Approve

=== modified file 'config-manager.txt'
--- config-manager.txt	2011-10-19 19:04:38 +0000
+++ config-manager.txt	2011-12-09 19:54:29 +0000
@@ -4,4 +4,4 @@
 #   make clean-sourcedeps update-sourcedeps
 #
 
-./sourcecode/selenium-simple-test        bzr+ssh://bazaar.launchpad.net/~canonical-isd-qa/selenium-simple-test/trunk;revno=205
+./sourcecode/selenium-simple-test        bzr+ssh://bazaar.launchpad.net/~canonical-isd-qa/selenium-simple-test/trunk;revno=222

=== modified file 'ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py'
--- ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py	2011-11-15 07:18:27 +0000
+++ ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py	2011-12-09 19:54:29 +0000
@@ -28,4 +28,4 @@
 account_actions.open()
 account_actions.assert_account_details(full_name, email)
 account_actions.click_edit_account_details()
-url_is('https://login.ubuntu.com/')
+assert_url('https://login.ubuntu.com/')

=== modified file 'ubuntuone/web/tests/sst/files/u1webf002_publishfile.py'
--- ubuntuone/web/tests/sst/files/u1webf002_publishfile.py	2011-11-17 21:59:58 +0000
+++ ubuntuone/web/tests/sst/files/u1webf002_publishfile.py	2011-12-09 19:54:29 +0000
@@ -45,4 +45,4 @@
 files_actions.publish_file(file_name)
 files_actions.assert_file_published(file_name)
 file_url = files_actions.go_to_public_url(file_name)
-text_is(get_element(tag='body'), file_contents)
+assert_text(get_element(tag='body'), file_contents)

=== modified file 'ubuntuone/web/tests/sst/files/u1webf003_stoppublishingfile.py'
--- ubuntuone/web/tests/sst/files/u1webf003_stoppublishingfile.py	2011-11-17 21:59:58 +0000
+++ ubuntuone/web/tests/sst/files/u1webf003_stoppublishingfile.py	2011-12-09 19:54:29 +0000
@@ -48,5 +48,5 @@
 files_actions.stop_publishing_file(file_name)
 files_actions.assert_file_not_published(file_name)
 set_base_url(base_url)
-goto(path)
-text_is(get_element(tag='body'), 'Could not locate object')
+go_to(path)
+assert_text(get_element(tag='body'), 'Could not locate object')

=== modified file 'ubuntuone/web/tests/sst/navigation/u1webn001_maintabs.py'
--- ubuntuone/web/tests/sst/navigation/u1webn001_maintabs.py	2011-11-24 05:13:14 +0000
+++ ubuntuone/web/tests/sst/navigation/u1webn001_maintabs.py	2011-12-09 19:54:29 +0000
@@ -23,10 +23,11 @@
 import actions.setup as setup_actions
 import actions.dashboard as dashboard_actions
 import actions.files as files_actions
+import actions.notes as notes_actions
 import actions.contacts as contacts_actions
 
 setup_actions.setup()
-dashboard_actions.assert_title()
+dashboard_actions.assert_page_title()
 files_actions.open()
 notes_actions.open()
 contacts_actions.open()

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py'
--- ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py	2011-11-24 04:58:16 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py	2011-12-09 19:54:29 +0000
@@ -33,7 +33,7 @@
 setup_actions.setup(new_user=True)
 services_actions.open()
 services_actions.buy_music_streaming_yearly()
-payment_actions.assert_title()
+payment_actions.assert_page_title()
 payment_actions.place_order_with_valid_card()
 payment_actions.confirm_payment_details()
 payment_confirmed_actions.assert_processed_payment('annually', 1, 39.99,

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py'
--- ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py	2011-12-02 15:01:13 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py	2011-12-09 19:54:29 +0000
@@ -32,7 +32,7 @@
 setup_actions.setup(new_user=True)
 services_actions.open()
 services_actions.buy_extra_storage()
-payment_actions.assert_title()
+payment_actions.assert_page_title()
 payment_actions.place_order_with_valid_card()
 payment_actions.confirm_payment_details()
 payment_confirmed_actions.assert_processed_payment('annually', 29.99, 29.99)

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py'
--- ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py	2011-11-24 04:58:16 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py	2011-12-09 19:54:29 +0000
@@ -32,8 +32,8 @@
 setup_actions.setup()
 services_actions.open()
 services_actions.buy_music_streaming()
-payment_actions.assert_title()
+payment_actions.assert_page_title()
 payment_actions.place_order_with_refused_card()
 payment_actions.confirm_payment_details()
-payment_confirmed_actions.assert_title()
+payment_confirmed_actions.assert_page_title()
 payment_confirmed_actions.assert_failed_payment()

=== modified file 'ubuntuone/web/tests/sst/services/u1webse002_musicstreamingmonthly.py'
--- ubuntuone/web/tests/sst/services/u1webse002_musicstreamingmonthly.py	2011-09-22 06:27:21 +0000
+++ ubuntuone/web/tests/sst/services/u1webse002_musicstreamingmonthly.py	2011-12-09 19:54:29 +0000
@@ -28,5 +28,5 @@
 setup_actions.setup()
 services_actions.open()
 services_actions.buy_music_streaming_monthly()
-payment_actions.assert_title()
+payment_actions.assert_page_title()
 payment_actions.assert_monthly_music_streaming_subscription()

=== modified file 'ubuntuone/web/tests/sst/services/u1webse003_musicstreamingannually.py'
--- ubuntuone/web/tests/sst/services/u1webse003_musicstreamingannually.py	2011-09-22 06:27:21 +0000
+++ ubuntuone/web/tests/sst/services/u1webse003_musicstreamingannually.py	2011-12-09 19:54:29 +0000
@@ -28,5 +28,5 @@
 setup_actions.setup()
 services_actions.open()
 services_actions.buy_music_streaming_yearly()
-payment_actions.assert_title()
+payment_actions.assert_page_title()
 payment_actions.assert_annually_music_streaming_subscription()

=== modified file 'ubuntuone/web/tests/sst/services/u1webse004_choosestorageamount.py'
--- ubuntuone/web/tests/sst/services/u1webse004_choosestorageamount.py	2011-11-15 19:11:36 +0000
+++ ubuntuone/web/tests/sst/services/u1webse004_choosestorageamount.py	2011-12-09 19:54:29 +0000
@@ -38,6 +38,6 @@
     services_actions.assert_storage(quantity)
 services_actions.set_storage_quantity('25')
 # Move the focus out of the textfield.
-element_click('storage-gb')
+click_element('storage-gb')
 sleep(1)
 services_actions.assert_storage(25)

=== modified file 'ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py'
--- ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py	2011-09-22 06:27:21 +0000
+++ ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py	2011-12-09 19:54:29 +0000
@@ -29,5 +29,5 @@
 services_actions.open()
 services_actions.set_storage_quantity(5)
 services_actions.buy_extra_storage_monthly()
-payment_actions.assert_title()
+payment_actions.assert_page_title()
 payment_actions.assert_monthly_extra_storage_subscription(5)

=== modified file 'ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py'
--- ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py	2011-09-22 06:27:21 +0000
+++ ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py	2011-12-09 19:54:29 +0000
@@ -29,5 +29,5 @@
 services_actions.open()
 services_actions.set_storage_quantity(5)
 services_actions.buy_extra_storage_yearly()
-payment_actions.assert_title()
+payment_actions.assert_page_title()
 payment_actions.assert_annually_extra_storage_subscription(5)

=== modified file 'ubuntuone/web/tests/sst/session/u1webs002_login.py'
--- ubuntuone/web/tests/sst/session/u1webs002_login.py	2011-11-15 07:18:27 +0000
+++ ubuntuone/web/tests/sst/session/u1webs002_login.py	2011-12-09 19:54:29 +0000
@@ -26,6 +26,6 @@
 from _passwords import full_name
 
 setup_actions.setup(new_user=False)
-dashboard_actions.assert_title()
+dashboard_actions.assert_page_title()
 header_actions.assert_login(full_name)
 dashboard_actions.assert_welcome_message(full_name)

=== modified file 'ubuntuone/web/tests/sst/shared/actions/account.py'
--- ubuntuone/web/tests/sst/shared/actions/account.py	2011-11-15 07:18:27 +0000
+++ ubuntuone/web/tests/sst/shared/actions/account.py	2011-12-09 19:54:29 +0000
@@ -21,10 +21,10 @@
 
 def open():
     header_actions.open_my_account()
-    assert_title(), 'My account should be opened'
+    assert_page_title(), 'My account should be opened'
 
-def assert_title():
-    title_is(u'Ubuntu One : Your Account')
+def assert_page_title():
+    assert_title(u'Ubuntu One : Your Account')
 
 def assert_account_details(full_name, email):
     _assert_name(full_name)
@@ -33,19 +33,19 @@
 
 def _assert_name(full_name):
     name_element = _get_user_details_data_elements()[0]
-    text_is(name_element, full_name)
+    assert_text(name_element, full_name)
 
 def _assert_email(email):
     email_element = _get_user_details_data_elements()[1]
-    text_is(email_element, email)
+    assert_text(email_element, email)
 
 def _assert_password(password):
     password_element = _get_user_details_data_elements()[2]
-    text_is(password_element, password)
+    assert_text(password_element, password)
 
 def _get_user_details_data_elements():
     return get_elements_by_css('.user-details dd')
              
 def click_edit_account_details():
-    link_click(get_element(text='Edit your account details in Ubuntu Single '
+    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	2011-11-15 19:12:12 +0000
+++ ubuntuone/web/tests/sst/shared/actions/contacts.py	2011-12-09 19:54:29 +0000
@@ -22,16 +22,16 @@
 
 def open():
     """Open the Contacts page and assert it's title."""
-    link_click(_get_contacts_link())
+    click_link(_get_contacts_link())
     switch_to_window()
-    assert_title()
+    assert_page_title()
 
 def _get_contacts_link():
     return get_element_by_css('#main-nav .contacts')
 
-def assert_title():
+def assert_page_title():
     """Assert that the title of the page is the expected."""
-    title_is(u'Ubuntu One : Contacts')
+    assert_title(u'Ubuntu One : Contacts')
 
 def add_contact(contact):
     """Add a new contact.
@@ -41,11 +41,11 @@
 
     """
     link_add = get_element(css_class='add-button')
-    link_click(link_add)
+    click_link(link_add)
     wait_for_action_to_complete()
     _fill_contact(contact)
     link_save = get_elements(css_class='save-button')[0]
-    element_click(link_save)
+    click_element(link_save)
     wait_for_action_to_complete()
 
 def edit_contact(edited_contact):
@@ -56,11 +56,11 @@
 
     """
     link_edit = get_element(css_class='edit-button')
-    element_click(link_edit)
+    click_element(link_edit)
     wait_for_action_to_complete()
     _fill_contact(edited_contact)
     link_save = get_elements(css_class='save-button')[0]
-    element_click(link_save)
+    click_element(link_save)
     wait_for_action_to_complete()
 
 def _fill_contact(contact):
@@ -91,15 +91,15 @@
 
     """
     if name.title:
-        textfield_write('names-title', name.title)
+        write_textfield('names-title', name.title)
     if name.first_name:
-        textfield_write('names-first_name', name.first_name)
+        write_textfield('names-first_name', name.first_name)
     if name.middle_name:
-        textfield_write('names-middle_name', name.middle_name)
+        write_textfield('names-middle_name', name.middle_name)
     if name.last_name:
-        textfield_write('names-last_name', name.last_name)
+        write_textfield('names-last_name', name.last_name)
     if name.suffix:
-        textfield_write('names-suffix', name.suffix)
+        write_textfield('names-suffix', name.suffix)
     
 def _fill_contact_emails(emails):
     """Fill the contact emails information.
@@ -109,10 +109,10 @@
 
     """
     for index, email in enumerate(emails):
-        set_select('%d-email_addresses-description' % index, 
+        set_dropdown_value('%d-email_addresses-description' % index, 
                         email.description)
-        textfield_write('%d-email_addresses-address' % index, email.address)
-        element_click('add-email-address')
+        write_textfield('%d-email_addresses-address' % index, email.address)
+        click_element('add-email-address')
 
 def _fill_contact_phones(phones):
     """Fill the contact phones information.
@@ -122,9 +122,9 @@
 
     """
     for index, phone in enumerate(phones):
-        set_select('%d-phone_numbers-description' % index, phone.description)
-        textfield_write('%d-phone_numbers-number' % index, phone.number)
-        element_click('add-phone-number')
+        set_dropdown_value('%d-phone_numbers-description' % index, phone.description)
+        write_textfield('%d-phone_numbers-number' % index, phone.number)
+        click_element('add-phone-number')
         
 def _fill_contact_addresses(addresses):
     """Fill the contact addresses information.
@@ -134,15 +134,15 @@
     
     """
     for index, address in enumerate(addresses):
-        set_select('%d-addresses-description' % index, address.description)
-        textfield_write('%d-addresses-address1' % index, address.address1)
-        textfield_write('%d-addresses-address2' % index, address.address2)
-        textfield_write('%d-addresses-pobox' % index, address.po_box)
-        textfield_write('%d-addresses-city' % index, address.city)
-        textfield_write('%d-addresses-state' % index, address.state)
-        textfield_write('%d-addresses-postalcode' % index, address.postal_code)
-        textfield_write('%d-addresses-country' % index, address.country)
-        element_click('add-postal-address')
+        set_dropdown_value('%d-addresses-description' % index, address.description)
+        write_textfield('%d-addresses-address1' % index, address.address1)
+        write_textfield('%d-addresses-address2' % index, address.address2)
+        write_textfield('%d-addresses-pobox' % index, address.po_box)
+        write_textfield('%d-addresses-city' % index, address.city)
+        write_textfield('%d-addresses-state' % index, address.state)
+        write_textfield('%d-addresses-postalcode' % index, address.postal_code)
+        write_textfield('%d-addresses-country' % index, address.country)
+        click_element('add-postal-address')
 
 def _fill_contact_instant_messaging_addresses(instant_messaging_addresses):
     """Fill the contact instant messaging information.
@@ -152,9 +152,9 @@
 
     """
     for index, address in enumerate(instant_messaging_addresses):
-        set_select('%d-im_addresses-description' % index, address.description)
-        textfield_write('%d-im_addresses-address' % index, address.address)
-        element_click('add-im-address')
+        set_dropdown_value('%d-im_addresses-description' % index, address.description)
+        write_textfield('%d-im_addresses-address' % index, address.address)
+        click_element('add-im-address')
 
 def _fill_contact_urls(urls):
     """Fill the contact URLs information.
@@ -164,9 +164,9 @@
 
     """
     for index, url in enumerate(urls):
-        textfield_write('%d-urls-description' % index, url.description)
-        textfield_write('%d--urls-address' % index, url.url)
-        element_click('add-url')
+        write_textfield('%d-urls-description' % index, url.description)
+        write_textfield('%d--urls-address' % index, url.url)
+        click_element('add-url')
 
 def _fill_contact_role(role):
     """Fill the contact role information.
@@ -176,15 +176,15 @@
 
     """
     if role.company:
-        textfield_write('work-company', role.company)
+        write_textfield('work-company', role.company)
     if role.department:
-        textfield_write('work-department', role.department)
+        write_textfield('work-department', role.department)
     if role.job_title:
-        textfield_write('work-job_title', role.job_title)
+        write_textfield('work-job_title', role.job_title)
     if role.manager_name:
-        textfield_write('work-manager_name', role.manager_name)
+        write_textfield('work-manager_name', role.manager_name)
     if role.assitant_name:
-        textfield_write('work-assistant_name', role.assistant_name)
+        write_textfield('work-assistant_name', role.assistant_name)
 
 def _fill_contact_about_information(about_information):
     """Fill the additional information about the contact.
@@ -194,16 +194,16 @@
 
     """
     if about_information.nickname:
-        textfield_write('personal-nick_name', about_information.nickname)
+        write_textfield('personal-nick_name', about_information.nickname)
     if about_information.birth_date:
-        textfield_write('personal-birth_date', about_information.birth_date)
+        write_textfield('personal-birth_date', about_information.birth_date)
     if about_information.spouse_name:
-        textfield_write('personal-spouse_name', about_information.spouse_name)
+        write_textfield('personal-spouse_name', about_information.spouse_name)
     if about_information.wedding_date:
-        textfield_write('personal-wedding_date', 
+        write_textfield('personal-wedding_date', 
                         about_information.wedding_date)
     if about_information.notes:
-        textfield_write('personal-notes', about_information.notes)
+        write_textfield('personal-notes', about_information.notes)
 
 def assert_contact_information(contact):
     """Assert that the information of the displayed contact is the expected.
@@ -252,10 +252,10 @@
     display_name = _get_contact_display_name_in_list(contact_information.name)
     element_contact = _get_element_contact_record(contact_identifier)
     element_name = element_contact.find_element_by_css_selector('.name a')
-    text_is(element_name, display_name)
+    assert_text(element_name, display_name)
     if contact_information.emails:
         element_email = element_contact.find_element_by_css_selector('.email')
-        text_is(element_email, contact_information.emails[0].address)
+        assert_text(element_email, contact_information.emails[0].address)
 
 def _get_contact_display_name_in_list(name):
     """Get the expected name to display in the contacts list.
@@ -314,7 +314,7 @@
             names.append(name.suffix)
         display_name = ' '.join(names)
     label = get_element_by_css('#names>h1')
-    text_is(label, display_name)
+    assert_text(label, display_name)
 
 def _assert_contact_emails(emails):
     """Assert that the email addresses of the displayed contact are the 
@@ -327,8 +327,8 @@
     elements_email_descriptions = get_elements_by_css('#email_addresses dt')
     elements_email_addresses = get_elements_by_css('#email_addresses a')
     for index, email in enumerate(emails):
-        text_is(elements_email_descriptions[index], '%s:' % email.description)
-        text_is(elements_email_addresses[index], email.address)
+        assert_text(elements_email_descriptions[index], '%s:' % email.description)
+        assert_text(elements_email_addresses[index], email.address)
 
 def delete_contact():
     """Delete the opened contact."""
@@ -336,9 +336,9 @@
     element_contact = _get_element_contact_record(contact_identifier)
     element_contact_checkbox = element_contact. \
         find_element_by_css_selector('.contact-delete-checkbox')
-    checkbox_set(element_contact_checkbox, True)
-    element_click('delete-selected')
-    alert_accept('Delete selected contacts?')
+    set_checkbox_value(element_contact_checkbox, True)
+    click_element('delete-selected')
+    accept_alert('Delete selected contacts?')
     wait_for_action_to_complete()
 
 def assert_contact_exists(identifier):

=== modified file 'ubuntuone/web/tests/sst/shared/actions/dashboard.py'
--- ubuntuone/web/tests/sst/shared/actions/dashboard.py	2011-11-15 06:58:55 +0000
+++ ubuntuone/web/tests/sst/shared/actions/dashboard.py	2011-12-09 19:54:29 +0000
@@ -19,17 +19,17 @@
 from sst.actions import *
 
 def open():
-    link_click(_get_dashboard_link())
-    assert_title(), 'Dashboard should be opened'
+    click_link(_get_dashboard_link())
+    assert_page_title(), 'Dashboard should be opened'
 
 def _get_dashboard_link():
     return get_element_by_css('#main-nav .dashboard')
 
-def assert_title():
-    title_is(u'Ubuntu One : Dashboard')
+def assert_page_title():
+    assert_title(u'Ubuntu One : Dashboard')
 
 def assert_welcome_message(user_full_name):
-    text_is(_get_welcome_element(), 'Hi %s! Welcome Back' % user_full_name)
+    assert_text(_get_welcome_element(), 'Hi %s! Welcome Back' % user_full_name)
     
 def _get_welcome_element():
     return get_element_by_css('header > hgroup > h1')

=== modified file 'ubuntuone/web/tests/sst/shared/actions/files.py'
--- ubuntuone/web/tests/sst/shared/actions/files.py	2011-11-24 05:09:54 +0000
+++ ubuntuone/web/tests/sst/shared/actions/files.py	2011-12-09 19:54:29 +0000
@@ -26,34 +26,34 @@
 
 def open():
     """Open the files page and assert it's title."""
-    link_click(_get_files_link())
+    click_link(_get_files_link())
     switch_to_window()
-    assert_title()
+    assert_page_title()
 
 def _get_files_link():
     return get_element_by_css('#main-nav .files')
 
-def assert_title():
+def assert_page_title():
     """Assert that the title of the page is the expected."""
-    title_is(u'Ubuntu One : My Storage')
+    assert_title(u'Ubuntu One : My Storage')
 
 def click_upload_file():
     """Click the Upload file button and wait for the upload overlay 
     to appear.
 
     """
-    element_click('upload-file-button', wait=False)
+    click_element('upload-file-button', wait=False)
     upload_overlay = get_element(id='upload-overlay')
-    waitfor(upload_overlay.is_displayed)
+    wait_for(upload_overlay.is_displayed)
 
 def click_new_folder():
     """Click the New folder link and wait for the new folder overlay
     to appear.
     
     """
-    element_click('new-folder-button', wait=False)
+    click_element('new-folder-button', wait=False)
     new_folder_overlay = get_element(id='new-folder-overlay')
-    waitfor(new_folder_overlay.is_displayed)
+    wait_for(new_folder_overlay.is_displayed)
 
 def upload_file(path):
     """Upload a file.
@@ -65,7 +65,7 @@
     click_upload_file()
     input_file = _get_elem('upload-overlay-file')
     input_file.send_keys(path)
-    button_click('upload-overlay-upload-button')
+    click_button('upload-overlay-upload-button')
     # TODO set a waiting time proportional to the size of the file to upload.
     wait_for_action_to_complete()
 
@@ -137,7 +137,7 @@
     element_file_row = get_file_row_element(name)
     element_more = element_file_row.find_element_by_xpath(
         'td[@class="files-td-expander expand-row-link"]/a')
-    element_click(element_more)
+    click_element(element_more)
 
 def show_file_details(name):
     if not _are_details_shown:
@@ -209,7 +209,7 @@
     # XXX this element requires an identifier.
     element_file_type = get_element_by_xpath('id("%s-details")//li[3]/strong'
                                              % _get_file_identifier(name))
-    text_is(element_file_type, type)
+    assert_text(element_file_type, type)
 
 def publish_file(name):
     """Publish a file.
@@ -220,7 +220,7 @@
     """
     show_file_details(name)
     identifier = _get_file_identifier(name)
-    element_click(_get_link_publish_file(identifier))
+    click_element(_get_link_publish_file(identifier))
     wait_for_action_to_complete()
 
 def assert_file_published(name):
@@ -257,7 +257,7 @@
 def go_to_public_url(name):
     base_url, path = get_public_url(name)
     set_base_url(base_url)
-    goto(path)
+    go_to(path)
 
 def stop_publishing_file(name):
     """Stop publishing a file.
@@ -268,7 +268,7 @@
     """
     show_file_details(name)
     identifier = _get_file_identifier(name)
-    element_click(_get_link_stop_publishing_file(identifier))
+    click_element(_get_link_stop_publishing_file(identifier))
     wait_for_action_to_complete()
 
 def assert_file_not_published(name):
@@ -294,7 +294,7 @@
     """
     show_file_details(name)
     identifier = _get_file_identifier(name)
-    link_click(_get_link_download_file(identifier))
+    click_link(_get_link_download_file(identifier))
 
 def get_download_url(name):
     """Get the downlaod link of a file stored on the Ubuntu One service.
@@ -316,8 +316,8 @@
 
     """
     click_new_folder()
-    textfield_write('new-folder-overlay-name', name)
-    button_click('new-folder-overlay-create-button')
+    write_textfield('new-folder-overlay-name', name)
+    click_button('new-folder-overlay-create-button')
     wait_for_action_to_complete()
 
 def _get_link_share_folder(identifier):
@@ -350,7 +350,7 @@
     """
     element_row = get_file_row_element(name)
     link_folder = element_row.find_element_by_css_selector('a')
-    element_click(link_folder)
+    click_element(link_folder)
     wait_for_action_to_complete()
 
 def assert_breadcrumb(*path):
@@ -361,8 +361,8 @@
 
     """
     breadcrumbs = get_elements(css_class='breadcrumb')
-    text_is(breadcrumbs[0], 'My Storage')
-    map(text_is, breadcrumbs[1:], path)
+    assert_text(breadcrumbs[0], 'My Storage')
+    map(assert_text, breadcrumbs[1:], path)
 
 def go_to_breadcrumb(*path):
     """Open a folder from the breadcrumb path.
@@ -378,7 +378,7 @@
         url += 'f/' + '/'.join(escaped_path)
     element_breadcrumb_link = get_element_by_css('.breadcrumb[href="%s"]' 
                                                  % url)
-    link_click(element_breadcrumb_link)
+    click_link(element_breadcrumb_link)
     wait_for_action_to_complete()
 
 def _fill_sharing_dialog(email, share_name, allow_modification=True):
@@ -392,9 +392,9 @@
         will be allowed to modify it. The default value is True.
 
     """
-    textfield_write('sharing-overlay-email', email)
-    textfield_write('sharing-overlay-name', share_name)
-    checkbox_set('sharing-overlay-readwrite', allow_modification)
+    write_textfield('sharing-overlay-email', email)
+    write_textfield('sharing-overlay-name', share_name)
+    set_checkbox_value('sharing-overlay-readwrite', allow_modification)
 
 def share_folder(name, email, share_name, allow_modification=True):
     """Share a folder.
@@ -411,11 +411,11 @@
     show_file_details(name)
     identifier = _get_file_identifier(name)
     link_share_folder = _get_link_share_folder(identifier)
-    element_click(link_share_folder)
+    click_element(link_share_folder)
     sharing_overlay = get_element(tag='*', id='sharing-overlay')
-    waitfor(sharing_overlay.is_displayed)
+    wait_for(sharing_overlay.is_displayed)
     _fill_sharing_dialog(email, share_name, allow_modification)
-    button_click('sharing-overlay-share-button')
+    click_button('sharing-overlay-share-button')
     wait_for_action_to_complete()
 
 def _get_shared_with_elements(name):
@@ -534,8 +534,8 @@
     show_file_details(name)
     link_stop_sharing = _get_stop_sharing_folder(name, email, date, 
                                                  allow_modification, accepted)
-    element_click(link_stop_sharing)
-    alert_accept()
+    click_element(link_stop_sharing)
+    accept_alert()
     wait_for_action_to_complete()
 
 def delete_file(name):
@@ -548,6 +548,6 @@
     show_file_details(name)
     identifier = _get_file_identifier(name)
     link_delete = _get_link_delete_file(identifier)
-    element_click(link_delete)
-    alert_accept()
+    click_element(link_delete)
+    accept_alert()
     wait_for_action_to_complete()

=== modified file 'ubuntuone/web/tests/sst/shared/actions/header.py'
--- ubuntuone/web/tests/sst/shared/actions/header.py	2011-12-02 06:28:29 +0000
+++ ubuntuone/web/tests/sst/shared/actions/header.py	2011-12-09 19:54:29 +0000
@@ -19,7 +19,7 @@
 from sst.actions import *
 
 def click_login_or_sign_up():
-    link_click(_get_login_or_sign_up_link())
+    click_link(_get_login_or_sign_up_link())
 
 def _get_login_or_sign_up_link():
     return get_element(text='Log in or Sign up')
@@ -31,7 +31,7 @@
 
 def _assert_full_name(full_name):
     welcome_element = get_element_by_css('#ac-status > span')
-    text_is(welcome_element, 'Welcome %s' % full_name[:40])
+    assert_text(welcome_element, 'Welcome %s' % full_name[:40])
 
 def _get_my_account_link():
     return get_element(tag='a', css_class='account', text='My Account')
@@ -40,10 +40,10 @@
     return get_element(tag='a', text='logout')
 
 def open_my_account():
-    link_click(_get_my_account_link())
+    click_link(_get_my_account_link())
 
 def logout():
-    link_click(_get_logout_link())
+    click_link(_get_logout_link())
 
 def assert_logout():
     _get_login_or_sign_up_link()

=== modified file 'ubuntuone/web/tests/sst/shared/actions/loading.py'
--- ubuntuone/web/tests/sst/shared/actions/loading.py	2011-11-15 19:12:12 +0000
+++ ubuntuone/web/tests/sst/shared/actions/loading.py	2011-12-09 19:54:29 +0000
@@ -28,5 +28,5 @@
     # the bar appears tests will fail.
     sleep(3)
     waiting_bar = get_element(css_class='yui3-busy-waiting')
-    waitfor(fails, is_displayed, waiting_bar)
+    wait_for(fails, assert_displayed, waiting_bar)
 

=== modified file 'ubuntuone/web/tests/sst/shared/actions/music.py'
--- ubuntuone/web/tests/sst/shared/actions/music.py	2011-12-08 22:59:44 +0000
+++ ubuntuone/web/tests/sst/shared/actions/music.py	2011-12-09 19:54:29 +0000
@@ -22,19 +22,19 @@
 
 def open():
     """Open the music page and assert it's title."""
-    # TODO when the music player is released, then we have to uncomment the following line and delete the goto,
+    # TODO when the music player is released, then we have to uncomment the following line and delete the go_to,
     # to access the tab properly.
-    #link_click(_get_music_link())
-    goto('music/player')
+    #click_link(_get_music_link())
+    go_to('music/player')
     switch_to_window()
-    assert_title()
+    assert_page_title()
 
 def _get_music_link():
     return get_element_by_css('#main-nav .music')
 
-def assert_title():
+def assert_page_title():
     """Assert that the title of the page is the expected."""
-    title_is(u'Ubuntu One : Music')
+    assert_title(u'Ubuntu One : Music')
 
 def play_song(song):
     _open_songs()
@@ -45,8 +45,8 @@
     song_play_button = get_element_by_css('tr[data-u1m-songid="%s"] > ' \
                                           'td.c1 > button' \
                                           % identifier)
-    button_click(song_play_button)
-    assert not song_play_button.is_displayed()
+    click_button(song_play_button)
+    assert not song_play_button.assert_displayed()
 
 def assert_songs_added_to_queue(songs_list):
     number_of_songs = len(songs_list)
@@ -65,7 +65,7 @@
     _assert_message_content(message_content)
 
 def _assert_message_displayed():
-    assert _get_message_element().is_displayed()
+    assert _get_message_element().assert_displayed()
 
 def _assert_message_content(message_content):
     assert _get_message_element().text == message_content
@@ -80,12 +80,12 @@
 
 def _select_song_by_id(identifier):
     song_checkbox = get_element_by_css('.c2 > input[value="%s"]' % identifier)
-    checkbox_set(song_checkbox, True)
+    set_checkbox_value(song_checkbox, True)
     
 def _open_songs():
     if not _is_songs_opened():
         songs_element = _get_songs_element()
-        element_click(songs_element)
+        click_element(songs_element)
         _wait_for_action_to_complete()
 
 def _is_songs_opened():
@@ -110,12 +110,12 @@
     assert expected_title == player_title_element.text
 
 def assert_player_playing():
-    assert _get_stop_button().is_displayed()
-    assert not _get_play_button().is_displayed()
+    assert _get_stop_button().assert_displayed()
+    assert not _get_play_button().assert_displayed()
 
 def assert_player_paused():
-    assert not _get_stop_button().is_displayed()
-    assert _get_play_button().is_displayed()
+    assert not _get_stop_button().assert_displayed()
+    assert _get_play_button().assert_displayed()
 
 def _get_stop_button():
     return get_element_by_css('#stop')
@@ -151,7 +151,7 @@
 
 def _open_now_playing():
     if not _is_now_playing_opened():
-        element_click(_get_now_playing_element())
+        click_element(_get_now_playing_element())
 
 def _is_now_playing_opened():
     now_playing_element = _get_now_playing_element()
@@ -174,4 +174,4 @@
     # the bar appears tests will fail.
     sleep(3)
     waiting_bar = get_element_by_css('.loading-view > .indicator')
-    waitfor(fails, is_displayed, waiting_bar)
+    wait_for(fails, assert_displayed, waiting_bar)

=== modified file 'ubuntuone/web/tests/sst/shared/actions/notes.py'
--- ubuntuone/web/tests/sst/shared/actions/notes.py	2011-11-17 02:19:20 +0000
+++ ubuntuone/web/tests/sst/shared/actions/notes.py	2011-12-09 19:54:29 +0000
@@ -23,18 +23,18 @@
 
 def open():
     """Open the notes page and check its title with an assert."""
-    link_click(_get_notes_link(), wait=False)
+    click_link(_get_notes_link(), wait=False)
     switch_to_window()
-    assert_title()
+    assert_page_title()
 
 
 def _get_notes_link():
     return get_element_by_css('#main-nav .notes')
 
 
-def assert_title():
+def assert_page_title():
     """Assert that the title of the page is the expected."""
-    title_is(u'Ubuntu One : Notes')
+    assert_title(u'Ubuntu One : Notes')
 
 
 def assert_note_exists(title):
@@ -42,7 +42,7 @@
 
 
 def select_note(title):
-    link_click(_get_note_link(title))
+    click_link(_get_note_link(title))
     wait_for_action_to_complete()
     
 
@@ -80,13 +80,13 @@
 
 def _click_add_note():
     link_add = get_element(css_class='add-button')
-    link_click(link_add)
+    click_link(link_add)
     wait_for_action_to_complete()
 
 
 def _fill(title, body):
     if title:
-        textfield_write('id_title', title)
+        write_textfield('id_title', title)
     if body:
         switch_to_frame('id_body_editor')
         body_element = get_element(tag='body')
@@ -98,7 +98,7 @@
 
 def _save():
     link_save = get_elements(css_class='save-button')[0]
-    element_click(link_save)
+    click_element(link_save)
     wait_for_action_to_complete()
 
 
@@ -111,7 +111,7 @@
 
 def _click_edit_note():
     link_edit = get_elements(css_class='edit-button')[0]
-    link_click(link_edit)
+    click_link(link_edit)
     wait_for_action_to_complete()
 
 
@@ -119,11 +119,11 @@
     """Delete the note"""
     select_note(title)
     delete_button = get_element_by_css('li.selected > a.delete-button')
-    element_click(delete_button)
-    alert_accept()
+    click_element(delete_button)
+    accept_alert()
     wait_for_action_to_complete()
 
 
 def assert_note_was_deleted(title):
     fails(assert_note_exists, title)
-    text_is('notes-main', '"%s" has been deleted' % title)
+    assert_text('notes-main', '"%s" has been deleted' % title)

=== modified file 'ubuntuone/web/tests/sst/shared/actions/payment.py'
--- ubuntuone/web/tests/sst/shared/actions/payment.py	2011-12-02 15:01:13 +0000
+++ ubuntuone/web/tests/sst/shared/actions/payment.py	2011-12-09 19:54:29 +0000
@@ -23,9 +23,9 @@
 from sst.actions import *
 from utils import paymentperiods
 
-def assert_title():
+def assert_page_title():
     """Assert that the title of the page is the expected."""
-    title_is(u'Ubuntu One : Checkout')
+    assert_title(u'Ubuntu One : Checkout')
 
 def assert_music_streaming_subscription(period):
     """Assert that the information of the new music streaming subscription 
@@ -144,11 +144,11 @@
     country -- The country of the address (default 'United States').
     
     """
-    textfield_write('id_street', street)
-    textfield_write('id_city', city)
-    textfield_write('id_state', state)
-    textfield_write('id_postal', postal_code)
-    set_select('id_country', country)
+    write_textfield('id_street', street)
+    write_textfield('id_city', city)
+    write_textfield('id_state', state)
+    write_textfield('id_postal', postal_code)
+    set_dropdown_value('id_country', country)
 
 def set_credit_card_details(card_type='Visa', name='Test Name',
                             number='4111111111111111', ccv='123',
@@ -167,12 +167,12 @@
     expiration_year -- The year of expiration (default '2015')
 
     """
-    set_select('id_card_type', card_type)
-    textfield_write('id_card_holder', name)
-    textfield_write('id_card_number', number)
-    textfield_write('id_card_ccv', ccv)
-    set_select('id_card_expiration_0', expiration_month)
-    set_select('id_card_expiration_1', expiration_year)
+    set_dropdown_value('id_card_type', card_type)
+    write_textfield('id_card_holder', name)
+    write_textfield('id_card_number', number)
+    write_textfield('id_card_ccv', ccv)
+    set_dropdown_value('id_card_expiration_0', expiration_month)
+    set_dropdown_value('id_card_expiration_1', expiration_year)
 
 def place_order_with_valid_card():
     """Place the order with a credit card that will be accepted on the
@@ -198,8 +198,8 @@
     the order.
 
     """
-    button_click(get_element(css_class='cta', value='Purchase'))
+    click_button(get_element(css_class='cta', value='Purchase'))
 
 def confirm_payment_details():
-    title_is(u'Ubuntu One : Confirm Payment Details')
-    link_click(get_element(css_class='cta', href='confirmed'))
+    assert_title(u'Ubuntu One : Confirm Payment Details')
+    click_link(get_element(css_class='cta', href='confirmed'))

=== modified file 'ubuntuone/web/tests/sst/shared/actions/payment_confirmed.py'
--- ubuntuone/web/tests/sst/shared/actions/payment_confirmed.py	2011-12-02 15:01:13 +0000
+++ ubuntuone/web/tests/sst/shared/actions/payment_confirmed.py	2011-12-09 19:54:29 +0000
@@ -23,9 +23,9 @@
 from datetime import datetime
 from utils import paymentperiods
 
-def assert_title():
+def assert_page_title():
     """Assert that the title of the page is the expected."""
-    title_is(u'Ubuntu One : Confirm Payment Details')
+    assert_title(u'Ubuntu One : Confirm Payment Details')
 
 def assert_failed_payment():
     """Assert that the payment failed."""
@@ -55,16 +55,16 @@
     # TODO assert the paid amount.
     # TODO assert payments in euros.
     element_expire_date = _get_purchase_details_data_elements()[0]
-    text_is(element_expire_date, expire_date.strftime('%B %-d, %Y'))
+    assert_text(element_expire_date, expire_date.strftime('%B %-d, %Y'))
     get_element(tag='p', css_class='explanation',
                 text='Your card will automatically be billed $%(price)s ' \
                      '%(period)s' % {'price': str(price), 'period': period})
     element_payment_status = _get_purchase_details_data_elements()[1]
-    text_is(element_payment_status, 'AUTHORISED')
+    assert_text(element_payment_status, 'AUTHORISED')
 
 def _get_purchase_details_data_elements():
     return get_elements_by_css('dl.purchase_details > dd')
 
 def view_account():
     """Go to the account information page."""
-    link_click(get_element(tag='a', text='View your account'))
+    click_link(get_element(tag='a', text='View your account'))

=== modified file 'ubuntuone/web/tests/sst/shared/actions/services.py'
--- ubuntuone/web/tests/sst/shared/actions/services.py	2011-12-02 06:28:00 +0000
+++ ubuntuone/web/tests/sst/shared/actions/services.py	2011-12-09 19:54:29 +0000
@@ -24,15 +24,15 @@
 
 def open():
     """Open the services page and assert it's title."""
-    goto('/services/')
-    assert_title()
+    go_to('/services/')
+    assert_page_title()
 
-def assert_title():
+def assert_page_title():
     """Assert that the title of the page is the expected."""
-    title_is(u'Ubuntu One : Services')
+    assert_title(u'Ubuntu One : Services')
 
 def agree_and_subscribe_to_free_plan():
-    button_click(get_element(name='subscribe'))
+    click_button(get_element(name='subscribe'))
 
 def assert_services_information():
     """Assert that the information about the services is the expected."""
@@ -80,18 +80,18 @@
 
 def buy_music_streaming_monthly():
     """Buy the monthly music streaming service."""
-    radio_select('ms1')
-    button_click(get_elements(css_class='buy-now',
+    set_radio_value('ms1')
+    click_button(get_elements(css_class='buy-now',
                               text='Buy now and go to checkout')[0])
 
 def buy_music_streaming_yearly():
     """Buy the yearly music streaming service."""
-    radio_select('ms2')
+    set_radio_value('ms2')
     buy_music_streaming()
 
 def buy_music_streaming():
     """Click the button to buy the music streaming service."""
-    button_click(get_elements(css_class='buy-now',
+    click_button(get_elements(css_class='buy-now',
                               text='Buy now and go to checkout')[0])
 
 def assert_storage(quantity):
@@ -101,20 +101,20 @@
     quantity -- The expected storage quantity.
 
     """
-    text_is('qty', str(quantity))
-    text_is('storage-gb', '%sGB' % (quantity * 20))
+    assert_text('qty', str(quantity))
+    assert_text('storage-gb', '%sGB' % (quantity * 20))
     monthly_price = quantity * 2.99
-    text_is('storage-monthly-price', '$%s' % monthly_price)
+    assert_text('storage-monthly-price', '$%s' % monthly_price)
     annual_price = quantity * 29.99
-    text_is('storage-annual-price', '$%s' % annual_price)
+    assert_text('storage-annual-price', '$%s' % annual_price)
 
 def increase_storage_quantity():
     """Click the button that increases the storage quantity to buy."""
-    button_click('plus_qty')
+    click_button('plus_qty')
 
 def decrease_storage_quantity():
     """Click the button that decreases the storage quantity to buy."""
-    button_click('minus_qty')
+    click_button('minus_qty')
 
 def set_storage_quantity(quantity):
     """Set the storage quantity to buy.
@@ -123,19 +123,19 @@
     quantity -- The quantity to buy.   
 
     """
-    textfield_write('qty', str(quantity))
+    write_textfield('qty', str(quantity))
     
 def buy_extra_storage_monthly():
     """Buy the monthly extra storage service."""
-    radio_select('st1')
+    set_radio_value('st1')
     buy_extra_storage()
 
 def buy_extra_storage_yearly():
     """Buy the yearly extra storage service."""
-    radio_select('st2')
+    set_radio_value('st2')
     buy_extra_storage()
 
 def buy_extra_storage():
     """Click the button to buy extra storage."""
-    button_click(get_elements(css_class='buy-now',
+    click_button(get_elements(css_class='buy-now',
                               text='Buy now and go to checkout')[1])

=== modified file 'ubuntuone/web/tests/sst/shared/actions/setup.py'
--- ubuntuone/web/tests/sst/shared/actions/setup.py	2011-12-08 15:21:26 +0000
+++ ubuntuone/web/tests/sst/shared/actions/setup.py	2011-12-09 19:54:29 +0000
@@ -42,15 +42,15 @@
     """
     set_base_url(get_base_url())
     set_wait_timeout(DEFAULT_TIMEOUT)
-    goto()
-    waitfor(title_is, 'Ubuntu One : Home')
+    go_to()
+    wait_for(assert_title, 'Ubuntu One : Home')
     header_actions.click_login_or_sign_up()
     user_name = full_name
     user_email = email
     if new_user:
         user_uuid = str(uuid.uuid1())
         user_name = 'Test user ' + user_uuid
-        user_email = user_uuid + '@' IMAP_SERVER
+        user_email = user_uuid + '@' + IMAP_SERVER
         sso_actions.create_new_account(user_name, user_email, 'Hola123*')
         confirmation_code  = mail.get_confirmation_code_for_address(user_email)
         sso_actions.confirm_email(confirmation_code)

=== modified file 'ubuntuone/web/tests/sst/shared/actions/sso.py'
--- ubuntuone/web/tests/sst/shared/actions/sso.py	2011-12-02 06:28:00 +0000
+++ ubuntuone/web/tests/sst/shared/actions/sso.py	2011-12-09 19:54:29 +0000
@@ -31,36 +31,36 @@
     password -- The password of the user.
 
     """
-    waitfor(title_is, 'Log in')
+    wait_for(assert_title, 'Log in')
     switch_to_window()
-    is_textfield('id_email')
-    is_textfield('id_password')
-    textfield_write('id_email', email)
-    textfield_write('id_password', password)
-    button_click(get_element(css_class='btn', name='continue'), wait=False)
+    assert_textfield('id_email')
+    assert_textfield('id_password')
+    write_textfield('id_email', email)
+    write_textfield('id_password', password)
+    click_button(get_element(css_class='btn', name='continue'), wait=False)
 
 def create_new_account(full_name, email, password):
-    link_click(get_element(href='+new_account'))
-    waitfor(title_is, 'Create account')
-    textfield_write('id_displayname', full_name)
-    textfield_write('id_email', email)
-    textfield_write('id_password', password)
-    textfield_write('id_passwordconfirm', password)
-    button_click(get_element(name='continue'))
+    click_link(get_element(href='+new_account'))
+    wait_for(assert_title, 'Create account')
+    write_textfield('id_displayname', full_name)
+    write_textfield('id_email', email)
+    write_textfield('id_password', password)
+    write_textfield('id_passwordconfirm', password)
+    click_button(get_element(name='continue'))
 
 def confirm_email(confirmation_code):
-    textfield_write(get_element(name='confirmation_code'), confirmation_code)
-    button_click(get_element(css_class='btn', text='Continue'))
+    write_textfield(get_element(name='confirmation_code'), confirmation_code)
+    click_button(get_element(css_class='btn', text='Continue'))
 
 def authenticate():
-    waitfor(title_is, 'Authenticate to %s' % get_base_url())
-    waitfor(get_element, tag='body')
-    button_click(get_element(css_class='btn', name='yes'))
+    wait_for(assert_title, 'Authenticate to %s' % get_base_url())
+    wait_for(get_element, tag='body')
+    click_button(get_element(css_class='btn', name='yes'))
 
 def assert_logout():
-    title_is('You have been logged out')
-    text_is(get_element(tag='h1', css_class='main'),
+    assert_title('You have been logged out')
+    assert_text(get_element(tag='h1', css_class='main'),
             'You have been logged out')
 
 def return_to_site():
-    link_click(get_element_by_css('.returnto a'))
+    click_link(get_element_by_css('.returnto a'))

=== modified file 'ubuntuone/web/tests/sst/smoketest/blogpage.py'
--- ubuntuone/web/tests/sst/smoketest/blogpage.py	2011-10-06 13:05:07 +0000
+++ ubuntuone/web/tests/sst/smoketest/blogpage.py	2011-12-09 19:54:29 +0000
@@ -20,10 +20,10 @@
 '''Check existence of Blog page'''
 
 from sst.actions import *
-from config import base_url
+from setup import get_base_url
 
-set_base_url(base_url)
-goto('/blog/')
-title_contains('Ubuntu One : Blog')
+set_base_url(get_base_url())
+go_to('/blog/')
+assert_title_contains('Ubuntu One : Blog')
 element_header = get_element_by_css('header>h1')
-text_is(element_header, 'Ubuntu One blog')
+assert_text(element_header, 'Ubuntu One blog')

=== modified file 'ubuntuone/web/tests/sst/smoketest/contactspage.py'
--- ubuntuone/web/tests/sst/smoketest/contactspage.py	2011-11-15 15:09:05 +0000
+++ ubuntuone/web/tests/sst/smoketest/contactspage.py	2011-12-09 19:54:29 +0000
@@ -22,8 +22,8 @@
 import actions.setup as setup_actions
 
 setup_actions.setup(new_user=False)
-goto('/contacts/')
-waitfor(title_is, 'Ubuntu One : Contacts')
+go_to('/contacts/')
+wait_for(assert_title, 'Ubuntu One : Contacts')
 get_element(css_class='add-button', text='Add contact')
 # possibly add tests for Desktop, Facebook and Ubuntu One Mobile here or
 # in seperate tests

=== modified file 'ubuntuone/web/tests/sst/smoketest/filespage.py'
--- ubuntuone/web/tests/sst/smoketest/filespage.py	2011-09-28 19:32:05 +0000
+++ ubuntuone/web/tests/sst/smoketest/filespage.py	2011-12-09 19:54:29 +0000
@@ -22,7 +22,7 @@
 import actions.setup as setup_actions
 
 setup_actions.setup(new_user=False)
-title_is(u'Ubuntu One : Dashboard')
-goto('/files/')
-title_is(u'Ubuntu One : My Storage')
+assert_title(u'Ubuntu One : Dashboard')
+go_to('/files/')
+assert_title(u'Ubuntu One : My Storage')
 get_element(css_class='add-button', text='Share this folder')

=== modified file 'ubuntuone/web/tests/sst/smoketest/freeplan.py'
--- ubuntuone/web/tests/sst/smoketest/freeplan.py	2011-09-28 18:36:19 +0000
+++ ubuntuone/web/tests/sst/smoketest/freeplan.py	2011-12-09 19:54:29 +0000
@@ -19,8 +19,8 @@
 
 '''Check existence of Free Plan Page.'''
 from sst.actions import *
-from config import base_url
+from setup import get_base_url
 
-set_base_url(base_url)
-goto('/services/free/')
+set_base_url(get_base_url())
+go_to('/services/free/')
 get_element(tag='h1', text='Ubuntu One Free')

=== modified file 'ubuntuone/web/tests/sst/smoketest/helppage.py'
--- ubuntuone/web/tests/sst/smoketest/helppage.py	2011-09-28 18:08:15 +0000
+++ ubuntuone/web/tests/sst/smoketest/helppage.py	2011-12-09 19:54:29 +0000
@@ -19,9 +19,9 @@
 
 '''Check existence of Help Page.'''
 from sst.actions import *
-from config import base_url
+from setup import get_base_url
 
-set_base_url(base_url)
-goto("/help/")
-waitfor(title_is, u"Ubuntu One : Help")
+set_base_url(get_base_url())
+go_to("/help/")
+wait_for(assert_title, u"Ubuntu One : Help")
 exists_element(text='contact us')

=== modified file 'ubuntuone/web/tests/sst/smoketest/joinpage.py'
--- ubuntuone/web/tests/sst/smoketest/joinpage.py	2011-09-28 18:08:15 +0000
+++ ubuntuone/web/tests/sst/smoketest/joinpage.py	2011-12-09 19:54:29 +0000
@@ -19,8 +19,8 @@
 
 '''Check existence of Join Page.'''
 from sst.actions import *
-from config import base_url
+from setup import get_base_url
 
-set_base_url(base_url)
-goto('/services/')
-waitfor(title_is, u'Ubuntu One : Services')
+set_base_url(get_base_url())
+go_to('/services/')
+wait_for(assert_title, u'Ubuntu One : Services')

=== modified file 'ubuntuone/web/tests/sst/smoketest/mainpage.py'
--- ubuntuone/web/tests/sst/smoketest/mainpage.py	2011-09-28 18:08:15 +0000
+++ ubuntuone/web/tests/sst/smoketest/mainpage.py	2011-12-09 19:54:29 +0000
@@ -19,8 +19,8 @@
 
 '''Check existence of Main Page.'''
 from sst.actions import *
-from config import base_url
+from setup import get_base_url
 
-set_base_url(base_url)
-goto('/')
-waitfor(title_is, u'Ubuntu One : Home')
+set_base_url(get_base_url())
+go_to('/')
+wait_for(assert_title, u'Ubuntu One : Home')

=== modified file 'ubuntuone/web/tests/sst/smoketest/notes.txt'
--- ubuntuone/web/tests/sst/smoketest/notes.txt	2011-05-17 19:20:08 +0000
+++ ubuntuone/web/tests/sst/smoketest/notes.txt	2011-12-09 19:54:29 +0000
@@ -1,7 +1,7 @@
 Notes, issues and questions
 ===========================
 
-Tests will fail if the test doesn't goto a url first, an easy thing to forget.
+Tests will fail if the test doesn't go_to a url first, an easy thing to forget.
 Should the check functions all fail with a useful error message if they are
-called before goto has been called?
+called before go_to has been called?
 

=== modified file 'ubuntuone/web/tests/sst/smoketest/notespage.py'
--- ubuntuone/web/tests/sst/smoketest/notespage.py	2011-09-29 17:25:08 +0000
+++ ubuntuone/web/tests/sst/smoketest/notespage.py	2011-12-09 19:54:29 +0000
@@ -22,6 +22,6 @@
 import actions.setup as setup_actions
 
 setup_actions.setup(new_user=False)
-goto("/notes/")
-setup_actions.waitfor(title_is, u"Ubuntu One : Notes")
+go_to("/notes/")
+setup_actions.wait_for(assert_title, u"Ubuntu One : Notes")
 exists_element(css_class='add-button', text='Add note')

=== modified file 'ubuntuone/web/tests/sst/smoketest/services.py'
--- ubuntuone/web/tests/sst/smoketest/services.py	2011-11-15 15:11:00 +0000
+++ ubuntuone/web/tests/sst/smoketest/services.py	2011-12-09 19:54:29 +0000
@@ -21,5 +21,5 @@
 import actions.setup as setup_actions
 
 setup_actions.setup(new_user=False)
-goto('/services/')
-title_is(u'Ubuntu One : Services')
+go_to('/services/')
+assert_title(u'Ubuntu One : Services')

=== modified file 'ubuntuone/web/tests/sst/smoketest/streamingplan.py'
--- ubuntuone/web/tests/sst/smoketest/streamingplan.py	2011-10-19 18:56:40 +0000
+++ ubuntuone/web/tests/sst/smoketest/streamingplan.py	2011-12-09 19:54:29 +0000
@@ -19,9 +19,9 @@
 
 '''Check existence of Streaming Plan Page.'''
 from sst.actions import *
-from config import base_url
+from setup import get_base_url
 
-set_base_url(base_url)
-goto('/services/music/')
-waitfor(title_is, u'Ubuntu One : Music Streaming')
+set_base_url(get_base_url())
+go_to('/services/music/')
+wait_for(assert_title, u'Ubuntu One : Music Streaming')
 exists_element(text='Sign up now')