Ubuntu Music App

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

  1. fix-go-back
  2. Merge into trusty
Proposed by Tim Peeters
Status: Merged
Approved by: Leo Arias
Approved revision: 539
Merged at revision: 538
Proposed branch: lp:~tpeeters/music-app/fix-go-back
Merge into: lp:music-app/trusty
Diff against target: 47 lines (+3/-9)
2 files modified
tests/autopilot/music_app/emulators.py (+0/-3)
tests/autopilot/music_app/tests/test_music.py (+3/-6)
To merge this branch: bzr merge lp:~tpeeters/music-app/fix-go-back
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Leo Arias (community) looks good Approve
Review via email: mp+228120@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Leo Arias (elopio) :
review: Approve (looks good)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/music_app/emulators.py'
2--- tests/autopilot/music_app/emulators.py 2014-07-24 07:23:11 +0000
3+++ tests/autopilot/music_app/emulators.py 2014-07-24 14:01:54 +0000
4@@ -113,9 +113,6 @@
5 def get_first_genre_item(self):
6 return self.wait_select_single("*", objectName="genreItemObject")
7
8- def get_back_button(self):
9- return self.select_single("AbstractButton", objectName="backButton")
10-
11 def get_albumstab(self):
12 return self.select_single("Tab", objectName="albumstab")
13
14
15=== modified file 'tests/autopilot/music_app/tests/test_music.py'
16--- tests/autopilot/music_app/tests/test_music.py 2014-07-02 23:10:40 +0000
17+++ tests/autopilot/music_app/tests/test_music.py 2014-07-24 14:01:54 +0000
18@@ -125,8 +125,7 @@
19 self.assertThat(queueTrackTitle.text, Equals(self.trackTitle))
20
21 # click on close button to close the page
22- backButton = self.main_view.get_back_button()
23- self.pointing_device.click_object(backButton)
24+ self.main_view.go_back()
25
26 if self.main_view.wideAspect:
27 play_button = self.main_view.get_now_playing_play_button()
28@@ -346,8 +345,7 @@
29 self.assertThat(songs_page_albumartist.text, Equals(self.artistName))
30
31 # click on close button to close album page
32- backButton = self.main_view.get_back_button()
33- self.pointing_device.click_object(backButton)
34+ self.main_view.go_back()
35 self.assertThat(self.main_view.get_albumstab(), Not(Is(None)))
36
37 def test_add_song_to_queue_from_albums_page(self):
38@@ -377,8 +375,7 @@
39 self.assertThat(queueTrackTitle.text, Equals(self.trackTitle))
40
41 # click on close button to close album page
42- backButton = self.main_view.get_back_button()
43- self.pointing_device.click_object(backButton)
44+ self.main_view.go_back()
45 self.assertThat(self.main_view.get_albumstab(), Not(Is(None)))
46
47 def test_add_songs_to_queue_from_songs_tab_and_play(self):

Subscribers

People subscribed via source and target branches

to status/vote changes: