1
=== modified file 'src/qml/Messages.qml'
2
--- src/qml/Messages.qml	2014-07-18 14:08:05 +0000
3
+++ src/qml/Messages.qml	2014-07-24 13:22:26 +0000
4
@@ -324,6 +324,7 @@
5
324
        }
324
        }
6
325
        Icon {
325
        Icon {
7
326
            id: addIcon
326
            id: addIcon
8
327
            objectName: "addNewRecipientIcon"
9
327
            visible: multiRecipient.visible
328
            visible: multiRecipient.visible
10
328
            height: units.gu(3)
329
            height: units.gu(3)
11
329
            width: units.gu(3)
330
            width: units.gu(3)
12
330
331
13
=== modified file 'tests/autopilot/messaging_app/emulators.py'
14
--- tests/autopilot/messaging_app/emulators.py	2014-07-17 16:09:02 +0000
15
+++ tests/autopilot/messaging_app/emulators.py	2014-07-24 13:22:26 +0000
16
@@ -146,11 +146,11 @@
17
146
        )
146
        )
18
147
147
19
148
    def get_toolbar_add_contact_icon(self):
148
    def get_toolbar_add_contact_icon(self):
21
149
        """Return toolbar icon with name new-contact"""
149
        """Return toolbar icon to add contact"""
22
150
150
23
151
        return self.select_single(
151
        return self.select_single(
24
152
            'Icon',
152
            'Icon',
26
153
            name='new-contact',
153
            objectName='addNewRecipientIcon',
27
154
        )
154
        )
28
155
155
29
156
    def click_add_contact_icon(self):
156
    def click_add_contact_icon(self):
Status:	Merged
Approved by:	Zoltan Balogh on 2014-07-24
Approved revision:	159
Merged at revision:	158
Proposed branch:	lp:~tiagosh/messaging-app/fix-broken-test
Merge into:	lp:messaging-app
Diff against target:	29 lines (+3/-2) 2 files modified src/qml/Messages.qml (+1/-0) tests/autopilot/messaging_app/emulators.py (+2/-2)
To merge this branch:	bzr merge lp:~tiagosh/messaging-app/fix-broken-test
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-07-24
Brendan Donegan (community)			Approve on 2014-07-24
Ubuntu Phablet Team		2014-07-23	Pending
Review via email: mp+227949@code.launchpad.net