1
=== modified file 'src/imports/Components/1.3/ListItemPopover.qml'
2
--- src/imports/Components/1.3/ListItemPopover.qml	2015-07-01 12:06:34 +0000
3
+++ src/imports/Components/1.3/ListItemPopover.qml	2017-02-13 17:16:25 +0000
4
@@ -24,6 +24,7 @@
5
24
    contentWidth: units.gu(25)
24
    contentWidth: units.gu(25)
6
25
25
7
26
    delegate: ListItem {
26
    delegate: ListItem {
8
27
        visible: action.visible
9
27
        contentItem.anchors {
28
        contentItem.anchors {
10
28
             leftMargin: units.gu(2)
29
             leftMargin: units.gu(2)
11
29
             rightMargin: units.gu(2)
30
             rightMargin: units.gu(2)
12
30
31
13
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py'
14
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2016-08-12 11:42:43 +0000
15
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2017-02-13 17:16:25 +0000
16
@@ -79,6 +79,8 @@
17
79
        name = introspection.get_classname_from_path(path)
79
        name = introspection.get_classname_from_path(path)
18
80
        if name == b'OverflowPanel':
80
        if name == b'OverflowPanel':
19
81
            return True
81
            return True
20
82
        if name == b'ListItemPopover':
21
83
            return True
22
82
84
23
83
        return False
85
        return False
24
84
86
25
85
87
26
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.ListItemTestCase.qml'
27
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.ListItemTestCase.qml	2015-03-03 13:20:06 +0000
28
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.ListItemTestCase.qml	2017-02-13 17:16:25 +0000
29
@@ -15,7 +15,7 @@
30
15
 */
15
 */
31
16
16
32
17
import QtQuick 2.0
17
import QtQuick 2.0
34
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
35
19
19
36
20
MainView {
20
MainView {
37
21
    width: units.gu(48)
21
    width: units.gu(48)
38
@@ -25,7 +25,10 @@
39
25
    Page {
25
    Page {
40
26
        id: testPage
26
        id: testPage
41
27
        objectName: "test_page"
27
        objectName: "test_page"
43
28
        title: listView.ViewItems.selectMode ? "In selection mode" : "No action triggered"
28
        header: PageHeader {
44
29
            objectName: 'test_header'
45
30
            title: listView.ViewItems.selectMode ? "In selection mode" : "No action triggered"
46
31
        }
47
29
        ListView {
32
        ListView {
48
30
            id: listView
33
            id: listView
49
31
            objectName: "test_view"
34
            objectName: "test_view"
50
@@ -40,6 +43,10 @@
51
40
                            iconName: "delete"
43
                            iconName: "delete"
52
41
                            objectName: 'delete_action'
44
                            objectName: 'delete_action'
53
42
                            onTriggered: testPage.title = objectName + " action triggered";
45
                            onTriggered: testPage.title = objectName + " action triggered";
54
46
                        },
55
47
                        Action {
56
48
                            visible: false
57
49
                            objectName: 'invisible_action'
58
43
                        }
50
                        }
59
44
                    ]
51
                    ]
60
45
                }
52
                }
61
46
53
62
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.py'
63
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.py	2015-09-22 15:56:35 +0000
64
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.py	2017-02-13 17:16:25 +0000
65
@@ -17,6 +17,7 @@
66
17
import os
17
import os
67
18
18
68
19
import ubuntuuitoolkit
19
import ubuntuuitoolkit
69
20
from autopilot.introspection import dbus
70
20
from ubuntuuitoolkit import tests
21
from ubuntuuitoolkit import tests
71
21
22
72
22
23
73
@@ -34,7 +35,9 @@
74
34
            'UCListItem', objectName='listitem0')
35
            'UCListItem', objectName='listitem0')
75
35
        self.test_page = self.main_view.select_single(
36
        self.test_page = self.main_view.select_single(
76
36
            objectName='test_page')
37
            objectName='test_page')
78
37
        self.assertEqual(self.test_page.title, 'No action triggered')
38
        header = self.test_page.select_single(
79
39
            'PageHeader', objectName='test_header')
80
40
        self.assertEqual(header.title, 'No action triggered')
81
38
41
82
39
    def test_trigger_delete(self):
42
    def test_trigger_delete(self):
83
40
        self.test_listitem.trigger_leading_action('delete_action')
43
        self.test_listitem.trigger_leading_action('delete_action')
84
@@ -96,3 +99,12 @@
85
96
            'UCListItem', objectName='listitem3')
99
            'UCListItem', objectName='listitem3')
86
97
        listItem3.toggle_selected()
100
        listItem3.toggle_selected()
87
98
        self.assertTrue(listItem3.selected)
101
        self.assertTrue(listItem3.selected)
88
102
89
103
    def test_popover(self):
90
104
        self.pointing_device.click_object(self.test_listitem, button=3)
91
105
        popover = self.main_view.wait_select_single(
92
106
            'ListItemPopover', objectName='listItemContextMenu')
93
107
        self.assertRaises(
94
108
            ubuntuuitoolkit._custom_proxy_objects._common.ToolkitException,
95
109
            popover.click_action_button, 'invisible_action')
96
110
        popover.click_action_button('delete_action')
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2017-02-15
Tim Peeters		2017-02-07	Approve on 2017-02-15
Review via email: mp+316545@code.launchpad.net