1
=== modified file 'MusicAlbums.qml'
2
--- MusicAlbums.qml	2013-11-23 21:02:25 +0000
3
+++ MusicAlbums.qml	2013-11-27 21:14:45 +0000
4
@@ -103,6 +103,7 @@
5
103
                    }
103
                    }
6
104
                    Label {
104
                    Label {
7
105
                        id: albumArtist
105
                        id: albumArtist
8
106
                        objectName: "albums-albumartist"
9
106
                        anchors.bottom: parent.bottom
107
                        anchors.bottom: parent.bottom
10
107
                        anchors.bottomMargin: units.gu(1)
108
                        anchors.bottomMargin: units.gu(1)
11
108
                        anchors.left: parent.left
109
                        anchors.left: parent.left
12
@@ -187,6 +188,7 @@
13
187
                    }
188
                    }
14
188
                    Label {
189
                    Label {
15
189
                        id: albumArtist
190
                        id: albumArtist
16
191
                        objectName: "albumsheet-albumartist"
17
190
                        wrapMode: Text.NoWrap
192
                        wrapMode: Text.NoWrap
18
191
                        maximumLineCount: 1
193
                        maximumLineCount: 1
19
192
                        fontSize: "small"
194
                        fontSize: "small"
20
193
195
21
=== modified file 'tests/autopilot/music_app/emulators.py'
22
--- tests/autopilot/music_app/emulators.py	2013-11-01 19:52:31 +0000
23
+++ tests/autopilot/music_app/emulators.py	2013-11-27 21:14:45 +0000
24
@@ -81,3 +81,27 @@
25
81
81
26
82
    def get_back_button(self):
82
    def get_back_button(self):
27
83
        return self.select_single("*", objectName="nowPlayingBackButtonObject")
83
        return self.select_single("*", objectName="nowPlayingBackButtonObject")
28
84
29
85
    def get_albumstab(self):
30
86
        return self.select_single("Tab", objectName="albumstab")
31
87
32
88
    def get_albums_albumartist_list(self):
33
89
        return self.select_many("Label", objectName="albums-albumartist")
34
90
35
91
    def get_albums_albumartist(self, artistName):
36
92
        albumartistList = self.get_albums_albumartist_list()
37
93
        for item in albumartistList:
38
94
            if item.text == artistName:
39
95
                return item
40
96
41
97
    def get_album_sheet_artist(self):
42
98
        return self.select_single("Label", objectName="albumsheet-albumartist")
43
99
44
100
    def close_buttons(self):
45
101
        return self.select_many("Button", text="close")
46
102
47
103
    def get_album_sheet_close_button(self):
48
104
        closebuttons = self.close_buttons()
49
105
        for item in closebuttons:
50
106
            if item.enabled:
51
107
                return item
52
84
108
53
=== modified file 'tests/autopilot/music_app/tests/test_music.py'
54
--- tests/autopilot/music_app/tests/test_music.py	2013-11-22 16:58:47 +0000
55
+++ tests/autopilot/music_app/tests/test_music.py	2013-11-27 21:14:45 +0000
56
@@ -10,7 +10,7 @@
57
10
from __future__ import absolute_import
10
from __future__ import absolute_import
58
11
11
59
12
from autopilot.matchers import Eventually
12
from autopilot.matchers import Eventually
61
13
from testtools.matchers import Equals, LessThan
13
from testtools.matchers import Equals, Is, Not, LessThan
62
14
14
63
15
from music_app.tests import MusicTestCase
15
from music_app.tests import MusicTestCase
64
16
16
65
@@ -198,3 +198,24 @@
66
198
                                Eventually(Equals(False)))
198
                                Eventually(Equals(False)))
67
199
                forward = not forward
199
                forward = not forward
68
200
                count += 1
200
                count += 1
69
201
70
202
    def test_show_albums_sheet(self):
71
203
        """tests navigating to the Albums tab and displaying the album sheet"""
72
204
73
205
        artistName = "Benjamin Kerensa"
74
206
75
207
        # switch to albums tab
76
208
        self.main_view.switch_to_tab("albumstab")
77
209
78
210
        #select album
79
211
        albumartist = self.main_view.get_albums_albumartist(artistName)
80
212
        self.pointing_device.click_object(albumartist)
81
213
82
214
        #get album sheet album artist
83
215
        sheet_albumartist = self.main_view.get_album_sheet_artist()
84
216
        self.assertThat(sheet_albumartist.text, Eventually(Equals(artistName)))
85
217
86
218
        # click on close button to close album sheet
87
219
        closebutton = self.main_view.get_album_sheet_close_button()
88
220
        self.pointing_device.click_object(closebutton)
89
221
        self.assertThat(self.main_view.get_albumstab(), Not(Is(None)))
Reviewer	Review Type	Date Requested	Status
Victor Thompson		2013-11-27	Approve on 2013-11-27
Nicholas Skaggs (community)		2013-11-26	Approve on 2013-11-27
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2013-11-27
Review via email: mp+196785@code.launchpad.net