Merge lp:~elopio/ubuntuone-testing/missingsmokes into lp:ubuntuone-testing

[Leo Arias]

Added the parameter full_name as a requisite for running the tests.
Added the test u1webs002 Log in.
Added the test u1webs 003 Log out.
Added the test u1webn 001 Main Tabs navigation.
Added the test u1weba001 account details.
Moved the services smoke test to the smoke folder.

Added the missing smoke tests and did a little refactoring on the way.

[Rick McBride (rmcbride)]

Nicely done.

review: Approve

=== modified file 'ubuntuone/web/tests/sst/README.txt'
--- ubuntuone/web/tests/sst/README.txt	2011-10-19 19:02:08 +0000
+++ ubuntuone/web/tests/sst/README.txt	2011-11-15 15:29:27 +0000
@@ -1,8 +1,9 @@
-The tests involving login require a username (email) and
+The tests involving login require the user's full name, email and
 password to login to SSO. Create a file ``_passwords.py`` in the ``shared``
 directory, with the following contents::
 
-  username = '[e-mail]'
+  full_name = My Full Name
+  email = '[e-mail]'
   password = 'mypassword'
 
 (``_passwords.py`` is ignored by bazaar so you can't accidentally check it

=== added directory 'ubuntuone/web/tests/sst/account'
=== added file 'ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py'
--- ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/account/u1weba001_accountdetails.py	2011-11-15 15:29:27 +0000
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Test case u1weba-001 Account details.
+Verify the account information.
+
+"""
+
+from sst.actions import *
+import actions.setup as setup_actions
+import actions.account as account_actions
+from _passwords import full_name, email
+
+setup_actions.setup()
+account_actions.open()
+account_actions.assert_account_details(full_name, email)
+account_actions.click_edit_account_details()
+url_is('https://login.ubuntu.com/')

=== added directory 'ubuntuone/web/tests/sst/navigation'
=== added file 'ubuntuone/web/tests/sst/navigation/u1webn001_maintabs.py'
--- ubuntuone/web/tests/sst/navigation/u1webn001_maintabs.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/navigation/u1webn001_maintabs.py	2011-11-15 15:29:27 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Test case u1webn-001 Main tabs.
+Navigate the main tabs of the website.
+
+"""
+
+from sst.actions import *
+import actions.setup as setup_actions
+import actions.dashboard as dashboard_actions
+import actions.files as files_actions
+import actions.contacts as contacts_actions
+
+setup_actions.setup()
+dashboard_actions.assert_title()
+files_actions.open()
+# TODO waiting for Rick's branch.
+#notes_actions.open()
+contacts_actions.open()
+dashboard_actions.open()

=== added directory 'ubuntuone/web/tests/sst/session'
=== added file 'ubuntuone/web/tests/sst/session/u1webs002_login.py'
--- ubuntuone/web/tests/sst/session/u1webs002_login.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/session/u1webs002_login.py	2011-11-15 15:29:27 +0000
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Test case u1webs-002 Log in.
+Log in to the website with an existing account.
+
+"""
+
+from sst.actions import *
+import actions.setup as setup_actions
+import actions.dashboard as dashboard_actions
+import actions.header as header_actions
+from _passwords import full_name
+
+setup_actions.setup(new_user=False)
+dashboard_actions.assert_title()
+header_actions.assert_login(full_name)
+dashboard_actions.assert_welcome_message(full_name)

=== added file 'ubuntuone/web/tests/sst/session/u1webs003_logout.py'
--- ubuntuone/web/tests/sst/session/u1webs003_logout.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/session/u1webs003_logout.py	2011-11-15 15:29:27 +0000
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Test case u1webs-003 Log out.
+Log out from the website.
+
+"""
+
+from sst.actions import *
+import actions.setup as setup_actions
+import actions.header as header_actions
+import actions.sso as sso_actions
+
+setup_actions.setup()
+header_actions.logout()
+sso_actions.assert_logout()
+sso_actions.return_to_site()
+header_actions.assert_logout()

=== added file 'ubuntuone/web/tests/sst/shared/actions/account.py'
--- ubuntuone/web/tests/sst/shared/actions/account.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/shared/actions/account.py	2011-11-15 15:29:27 +0000
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Actions for the Account page of the Ubuntu One website."""
+
+from sst.actions import *
+import actions.header as header_actions
+
+def open():
+    header_actions.open_my_account()
+    assert_title(), 'My account should be opened'
+
+def assert_title():
+    title_is(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]
+    text_is(name_element, full_name)
+
+def _assert_email(email):
+    email_element = _get_user_details_data_elements()[1]
+    text_is(email_element, email)
+
+def _assert_password(password):
+    password_element = _get_user_details_data_elements()[2]
+    text_is(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 '
+                                'Sign On'))

=== modified file 'ubuntuone/web/tests/sst/shared/actions/contacts.py'
--- ubuntuone/web/tests/sst/shared/actions/contacts.py	2011-10-19 06:52:00 +0000
+++ ubuntuone/web/tests/sst/shared/actions/contacts.py	2011-11-15 15:29:27 +0000
@@ -22,9 +22,12 @@
 
 def open():
     """Open the Contacts page and assert it's title."""
-    goto('/contacts/')
+    link_click(_get_contacts_link())
     assert_title()
 
+def _get_contacts_link():
+    return get_element_by_css('#main-nav .contacts')
+
 def assert_title():
     """Assert that the title of the page is the expected."""
     title_is(u'Ubuntu One : Contacts')

=== added file 'ubuntuone/web/tests/sst/shared/actions/dashboard.py'
--- ubuntuone/web/tests/sst/shared/actions/dashboard.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/shared/actions/dashboard.py	2011-11-15 15:29:27 +0000
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Actions for the Dashboard page of the Ubuntu One website."""
+
+from sst.actions import *
+
+def open():
+    link_click(_get_dashboard_link())
+    assert_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_welcome_message(user_full_name):
+    text_is(_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-07 17:14:03 +0000
+++ ubuntuone/web/tests/sst/shared/actions/files.py	2011-11-15 15:29:27 +0000
@@ -26,9 +26,12 @@
 
 def open():
     """Open the files page and assert it's title."""
-    goto('/files/')
+    link_click(_get_files_link())
     assert_title()
 
+def _get_files_link():
+    return get_element_by_css('#main-nav .files')
+
 def assert_title():
     """Assert that the title of the page is the expected."""
     title_is(u'Ubuntu One : My Storage')

=== added file 'ubuntuone/web/tests/sst/shared/actions/header.py'
--- ubuntuone/web/tests/sst/shared/actions/header.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/shared/actions/header.py	2011-11-15 15:29:27 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Actions for the Header of the Ubuntu One website."""
+
+from sst.actions import *
+
+def click_login_or_sign_up():
+    link_click(_get_login_or_sign_up_link())
+
+def _get_login_or_sign_up_link():
+    return get_element(text='Log in or Sign up')
+
+def assert_login(full_name):
+    _assert_full_name(full_name)
+    _get_my_account_link()
+    _get_logout_link()
+
+def _assert_full_name(full_name):
+    welcome_element = get_element_by_css('#ac-status > span')
+    text_is(welcome_element, 'Welcome %s' % full_name)
+
+def _get_my_account_link():
+    return get_element(tag='a', css_class='account', text='My Account')
+
+def _get_logout_link():
+    return get_element(tag='a', text='logout')
+
+def open_my_account():
+    link_click(_get_my_account_link())
+
+def logout():
+    link_click(_get_logout_link())
+
+def assert_logout():
+    _get_login_or_sign_up_link()

=== modified file 'ubuntuone/web/tests/sst/shared/actions/setup.py'
--- ubuntuone/web/tests/sst/shared/actions/setup.py	2011-11-04 20:25:03 +0000
+++ ubuntuone/web/tests/sst/shared/actions/setup.py	2011-11-15 15:29:27 +0000
@@ -23,10 +23,11 @@
 from sst.actions import *
 from config import *
 try:
-    from _passwords import username, password
+    from _passwords import full_name, email, password
 except:
-    skip('try adding a _passwords.py file to the shared folder if you ' \
-        'expect this to work ;)')
+    skip('Try adding a _passwords.py file to the shared folder if you ' \
+        'expect this to work. Read the README.txt file ;)')
+import actions.header as header_actions
 import actions.sso as sso_actions
 
 
@@ -43,14 +44,10 @@
     set_base_url(base_url)
     set_wait_timeout(DEFAULT_TIMEOUT)
     goto()
-    wait_for_title_to_change('Ubuntu One : Home')
-    link_click(get_element(text='Log in or Sign up'))
+    waitfor(title_is, 'Ubuntu One : Home')
+    header_actions.click_login_or_sign_up()
     if new_user:
         skip('New user creation is not yet implemented.')
     else:
-        sso_actions.login(username, password)
-    wait_for_title_to_change(u'Ubuntu One : Dashboard')
-
-
-def wait_for_title_to_change(title):
-    waitfor(title_is, title)
+        sso_actions.login(email, password)
+    header_actions.assert_login(full_name)

=== modified file 'ubuntuone/web/tests/sst/shared/actions/sso.py'
--- ubuntuone/web/tests/sst/shared/actions/sso.py	2011-11-04 20:25:03 +0000
+++ ubuntuone/web/tests/sst/shared/actions/sso.py	2011-11-15 15:29:27 +0000
@@ -41,3 +41,11 @@
     waitfor(title_is, 'Authenticate to %s' % base_url)
     waitfor(get_element, tag='body')
     button_click(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'),
+            'You have been logged out')
+
+def return_to_site():
+    link_click(get_element_by_css('.returnto a'))

=== modified file 'ubuntuone/web/tests/sst/smoketest/contactspage.py'
--- ubuntuone/web/tests/sst/smoketest/contactspage.py	2011-09-28 19:32:05 +0000
+++ ubuntuone/web/tests/sst/smoketest/contactspage.py	2011-11-15 15:29:27 +0000
@@ -23,7 +23,7 @@
 
 setup_actions.setup(new_user=False)
 goto('/contacts/')
-setup_actions.wait_for_title_to_change('Ubuntu One : Contacts')
+waitfor(title_is, '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

=== renamed file 'ubuntuone/web/tests/sst/services/u1webs-002.py' => 'ubuntuone/web/tests/sst/smoketest/services.py'