Merge lp:~vthompson/music-app/remix-retain-pagestack into lp:music-app/remix

[Victor Thompson]

* Do not pop existing pages from page stack when returning from Now Playing/Queue

This small change will bring the user back to the last viewed page when returning from the Queue/Now Playing page. For instance, if the user is on the Album view (SongsPage) before entering the Now Playing page, they will return there when tapping the back button in the header.

[Andrew Hayzen (ahayzen)]

Looks good so far, 1 inline comment.

review: Needs Fixing

[lp:~vthompson/music-app/remix-retain-pagestack]

729. By Victor Thompson on 2014-11-07

Remove custom backAction

730. By Victor Thompson on 2014-11-07

Remove go_back AP helper.

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

FAILED: Continuous integration, rev:728
http://91.189.93.70:8080/job/music-app-remix-ci/230/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/75
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/75/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/5

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/230/rebuild

review: Needs Fixing (continuous-integration)

[lp:~vthompson/music-app/remix-retain-pagestack]

731. By Victor Thompson on 2014-11-07

Update failing test

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

FAILED: Continuous integration, rev:730
http://91.189.93.70:8080/job/music-app-remix-ci/231/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/76
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/76/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/6

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/231/rebuild

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:731
http://91.189.93.70:8080/job/music-app-remix-ci/233/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/78
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/78/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/8

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/233/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM, thanks for fixing the AP tests :)

review: Approve

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-10-28 02:05:16 +0000
+++ MusicNowPlaying.qml	2014-11-07 23:08:40 +0000
@@ -75,17 +75,6 @@
             id: defaultState
 
             name: "default"
-            backAction: Action {
-                iconName: "back";
-                objectName: "backButton"
-                onTriggered: {
-                    mainPageStack.pop();
-
-                    while (mainPageStack.depth > 1) {  // jump back to the tab layer if via SongsPage
-                        mainPageStack.pop();
-                    }
-                }
-            }
             actions: [
                 Action {
                     objectName: "toggleView"
@@ -123,7 +112,7 @@
                     text: i18n.tr("Clear queue")
                     visible: isListView
                     onTriggered: {
-                        head.backAction.trigger()
+                        pageStack.pop()
                         trackQueue.clear()
                     }
                 }
 
=== modified file 'tests/autopilot/music_app/__init__.py'
--- tests/autopilot/music_app/__init__.py	2014-10-26 21:39:08 +0000
+++ tests/autopilot/music_app/__init__.py	2014-11-07 23:08:40 +0000
@@ -270,10 +270,6 @@
     def click_toggle_view(self):
         self.main_view.get_header().click_action_button("toggleView")
 
-    def go_back(self):
-        """Use custom back button to go back"""
-        self.main_view.get_header().click_custom_back_button()
-
     @ensure_now_playing_list
     def get_track(self, i):
         return (self.wait_select_single(ListItemWithActions,
 
=== modified file 'tests/autopilot/music_app/tests/test_music.py'
--- tests/autopilot/music_app/tests/test_music.py	2014-10-31 14:10:26 +0000
+++ tests/autopilot/music_app/tests/test_music.py	2014-11-07 23:08:40 +0000
@@ -104,7 +104,7 @@
                         Equals(self.tracks[0]["title"]))
 
         # click on close button to close the page and now playing page
-        now_playing_page.go_back()
+        self.app.main_view.go_back()
 
         # click the play button (toolbar) to start playing
         toolbar.click_play_button()
@@ -358,11 +358,11 @@
         self.assertThat(current_track.get_label_text("titleLabel"),
                         Equals(tracks[0]["title"]))
 
-        # click on close button to close nowplaying and songs page
-        now_playing_page.go_back()
+        # click on close button to close nowplaying page
+        self.app.main_view.go_back()
 
-        # check that the albums page is now visible
-        self.assertThat(albums_page.visible, Eventually(Equals(True)))
+        # check that the songs page is now visible
+        self.assertThat(songs_page.visible, Eventually(Equals(True)))
 
     def test_add_songs_to_queue_from_songs_tab_and_play(self):
         """tests navigating to the Songs tab and adding the library to the