Merge lp:~ahayzen/music-app/ap-helper-refactor-001 into lp:music-app/trusty

[Andrew Hayzen]

* Initial conversion of splitting the helpers

* Initial conversion of splitting the helpers

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

FAILED: Continuous integration, rev:584
http://91.189.93.70:8080/job/music-app-ci/1041/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1621
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1621/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/265

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/ap-helper-refactor-001]

585. By Andrew Hayzen on 2014-08-19

* Add property for pointing_device to keep old tests running

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

FAILED: Continuous integration, rev:585
http://91.189.93.70:8080/job/music-app-ci/1042/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1622
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1622/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/266

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/ap-helper-refactor-001]

586. By Andrew Hayzen on 2014-08-19

* Fix incorrect property

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

FAILED: Continuous integration, rev:586
http://91.189.93.70:8080/job/music-app-ci/1043/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1624
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1624/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/267

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/ap-helper-refactor-001]

587. By Andrew Hayzen on 2014-08-19

* Fix for tracksTab name change

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

PASSED: Continuous integration, rev:587
http://91.189.93.70:8080/job/music-app-ci/1044/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1625
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1625/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/268

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

This all looks excellent. I will note that it might be useful to start converting strings from " to '. It will make Leo happy :-)

[lp:~ahayzen/music-app/ap-helper-refactor-001]

588. By Andrew Hayzen on 2014-08-20

* Fix typo

[Nicholas Skaggs (nskaggs)]

review: Approve

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

PASSED: Continuous integration, rev:588
http://91.189.93.70:8080/job/music-app-ci/1050/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1636
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1636/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/274

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Echoing inline comments:

tests/autopilot/music_app/__init__.py L70: Minor gripe, "open_tracks" isn't very descriptive if someone wants to reuse it. We should maybe try to be consistent here and call this the "Songs tab" also, we mix the use of tab and page... which could lead to confusion for future coders and ourselves.

tests/autopilot/music_app/__init__.py L73: Question: is ":return:" some sort of docstring standard? I'm not sure what to make of it.

tests/autopilot/music_app/__init__.py L102: Question: What is "Page10" could this please be clarified?

review: Needs Fixing

[Andrew Hayzen (ahayzen)]

I deliberately used tracks as I was going to refer to anything on the tracks tab as tracks and the songs page as songs to avoid the current confusion. This makes sense because the file called MusicTracks.qml only the title of the tab is called Songs.

:return: was used in other apps autopilot tests so I copied them and yes it is todo with docstring standard IIRC

bug 1341671 and bug 1337004 relate to Page10, but in summary it appears as Page10 or Page11 (depending on Ubuntu.Components version and comes from the filename) this is a known issue and other apps have to do this in their tests as well. Page10 for us = MusicTracks {}

[Victor Thompson (vthompson)]

Ok, please rename "open_tracks" as "open_tracks_tab". Also, please add some commentary regarding those bugs for the "Page10" issue specifically stating that this represents MusicTracks, just above the Page10 class declaration.

review: Needs Fixing

[Victor Thompson (vthompson)]

Or really what that function should be called is "get_tracks_page"... it just needs something because "open_tracks" could mean so many things

[lp:~ahayzen/music-app/ap-helper-refactor-001]

589. By Andrew Hayzen on 2014-08-20

* Change open_tracks to open_tracks_tab
* Add code comments

590. By Andrew Hayzen on 2014-08-20

* Switch open_tracks_tab to get_tracks_page

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

PASSED: Continuous integration, rev:589
http://91.189.93.70:8080/job/music-app-ci/1051/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1637
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1637/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/275

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:590
http://91.189.93.70:8080/job/music-app-ci/1052/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1638
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1638/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/276

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

This is a bit silly to ask you to change, but you've modified the line of code 3 or so times already. Could you change the commentary "switch to track tabs" to state "tab", singular?

[lp:~ahayzen/music-app/ap-helper-refactor-001]

591. By Andrew Hayzen on 2014-08-21

* Fix for grammatical error

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

FAILED: Continuous integration, rev:591
http://91.189.93.70:8080/job/music-app-ci/1056/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1647/console
    FAILURE: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/280/console

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

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

Unfortunately you'll have to merge with trunk and resolve 1 conflict.

[lp:~ahayzen/music-app/ap-helper-refactor-001]

592. By Andrew Hayzen on 2014-08-21

* Merge of trunk

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

PASSED: Continuous integration, rev:592
http://91.189.93.70:8080/job/music-app-ci/1057/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1648
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1648/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/281

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Everything LGTM!

review: Approve

=== modified file 'MusicTracks.qml'
--- MusicTracks.qml	2014-08-11 13:29:08 +0000
+++ MusicTracks.qml	2014-08-21 18:57:12 +0000
@@ -32,6 +32,7 @@
 
 MusicPage {
     id: mainpage
+    objectName: "tracksPage"
     title: i18n.tr("Songs")
 
     ListView {
@@ -57,6 +58,7 @@
             ListItemWithActions {
                 id: track
                 color: "transparent"
+                objectName: "tracksTabListItem" + index
                 width: parent.width
                 height: styleMusic.common.itemHeight
 

=== modified file 'music-app.qml'
--- music-app.qml	2014-08-21 17:18:50 +0000
+++ music-app.qml	2014-08-21 18:57:12 +0000
@@ -740,6 +740,7 @@
 
     SongsModel {
         id: allSongsModel
+        objectName: "allSongsModel"
         store: musicStore
     }
 
@@ -1060,7 +1061,7 @@
                 property bool loading: false
                 property var model: []
                 id: tracksTab
-                objectName: "trackstab"
+                objectName: "tracksTab"
                 anchors.fill: parent
                 title: page.title
 

=== modified file 'tests/autopilot/music_app/__init__.py'
--- tests/autopilot/music_app/__init__.py	2014-08-18 19:35:31 +0000
+++ tests/autopilot/music_app/__init__.py	2014-08-21 18:57:12 +0000
@@ -10,13 +10,87 @@
 from time import sleep
 
 
+class MusicAppException(Exception):
+    """Exception raised when there's an error in the Music App."""
+
+
+class MusicApp(object):
+    """Autopilot helper object for the Music application."""
+
+    def __init__(self, app_proxy):
+        self.app = app_proxy
+        self.main_view = self.app.wait_select_single(MainView)
+        self.player = self.app.select_single(Player, objectName='player')
+
+    def populate_queue(self):
+        tracksPage = self.get_tracks_page()  # switch to track tab
+
+        # get and click to play first track
+        track = tracksPage.get_track(0)
+        self.app.pointing_device.click_object(track)
+
+        # TODO: when using bottom edge wait for .isReady on tracksPage
+
+    def get_tracks_page(self):
+        """Open the Tracks tab.
+
+        :return: The autopilot custom proxy object for the TracksPage.
+
+        """
+        self.main_view.switch_to_tab('tracksTab')
+
+        return self.main_view.select_single(
+            Page10, objectName='tracksPage')
+
+    @property
+    def loaded(self):
+        return (not self.main_view.select_single("ActivityIndicator",
+                objectName="LoadingSpinner").running and
+                self.main_view.select_single("*", "allSongsModel").populated)
+
+
+class Page(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+    """Autopilot helper for Pages."""
+    def __init__(self, *args):
+        super(Page, self).__init__(*args)
+        # XXX we need a better way to keep reference to the main view.
+        # --elopio - 2014-01-31
+        self.main_view = self.get_root_instance().select_single(MainView)
+
+
+class MusicPage(Page):
+    def __init__(self, *args):
+        super(Page, self).__init__(*args)
+
+
+# FIXME: Represents MusicTracks related to bug 1341671 and bug 1337004
+class Page10(MusicPage):
+    """ Autopilot helper for the tracks page """
+    def __init__(self, *args):
+        super(MusicPage, self).__init__(*args)
+
+    def get_track(self, i):
+        return (self.wait_select_single("ListItemWithActions",
+                objectName="tracksTabListItem" + str(i)))
+
+
+class Player(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+    """Autopilot helper for Player """
+
+
 class MainView(ubuntuuitoolkit.MainView):
-
-    """An emulator class that makes it easy to interact with the
-    music-app.
-    """
+    """Autopilot custom proxy object for the MainView."""
     retry_delay = 0.2
 
+    def __init__(self, *args):
+        super(MainView, self).__init__(*args)
+        self.visible.wait_for(True)
+
+        # wait for activity indicator to stop spinning
+        spinner = self.wait_select_single("ActivityIndicator",
+                                          objectName="LoadingSpinner")
+        spinner.running.wait_for(False)
+
     def get_toolbar(self):
         return self.select_single("MusicToolbar",
                                   objectName="musicToolbarObject")
@@ -116,10 +190,6 @@
     def get_player_control_title(self):
         return self.select_single("Label", objectName="playercontroltitle")
 
-    def get_spinner(self):
-        return self.select_single("ActivityIndicator",
-                                  objectName="LoadingSpinner")
-
     def get_first_genre_item(self):
         return self.wait_select_single("*", objectName="genreItemObject")
 

=== modified file 'tests/autopilot/music_app/tests/__init__.py'
--- tests/autopilot/music_app/tests/__init__.py	2014-08-18 19:35:31 +0000
+++ tests/autopilot/music_app/tests/__init__.py	2014-08-21 18:57:12 +0000
@@ -15,10 +15,10 @@
 import music_app
 
 import fixtures
-from music_app import MainView
+from music_app import MusicApp
 
 from autopilot import logging as autopilot_logging
-from autopilot.input import Mouse, Touch, Pointer
+from autopilot.input import Mouse, Touch
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
 
@@ -32,7 +32,7 @@
 logger = logging.getLogger(__name__)
 
 
-class MusicTestCase(AutopilotTestCase):
+class BaseTestCaseWithPatchedHome(AutopilotTestCase):
 
     """A common test case class that provides several useful methods for
     music-app tests.
@@ -48,7 +48,7 @@
     local_location = local_location_dir + "/music-app.qml"
     installed_location = "/usr/share/music-app/music-app.qml"
 
-    def setup_environment(self):
+    def get_launcher_method_and_type(self):
         if os.path.exists(self.local_location):
             launch = self.launch_test_local
             test_type = 'local'
@@ -61,16 +61,15 @@
         return launch, test_type
 
     def setUp(self):
-        launch, self.test_type = self.setup_environment()
-        self.home_dir = self._patch_home()
-        self._create_music_library()
-        self.pointing_device = Pointer(self.input_device_class.create())
-        super(MusicTestCase, self).setUp()
-        launch()
+        super(BaseTestCaseWithPatchedHome, self).setUp()
+        _, test_type = self.get_launcher_method_and_type()
+        self.home_dir = self._patch_home(test_type)
+
+        self._create_music_library(test_type)
 
     @autopilot_logging.log_action(logger.info)
     def launch_test_local(self):
-        self.app = self.launch_test_application(
+        return self.launch_test_application(
             base.get_qmlscene_launch_command(),
             self.local_location,
             "debug",
@@ -79,7 +78,7 @@
 
     @autopilot_logging.log_action(logger.info)
     def launch_test_installed(self):
-        self.app = self.launch_test_application(
+        return self.launch_test_application(
             base.get_qmlscene_launch_command(),
             self.installed_location,
             "debug",
@@ -88,7 +87,7 @@
 
     @autopilot_logging.log_action(logger.info)
     def launch_test_click(self):
-        self.app = self.launch_click_package(
+        return self.launch_click_package(
             "com.ubuntu.music",
             emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
@@ -109,12 +108,12 @@
                                    '.Xauthority')),
                 os.path.join(directory, '.Xauthority'))
 
-    def _patch_home(self):
+    def _patch_home(self, test_type):
         """ mock /home for testing purposes to preserve user data
         """
         # click requires apparmor profile, and writing to special dir
         # but the desktop can write to a traditional /tmp directory
-        if self.test_type == 'click':
+        if test_type == 'click':
             env_dir = os.path.join(os.environ.get('HOME'), 'autopilot',
                                    'fakeenv')
 
@@ -175,8 +174,8 @@
         logger.debug("Patched home to fake home directory %s" % temp_dir)
         return temp_dir
 
-    def _create_music_library(self):
-        logger.debug("Creating music library for %s test" % self.test_type)
+    def _create_music_library(self, test_type):
+        logger.debug("Creating music library for %s test" % test_type)
         logger.debug("Home set to %s" % self.home_dir)
         musicpath = os.path.join(self.home_dir, 'Music')
         logger.debug("Music path set to %s" % musicpath)
@@ -245,10 +244,12 @@
         os.remove(in_filename)
         os.rename(out_filename, in_filename)
 
-    @property
-    def player(self):
-        return self.main_view.get_player()
-
-    @property
-    def main_view(self):
-        return self.app.select_single(MainView)
+
+class MusicAppTestCase(BaseTestCaseWithPatchedHome):
+
+    """Base test case that launches the music-app."""
+
+    def setUp(self):
+        super(MusicAppTestCase, self).setUp()
+        launcher_method, _ = self.get_launcher_method_and_type()
+        self.app = MusicApp(launcher_method())

=== modified file 'tests/autopilot/music_app/tests/test_music.py'
--- tests/autopilot/music_app/tests/test_music.py	2014-08-14 16:52:12 +0000
+++ tests/autopilot/music_app/tests/test_music.py	2014-08-21 18:57:12 +0000
@@ -15,40 +15,31 @@
 from testtools.matchers import Equals, Is, Not, LessThan, NotEquals
 
 
-from music_app.tests import MusicTestCase
+from music_app.tests import MusicAppTestCase
 
 logger = logging.getLogger(__name__)
 
 
-class TestMainWindow(MusicTestCase):
+class TestMainWindow(MusicAppTestCase):
 
     def setUp(self):
         super(TestMainWindow, self).setUp()
-        self.assertThat(
-            self.main_view.visible, Eventually(Equals(True)))
 
-        # wait for activity indicator to stop spinning
-        spinner = lambda: self.main_view.get_spinner().running
-        self.assertThat(spinner, Eventually(Equals(False)))
         self.trackTitle = u"Gran Vals"
         self.artistName = u"Francisco Tárrega"
         self.lastTrackTitle = u"TestMP3Title"
 
-    def populate_and_play_queue(self):
-        first_genre_item = self.main_view.get_first_genre_item()
-        self.pointing_device.click_object(first_genre_item)
-
-        song = self.main_view.get_album_page_listview_tracktitle(
-            self.trackTitle)
-        self.pointing_device.click_object(song)
-
-    def populate_and_play_queue_from_songs_tab(self):
-        # switch to songs tab
-        self.main_view.switch_to_tab("trackstab")
-
-        # get track item to add to queue
-        trackitem = self.main_view.get_songs_tab_tracktitle(self.trackTitle)
-        self.pointing_device.click_object(trackitem)
+    @property
+    def main_view(self):
+        return self.app.main_view
+
+    @property
+    def player(self):
+        return self.app.player
+
+    @property
+    def pointing_device(self):
+        return self.app.app.pointing_device
 
     def turn_shuffle_off(self):
         if self.player.shuffle:
@@ -90,8 +81,7 @@
         """ tests if the music library is populated from our
         fake mediascanner database"""
 
-        # populate queue
-        self.populate_and_play_queue_from_songs_tab()
+        self.app.populate_queue()  # populate queue
 
         title = lambda: self.player.currentMetaTitle
         artist = lambda: self.player.currentMetaArtist
@@ -146,8 +136,7 @@
     def test_play_pause_now_playing(self):
         """ Test playing and pausing a track (Music Library must exist) """
 
-        # populate queue
-        self.populate_and_play_queue_from_songs_tab()
+        self.app.populate_queue()  # populate queue
 
         playbutton = self.main_view.get_now_playing_play_button()
 
@@ -165,8 +154,7 @@
     def test_next_previous(self):
         """ Test going to next track (Music Library must exist) """
 
-        # populate queue
-        self.populate_and_play_queue_from_songs_tab()
+        self.app.populate_queue()  # populate queue
 
         playbutton = self.main_view.get_now_playing_play_button()
 
@@ -222,8 +210,7 @@
     def test_mp3(self):
         """ Test that mp3 "plays" or at least doesn't crash on load """
 
-        # populate queue
-        self.populate_and_play_queue_from_songs_tab()
+        self.app.populate_queue()  # populate queue
 
         playbutton = self.main_view.get_now_playing_play_button()
 
@@ -265,8 +252,7 @@
     def test_shuffle(self):
         """ Test shuffle (Music Library must exist) """
 
-        # populate queue
-        self.populate_and_play_queue_from_songs_tab()
+        self.app.populate_queue()  # populate queue
 
         """ Track is playing, shuffle is turned on"""
         forwardbutton = self.main_view.get_forward_button()
@@ -386,8 +372,7 @@
         # get number of tracks in queue before queuing a track
         initialtracksCount = self.main_view.get_queue_track_count()
 
-        # populate queue
-        self.populate_and_play_queue_from_songs_tab()
+        self.app.populate_queue()  # populate queue
 
         # verify track queue has added all songs to initial value
         endtracksCount = self.main_view.get_queue_track_count()
@@ -414,7 +399,7 @@
         initialtracksCount = self.main_view.get_queue_track_count()
 
         # switch to songs tab
-        self.main_view.switch_to_tab("trackstab")
+        self.main_view.switch_to_tab("tracksTab")
 
         # get track item to swipe and queue
         trackitem = self.main_view.get_songs_tab_tracktitle(self.trackTitle)
@@ -457,7 +442,7 @@
            selecting a song to add it to a new playlist. """
 
         # switch to songs tab
-        self.main_view.switch_to_tab("trackstab")
+        self.main_view.switch_to_tab("tracksTab")
 
         # get track item to swipe and queue
         trackitem = self.main_view.get_songs_tab_tracktitle(self.trackTitle)
@@ -563,8 +548,7 @@
         """tests navigating to the Now Playing queue, swiping to delete a
         track, and confirming the delete action. """
 
-        # populate queue
-        self.populate_and_play_queue_from_songs_tab()
+        self.app.populate_queue()  # populate queue
 
         # get initial queue count
         initialqueueCount = self.main_view.get_queue_track_count()
@@ -597,8 +581,7 @@
     def test_playback_stops_when_last_song_ends_and_repeat_off(self):
         """Check that playback stops when the last song in the queue ends"""
 
-        # populate queue
-        self.populate_and_play_queue_from_songs_tab()
+        self.app.populate_queue()  # populate queue
 
         self.turn_shuffle_off()
         self.turn_repeat_off()
@@ -616,8 +599,7 @@
     def test_playback_repeats_when_last_song_ends_and_repeat_on(self):
         """With repeat on, the 1st song should play after the last one ends"""
 
-        # populate queue
-        self.populate_and_play_queue_from_songs_tab()
+        self.app.populate_queue()  # populate queue
 
         self.turn_shuffle_off()
         self.turn_repeat_on()
@@ -636,8 +618,7 @@
     def test_pressing_next_from_last_song_plays_first_when_repeat_on(self):
         """With repeat on, skipping the last song jumps to the first track"""
 
-        # populate queue
-        self.populate_and_play_queue_from_songs_tab()
+        self.app.populate_queue()  # populate queue
 
         self.turn_shuffle_off()
         self.turn_repeat_on()
@@ -655,8 +636,7 @@
     def test_pressing_prev_from_first_song_plays_last_when_repeat_on(self):
         """With repeat on, 'previous' from the 1st song plays the last one."""
 
-        # populate queue
-        self.populate_and_play_queue_from_songs_tab()
+        self.app.populate_queue()  # populate queue
 
         self.turn_shuffle_off()
         self.turn_repeat_on()