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

[Leo Arias]

Added two more music tests.
Made a small adjustment to see if the full name verification after login gets more stable.

Second batch of music tests.

[Rick McBride (rmcbride)]

+1

review: Approve

=== modified file 'ubuntuone/web/tests/sst/README.txt'
--- ubuntuone/web/tests/sst/README.txt	2011-11-15 06:22:41 +0000
+++ ubuntuone/web/tests/sst/README.txt	2011-12-19 15:40:32 +0000
@@ -1,10 +1,15 @@
 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``
+password to login to SSO. Create a file '_passwords.py' in the 'shared'
 directory, with the following contents::
 
   full_name = My Full Name
   email = '[e-mail]'
   password = 'mypassword'
 
-(``_passwords.py`` is ignored by bazaar so you can't accidentally check it
+('_passwords.py' is ignored by bazaar so you can't accidentally check it
 into the repository.)
+
+The tests for the web music player require a special account with the 
+streaming service and some songs preloaded. The user information for this
+tests should be added to the file '_musicpasswords.py' in the 'music'
+directory.
 
=== modified file 'ubuntuone/web/tests/sst/music/u1webm001_playsong.py'
--- ubuntuone/web/tests/sst/music/u1webm001_playsong.py	2011-12-13 23:35:07 +0000
+++ ubuntuone/web/tests/sst/music/u1webm001_playsong.py	2011-12-19 15:40:32 +0000
@@ -23,9 +23,15 @@
 import actions.setup as setup_actions
 import actions.music as music_actions
 from data.song import Song
+from data.user import User
+try:
+    from _musicpasswords import full_name, email, password
+except:
+    skip('Try adding a _musicpasswords.py file to the music folder if you ' \
+         'expect this to work. Read the README.txt file ;)')
 
-skip('Not ready for unattended execution.')
-setup_actions.setup()
+test_user = User(full_name, email, password)
+setup_actions.setup(user=test_user)
 music_actions.open()
 song = Song('gentle marimba', 'Alastair Cameron', 'Free Film Music (cameronmusic.co.uk)')
 music_actions.play_song(song)
 
=== added file 'ubuntuone/web/tests/sst/music/u1webm002_selectartist.py'
--- ubuntuone/web/tests/sst/music/u1webm002_selectartist.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/music/u1webm002_selectartist.py	2011-12-19 15:40:32 +0000
@@ -0,0 +1,39 @@
+# -*- 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 u1webm-002 Select artist.
+Select an artist on the Ubuntu One web music player.
+
+"""
+
+from sst.actions import *
+import actions.setup as setup_actions
+import actions.music as music_actions
+from data.song import Song
+from data.user import User
+try:
+    from _musicpasswords import full_name, email, password
+except:
+    skip('Try adding a _musicpasswords.py file to the music folder if you ' \
+         'expect this to work. Read the README.txt file ;)')
+
+test_user = User(full_name, email, password)
+setup_actions.setup(user=test_user)
+music_actions.open()
+artist = 'Alastair Cameron'
+album = 'Free Film Music (cameronmusic.co.uk)'
+music_actions.select_artist(artist)
+music_actions.assert_artist_albums(artist, [album])
 
=== added file 'ubuntuone/web/tests/sst/music/u1webm003_selectalbum.py'
--- ubuntuone/web/tests/sst/music/u1webm003_selectalbum.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/music/u1webm003_selectalbum.py	2011-12-19 15:40:32 +0000
@@ -0,0 +1,38 @@
+# -*- 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 u1webm-003 Select album.
+Select an album on the Ubuntu One web music player.
+
+"""
+
+from sst.actions import *
+import actions.setup as setup_actions
+import actions.music as music_actions
+from data.song import Song
+from data.user import User
+try:
+    from _musicpasswords import full_name, email, password
+except:
+    skip('Try adding a _musicpasswords.py file to the music folder if you ' \
+         'expect this to work. Read the README.txt file ;)')
+
+test_user = User(full_name, email, password)
+setup_actions.setup(user=test_user)
+music_actions.open()
+song = Song('gentle marimba', 'Alastair Cameron', 'Free Film Music (cameronmusic.co.uk)')
+music_actions.select_album(song.album)
+music_actions.assert_album_songs(song.artist, song.album, [song.title])
 
=== modified file 'ubuntuone/web/tests/sst/shared/actions/header.py'
--- ubuntuone/web/tests/sst/shared/actions/header.py	2011-12-09 18:19:11 +0000
+++ ubuntuone/web/tests/sst/shared/actions/header.py	2011-12-19 15:40:32 +0000
@@ -30,6 +30,7 @@
     _get_logout_link()
 
 def _assert_full_name(full_name):
+    wait_for(exists_element, id='ac-status')
     welcome_element = get_element_by_css('#ac-status > span')
     assert_text(welcome_element, 'Welcome %s' % full_name[:40])
 
 
=== modified file 'ubuntuone/web/tests/sst/shared/actions/music.py'
--- ubuntuone/web/tests/sst/shared/actions/music.py	2011-12-13 23:34:06 +0000
+++ ubuntuone/web/tests/sst/shared/actions/music.py	2011-12-19 15:40:32 +0000
@@ -17,8 +17,7 @@
 """Actions for the Music page of the Ubuntu One website."""
 
 from sst.actions import *
-from loading import *
-import urlparse
+from data.song import Song
 
 def open():
     """Open the music page and assert it's title."""
@@ -34,7 +33,7 @@
 
 def assert_page_title():
     """Assert that the title of the page is the expected."""
-    assert_title(u'Ubuntu One : Music Streaming')
+    assert_title(u'Ubuntu One : Music')
 
 def play_song(song):
     _open_songs()
@@ -46,7 +45,7 @@
                                           'td.c1 > button' \
                                           % identifier)
     click_button(song_play_button)
-    assert not song_play_button.assert_displayed()
+    assert not song_play_button.is_displayed()
 
 def assert_songs_added_to_queue(songs_list):
     number_of_songs = len(songs_list)
@@ -65,7 +64,7 @@
     _assert_message_content(message_content)
 
 def _assert_message_displayed():
-    assert _get_message_element().assert_displayed()
+    assert _get_message_element().is_displayed()
 
 def _assert_message_content(message_content):
     assert _get_message_element().text == message_content
@@ -83,12 +82,12 @@
     set_checkbox_value(song_checkbox, True)
     
 def _open_songs():
-    if not _is_songs_opened():
+    if not _is_songs_open():
         songs_element = _get_songs_element()
         click_element(songs_element)
         _wait_for_action_to_complete()
 
-def _is_songs_opened():
+def _is_songs_open():
     songs_element = _get_songs_element()
     return _is_active(songs_element)
 
@@ -110,12 +109,12 @@
     assert expected_title == player_title_element.text
 
 def assert_player_playing():
-    assert _get_stop_button().assert_displayed()
-    assert not _get_play_button().assert_displayed()
+    assert _get_stop_button().is_displayed()
+    assert not _get_play_button().is_displayed()
 
 def assert_player_paused():
-    assert not _get_stop_button().assert_displayed()
-    assert _get_play_button().assert_displayed()
+    assert not _get_stop_button().is_displayed()
+    assert _get_play_button().is_displayed()
 
 def _get_stop_button():
     return get_element_by_css('#stop')
@@ -142,6 +141,9 @@
 
 def assert_song_in_queue(song):
     _open_now_playing()
+    _assert_song(song)
+
+def _assert_song(song):
     song_row_xpath = '//tr[contains(@class, "song-listing")]/' \
                      'td[text()="%(title)s"]/../td[text()="%(artist)s"]/../' \
                      'td[text()="%(album)s"]/..' % {'title': song.title,
@@ -150,10 +152,10 @@
     get_element_by_xpath(song_row_xpath)
 
 def _open_now_playing():
-    if not _is_now_playing_opened():
+    if not _is_now_playing_open():
         click_element(_get_now_playing_element())
 
-def _is_now_playing_opened():
+def _is_now_playing_open():
     now_playing_element = _get_now_playing_element()
     return _is_active(now_playing_element)
 
@@ -175,3 +177,70 @@
     sleep(3)
     waiting_bar = get_element_by_css('.loading-view > .indicator')
     wait_for(fails, assert_displayed, waiting_bar)
+
+def select_artist(artist):
+    _open_artists()
+    _click_artist(artist)
+    
+def _open_artists():
+    if not _is_artists_open():
+        click_element(_get_artists_element())
+
+def _is_artists_open():
+    artists_element = _get_artists_element()
+    return _is_active(artists_element)
+
+def _get_artists_element():
+    return get_element(css_class='artists')
+
+def _click_artist(artist):
+    artist_link_xpath = '//a[@data-u1m-artistid and text()="{0}"]' \
+                        .format(artist)
+    artist_link = get_element_by_xpath(artist_link_xpath)
+    artist_link.click()
+    _wait_for_action_to_complete()
+
+def assert_artist_albums(artist, albums_list):
+    _assert_albums_view_title('{0} albums'.format(artist))
+    for album in albums_list:
+        _assert_album(album)
+
+def _assert_albums_view_title(title):
+    view_title = get_element_by_css('#album-view > h2')
+    assert_text(view_title, title)
+
+def _assert_album(album):
+    _get_album_link(album)
+
+def _get_album_link(album):
+    album_link_xpath = '//a[@data-u1m-albumid and text()="{0}"]' \
+                        .format(album)
+    return get_element_by_xpath(album_link_xpath)
+
+def select_album(album):
+    _open_albums()
+    _click_album(album)
+    
+def _open_albums():
+    if not _is_albums_open():
+        click_element(_get_albums_element())
+
+def _is_albums_open():
+    albums_element = _get_albums_element()
+    return _is_active(albums_element)
+
+def _get_albums_element():
+    return get_element(css_class='albums')
+
+def _click_album(album):
+    _get_album_link(album).click()
+    _wait_for_action_to_complete()
+
+def assert_album_songs(artist, album, songs_title_list):
+    _assert_songs_view_title('{0} by {1}'.format(album, artist))
+    for song_title in songs_title_list:
+        _assert_song(Song(artist, album, song_title))
+
+def _assert_songs_view_title(title):
+    view_title = get_element_by_css('#song-view > h2')
+    assert_text(view_title, title)
 
=== modified file 'ubuntuone/web/tests/sst/shared/actions/setup.py'
--- ubuntuone/web/tests/sst/shared/actions/setup.py	2011-12-13 23:05:13 +0000
+++ ubuntuone/web/tests/sst/shared/actions/setup.py	2011-12-19 15:40:32 +0000
@@ -18,6 +18,7 @@
 
 from sst.actions import *
 from config import *
+from data.user import User
 import actions.header as header_actions
 import actions.sso as sso_actions
 import actions.services as services_actions
@@ -31,7 +32,7 @@
         'expect this to work. Read the README.txt file ;)')
 
 
-def setup(new_user=False):
+def setup(new_user=False, user=None):
     """Log in to the Ubuntu One website. Optionally, you can create a new user.
 
     After calling setup, the browser will be in the Dashboard ready to
@@ -46,21 +47,26 @@
     go_to()
     wait_for(assert_title, 'Ubuntu One : Home')
     header_actions.click_login_or_sign_up()
-    user_name = full_name
-    user_email = email
+    test_user = user
     if new_user:
-        user_uuid = str(uuid.uuid1())
-        user_name = 'Test user ' + user_uuid
-        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)
+        if user is None:
+            user_uuid = str(uuid.uuid1())
+            user_name = 'Test user ' + user_uuid
+            user_email = user_uuid + '@' + IMAP_SERVER
+            user_password = 'Hola123*'
+            test_user = User(user_name, user_email, user_password)
+        sso_actions.create_new_account(test_user)
+        confirmation_code  = \
+            mail.get_confirmation_code_for_address(test_user.email)
         sso_actions.confirm_email(confirmation_code)
     else:
-        sso_actions.login(user_email, password)
+        if user is None:
+            test_user = User(full_name, email, password)
+        sso_actions.login(test_user)
     if new_user:
         services_actions.agree_and_subscribe_to_free_plan()
-    header_actions.assert_login(user_name)
     dashboard_actions.wait_for_page_to_load()
+    header_actions.assert_login(test_user.full_name)
 
 def get_base_url():
     base_url = None
 
=== modified file 'ubuntuone/web/tests/sst/shared/actions/sso.py'
--- ubuntuone/web/tests/sst/shared/actions/sso.py	2011-12-13 20:11:54 +0000
+++ ubuntuone/web/tests/sst/shared/actions/sso.py	2011-12-19 15:40:32 +0000
@@ -23,7 +23,7 @@
 from sst.actions import *
 from actions.setup import get_base_url
 
-def login(email, password):
+def login(user):
     """Log in to Ubuntu One website.
 
     Keyword arguments:
@@ -35,17 +35,17 @@
     switch_to_window()
     assert_textfield('id_email')
     assert_textfield('id_password')
-    write_textfield('id_email', email)
-    write_textfield('id_password', password)
+    write_textfield('id_email', user.email)
+    write_textfield('id_password', user.password)
     click_button(get_element(css_class='btn', name='continue'), wait=False)
 
-def create_new_account(full_name, email, password):
+def create_new_account(user):
     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)
+    write_textfield('id_displayname', user.full_name)
+    write_textfield('id_email', user.email)
+    write_textfield('id_password', user.password)
+    write_textfield('id_passwordconfirm', user.password)
     click_button(get_element(name='continue'))
 
 def confirm_email(confirmation_code):
 
=== added file 'ubuntuone/web/tests/sst/shared/data/user.py'
--- ubuntuone/web/tests/sst/shared/data/user.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/shared/data/user.py	2011-12-19 15:40:32 +0000
@@ -0,0 +1,25 @@
+# -*- 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/>.
+
+"""Data class for a User."""
+
+class User:
+    "Class for User information."
+
+    def __init__(self, full_name, email, password):
+        self.full_name = full_name
+        self.email = email
+        self.password = password