Merge lp:~carla-sella/music-app/show_albums_sheet into lp:music-app/trusty

[Carla Sella]

Autopilot test for music app.

Added test_show_albums_sheet.

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

FAILED: Continuous integration, rev:261
http://91.189.93.70:8080/job/music-app-ci/333/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/302/console
    FAILURE: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/333/console
    FAILURE: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/335/console
    FAILURE: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/54/console

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

review: Needs Fixing (continuous-integration)

[lp:~carla-sella/music-app/show_albums_sheet]

262. By Carla Sella <email address hidden> on 2013-11-26

Fixed pep8 error.

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

FAILED: Continuous integration, rev:262
http://91.189.93.70:8080/job/music-app-ci/334/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/303/console
    FAILURE: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/334/console
    FAILURE: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/336/console
    FAILURE: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/55/console

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Carla, remember to run pyflakes to :-)

+ pyflakes .
./tests/autopilot/music_app/tests/test_music.py:13: 'NotEquals' imported but unused
./tests/autopilot/music_app/tests/test_music.py:209: local variable 'albumstab' is assigned to but never used
./debian/music-app-autopilot/usr/lib/python2.7/dist-packages/music_app/tests/test_music.py:13: 'NotEquals' imported but unused
./debian/music-app

Should be an easy fix.

review: Needs Fixing

[Carla Sella (carla-sella)]

I fixed everything now.

[lp:~carla-sella/music-app/show_albums_sheet]

263. By Carla Sella <email address hidden> on 2013-11-27

Ran pyflakes on tests.

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

PASSED: Continuous integration, rev:263
http://91.189.93.70:8080/job/music-app-ci/335/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/305
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/335
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/337
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/56

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

review: Approve (continuous-integration)

[lp:~carla-sella/music-app/show_albums_sheet]

264. By Carla Sella <email address hidden> on 2013-11-27

Deleted redundant asserts.

265. By Carla Sella <email address hidden> on 2013-11-27

Fixed asserts.

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

PASSED: Continuous integration, rev:265
http://91.189.93.70:8080/job/music-app-ci/336/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/306
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/336
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/338
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/57

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

review: Approve

[Victor Thompson (vthompson)]

review: Approve

[Carla Sella (carla-sella)]

Closed bug ##1253447.

=== modified file 'MusicAlbums.qml'
--- MusicAlbums.qml	2013-11-23 21:02:25 +0000
+++ MusicAlbums.qml	2013-11-27 21:14:45 +0000
@@ -103,6 +103,7 @@
                     }
                     Label {
                         id: albumArtist
+                        objectName: "albums-albumartist"
                         anchors.bottom: parent.bottom
                         anchors.bottomMargin: units.gu(1)
                         anchors.left: parent.left
@@ -187,6 +188,7 @@
                     }
                     Label {
                         id: albumArtist
+                        objectName: "albumsheet-albumartist"
                         wrapMode: Text.NoWrap
                         maximumLineCount: 1
                         fontSize: "small"

=== modified file 'tests/autopilot/music_app/emulators.py'
--- tests/autopilot/music_app/emulators.py	2013-11-01 19:52:31 +0000
+++ tests/autopilot/music_app/emulators.py	2013-11-27 21:14:45 +0000
@@ -81,3 +81,27 @@
 
     def get_back_button(self):
         return self.select_single("*", objectName="nowPlayingBackButtonObject")
+
+    def get_albumstab(self):
+        return self.select_single("Tab", objectName="albumstab")
+
+    def get_albums_albumartist_list(self):
+        return self.select_many("Label", objectName="albums-albumartist")
+
+    def get_albums_albumartist(self, artistName):
+        albumartistList = self.get_albums_albumartist_list()
+        for item in albumartistList:
+            if item.text == artistName:
+                return item
+
+    def get_album_sheet_artist(self):
+        return self.select_single("Label", objectName="albumsheet-albumartist")
+
+    def close_buttons(self):
+        return self.select_many("Button", text="close")
+
+    def get_album_sheet_close_button(self):
+        closebuttons = self.close_buttons()
+        for item in closebuttons:
+            if item.enabled:
+                return item

=== modified file 'tests/autopilot/music_app/tests/test_music.py'
--- tests/autopilot/music_app/tests/test_music.py	2013-11-22 16:58:47 +0000
+++ tests/autopilot/music_app/tests/test_music.py	2013-11-27 21:14:45 +0000
@@ -10,7 +10,7 @@
 from __future__ import absolute_import
 
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals, LessThan
+from testtools.matchers import Equals, Is, Not, LessThan
 
 from music_app.tests import MusicTestCase
 
@@ -198,3 +198,24 @@
                                 Eventually(Equals(False)))
                 forward = not forward
                 count += 1
+
+    def test_show_albums_sheet(self):
+        """tests navigating to the Albums tab and displaying the album sheet"""
+
+        artistName = "Benjamin Kerensa"
+
+        # switch to albums tab
+        self.main_view.switch_to_tab("albumstab")
+
+        #select album
+        albumartist = self.main_view.get_albums_albumartist(artistName)
+        self.pointing_device.click_object(albumartist)
+
+        #get album sheet album artist
+        sheet_albumartist = self.main_view.get_album_sheet_artist()
+        self.assertThat(sheet_albumartist.text, Eventually(Equals(artistName)))
+
+        # click on close button to close album sheet
+        closebutton = self.main_view.get_album_sheet_close_button()
+        self.pointing_device.click_object(closebutton)
+        self.assertThat(self.main_view.get_albumstab(), Not(Is(None)))