Merge lp:~elopio/ubuntuone-testing/update-music into lp:ubuntuone-testing

[Leo Arias]

Add waiting times to music actions.

Made some minor changes to keep music tests working.

[Rick McBride (rmcbride)]

Looks good!

review: Approve

=== modified file 'ubuntuone/web/tests/sst/shared/actions/music.py'
--- ubuntuone/web/tests/sst/shared/actions/music.py	2011-12-18 14:03:06 +0000
+++ ubuntuone/web/tests/sst/shared/actions/music.py	2012-01-25 17:56:47 +0000
@@ -21,12 +21,11 @@
 
 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 go_to,
-    # to access the tab properly.
-    #click_link(_get_music_link())
+    click_link(_get_music_link())
     go_to('music/player')
     switch_to_window()
     assert_page_title()
+    _wait_for_action_to_complete()
 
 def _get_music_link():
     return get_element_by_css('#main-nav .music')
@@ -139,6 +138,13 @@
     current_song_album_element = get_element_by_css('.current-song .album')
     return current_song_album_element.text
 
+def clear_queue():
+    _open_now_playing()
+    click_button(_get_clear_queue_button())
+
+def _get_clear_queue_button():
+    return get_element(css_class='clear')
+
 def assert_song_in_queue(song):
     _open_now_playing()
     _assert_song(song)
@@ -185,6 +191,7 @@
 def _open_artists():
     if not _is_artists_open():
         click_element(_get_artists_element())
+        _wait_for_action_to_complete()
 
 def _is_artists_open():
     artists_element = _get_artists_element()
@@ -224,6 +231,7 @@
 def _open_albums():
     if not _is_albums_open():
         click_element(_get_albums_element())
+        _wait_for_action_to_complete()
 
 def _is_albums_open():
     albums_element = _get_albums_element()