Merge lp:~darran-kelinske/music-app/lp_bug_1428454 into lp:music-app/remix

[dazza5000]

* Added a test case for deleting a playlist

Added a test case for deleting a playlist

[Andrew Hayzen (ahayzen)]

Looks good so far :) Just a few inline comments...

L65, L75, L188 and possibly L140 - Could you remove this extra blank lines? (See PEP8 styling on this [0] - 2 lines for a class def and 1 for a method)
L102 - Is there any reason for renaming this var and method call? Could we keep it as add_to_playlist singular?

As I don't think jenkins runs for non-team members, I've manually run PEP8/pyflakes for you so you can see the errors [1]

0 - https://www.python.org/dev/peps/pep-0008/#blank-lines
1 - http://pastebin.ubuntu.com/10629706/

review: Needs Fixing

[lp:~darran-kelinske/music-app/lp_bug_1428454]

850. By Darran Kelinske <email address hidden> on 2015-03-19

fixing formatting and naming issues

851. By Darran Kelinske <email address hidden> on 2015-03-19

restore tracks variable that was removed

[dazza5000 (darran-kelinske)]

Thank yuo for the quick feedback! I think I got the changes. Please let me know. :)

[lp:~darran-kelinske/music-app/lp_bug_1428454]

852. By Darran Kelinske <email address hidden> on 2015-03-20

fixing more spacing issues

[Andrew Hayzen (ahayzen)]

This is looking closer :) Unfortunately there are still some failures...

Some of them are just because there is whitespace at the end of the line.

Also there is one inline comment.

$ pep8 tests/
tests/autopilot/music_app/__init__.py:216:80: E501 line too long (80 > 79 characters)
tests/autopilot/music_app/tests/test_music.py:85:42: W291 trailing whitespace
tests/autopilot/music_app/tests/test_music.py:488:1: W293 blank line contains whitespace
tests/autopilot/music_app/tests/test_music.py:490:53: W291 trailing whitespace
tests/autopilot/music_app/tests/test_music.py:535:2: E901 IndentationError: unindent does not match any outer indentation level
$ pyflakes tests/
tests/autopilot/music_app/tests/test_music.py:535:35: unindent does not match any outer indentation level
 def test_artists_tab_album(self):
                                  ^

I have made a diff [0] which contains fixes for the issues stated above. Then once it is passing pep8/pyflakes we can try triggering jenkins :)

0 - http://pastebin.ubuntu.com/10641729/

review: Needs Fixing

[lp:~darran-kelinske/music-app/lp_bug_1428454]

853. By Darran Kelinske <email address hidden> on 2015-03-21

additional formatting/syntax fixes :)

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

FAILED: Continuous integration, rev:853
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~darran-kelinske/music-app/lp_bug_1428454/+merge/253566/+edit-commit-message

http://91.189.93.70:8080/job/music-app-ci/1282/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2397
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2397/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/376
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/134

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

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

Awesome, thanks for submitting this :) Looks good to me!

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'MusicPlaylists.qml'
--- MusicPlaylists.qml	2015-01-21 00:10:33 +0000
+++ MusicPlaylists.qml	2015-03-21 14:00:53 +0000
@@ -93,6 +93,7 @@
         delegate: Card {
             id: playlistCard
             coverSources: Playlists.getPlaylistCovers(model.name)
+	    objectName: "playlistCardItem" + index
             primaryText: model.name
             secondaryText: i18n.tr("%1 song", "%1 songs", model.count).arg(model.count)
 

=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2015-01-30 01:23:39 +0000
+++ common/SongsPage.qml	2015-03-21 14:00:53 +0000
@@ -593,6 +593,7 @@
         id: removePlaylistDialog
         Dialog {
             id: dialogRemovePlaylist
+	    objectName: "dialogRemovePlaylist"
             // TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
             title: i18n.tr("Permanently delete playlist?")
             text: "("+i18n.tr("This cannot be undone")+")"
@@ -602,6 +603,7 @@
             Button {
                 text: i18n.tr("Remove")
                 color: styleMusic.dialog.confirmRemoveButtonColor
+		objectName: "removePlaylistDialogRemoveButton"
                 onClicked: {
                     // removing playlist
                     Playlists.removePlaylist(dialogRemovePlaylist.oldPlaylistName)

=== modified file 'tests/autopilot/music_app/__init__.py'
--- tests/autopilot/music_app/__init__.py	2015-01-19 17:13:12 +0000
+++ tests/autopilot/music_app/__init__.py	2015-03-21 14:00:53 +0000
@@ -75,6 +75,10 @@
         return self.main_view.wait_select_single(
             Dialog, objectName="dialogNewPlaylist")
 
+    def get_delete_playlist_dialog(self):
+        return self.main_view.wait_select_single(
+            Dialog, objectName="dialogRemovePlaylist")
+
     def get_now_playing_page(self):
         return self.app.wait_select_single(MusicNowPlaying,
                                            objectName="nowPlayingPage")
@@ -208,6 +212,21 @@
         return self.wait_select_single(
             "CardView", objectName="playlistsCardView").count
 
+    def click_new_playlist_action(self):
+            self.main_view.get_header(
+                ).click_action_button("newPlaylistButton")
+
+    @click_object
+    def click_playlist(self, i):
+        return self.get_playlist(i)
+
+    def get_playlist(self, i):
+        return (self.wait_select_single("Card",
+                objectName="playlistCardItem" + str(i)))
+
+    def click_delete_playlist_action(self):
+            self.main_view.get_header().click_action_button("deletePlaylist")
+
 
 class MusicaddtoPlaylist(MusicPage):
     """ Autopilot helper for add to playlist page """
@@ -411,6 +430,11 @@
         self.wait_select_single(
             "TextField", objectName="playlistNameTextField").write(text)
 
+    @click_object
+    def click_remove_playlist_dialog_remove_button(self):
+        return self.wait_select_single(
+            "Button", objectName="removePlaylistDialogRemoveButton")
+
 
 class MainView(MainView):
     """Autopilot custom proxy object for the MainView."""

=== modified file 'tests/autopilot/music_app/tests/test_music.py'
--- tests/autopilot/music_app/tests/test_music.py	2015-01-19 17:13:12 +0000
+++ tests/autopilot/music_app/tests/test_music.py	2015-03-21 14:00:53 +0000
@@ -81,7 +81,8 @@
         track = self.app.get_songs_page().get_track(0)
         track.swipe_reveal_actions()
 
-        track.click_add_to_queue_action()  # add track to the queue
+        # add track to the queue
+        track.click_add_to_queue_action()
 
         # wait for track to be queued
         self.app.get_queue_count().wait_for(initial_tracks_count + 1)
@@ -485,6 +486,52 @@
         # verify song has been added to playlist
         self.assertThat(playlists_page.get_count(), Equals(1))
 
+    def test_select_and_delete_playlist(self):
+        """tests deleting a playlist by creating a playlist,
+            selecting it, and then deleting it. """
+
+        # switch to playlist page
+        playlists_page = self.app.get_playlists_page()
+
+        # get initial list view playlist count
+        playlist_count = playlists_page.get_count()
+
+        # click on New playlist button in header
+        playlists_page.click_new_playlist_action()
+
+        # get dialog
+        new_dialog = self.app.get_new_playlist_dialog()
+
+        # input playlist name
+        new_dialog.type_new_playlist_dialog_name("testDeletePlaylist")
+
+        # click on the create Button
+        new_dialog.click_new_playlist_dialog_create_button()
+
+        # verify playlist has been sucessfully created
+        self.assertThat(playlists_page.get_count(),
+                        Eventually(Equals(playlist_count + 1)))
+
+        self.assertThat(playlists_page.get_playlist(0).primaryText,
+                        Equals("testDeletePlaylist"))
+
+        # select the playlist that was just created
+        playlists_page.click_playlist(0)
+
+        # click the delete icon
+        playlists_page.click_delete_playlist_action()
+
+        # get dialog
+        delete_dialog = self.app.get_delete_playlist_dialog()
+
+        # click on the remove Button
+        delete_dialog.click_remove_playlist_dialog_remove_button()
+
+        playlists_page = self.app.get_playlists_page()
+
+        # verify that the playlist has been removed
+        self.assertThat(playlists_page.get_count(), Equals(playlist_count))
+
     def test_artists_tab_album(self):
         """tests navigating to the Artists tab and playing an album"""