Merge lp:~tpeeters/music-app/fix-go-back into lp:music-app/trusty

[Tim Peeters]

Update autopilot tests to use the UITK CPO for clicking the back button.

Update autopilot tests to use the UITK CPO for clicking the back button.

[Leo Arias (elopio)]

review: Approve (looks good)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/music_app/emulators.py'
--- tests/autopilot/music_app/emulators.py	2014-07-24 07:23:11 +0000
+++ tests/autopilot/music_app/emulators.py	2014-07-24 14:01:54 +0000
@@ -113,9 +113,6 @@
     def get_first_genre_item(self):
         return self.wait_select_single("*", objectName="genreItemObject")
 
-    def get_back_button(self):
-        return self.select_single("AbstractButton", objectName="backButton")
-
     def get_albumstab(self):
         return self.select_single("Tab", objectName="albumstab")
 
 
=== modified file 'tests/autopilot/music_app/tests/test_music.py'
--- tests/autopilot/music_app/tests/test_music.py	2014-07-02 23:10:40 +0000
+++ tests/autopilot/music_app/tests/test_music.py	2014-07-24 14:01:54 +0000
@@ -125,8 +125,7 @@
         self.assertThat(queueTrackTitle.text, Equals(self.trackTitle))
 
         # click on close button to close the page
-        backButton = self.main_view.get_back_button()
-        self.pointing_device.click_object(backButton)
+        self.main_view.go_back()
 
         if self.main_view.wideAspect:
             play_button = self.main_view.get_now_playing_play_button()
@@ -346,8 +345,7 @@
         self.assertThat(songs_page_albumartist.text, Equals(self.artistName))
 
         # click on close button to close album page
-        backButton = self.main_view.get_back_button()
-        self.pointing_device.click_object(backButton)
+        self.main_view.go_back()
         self.assertThat(self.main_view.get_albumstab(), Not(Is(None)))
 
     def test_add_song_to_queue_from_albums_page(self):
@@ -377,8 +375,7 @@
         self.assertThat(queueTrackTitle.text, Equals(self.trackTitle))
 
         # click on close button to close album page
-        backButton = self.main_view.get_back_button()
-        self.pointing_device.click_object(backButton)
+        self.main_view.go_back()
         self.assertThat(self.main_view.get_albumstab(), Not(Is(None)))
 
     def test_add_songs_to_queue_from_songs_tab_and_play(self):