1
=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
2
--- modules/Ubuntu/Components/ToolbarItems.qml	2013-07-12 10:27:41 +0000
3
+++ modules/Ubuntu/Components/ToolbarItems.qml	2013-10-14 16:41:00 +0000
4
@@ -137,6 +137,7 @@
5
137
        \endqml
137
        \endqml
6
138
     */
138
     */
7
139
    property Item back: ToolbarButton {
139
    property Item back: ToolbarButton {
8
140
        objectName: "back_toolbar_button"
9
140
        iconSource: Qt.resolvedUrl("artwork/back.png")
141
        iconSource: Qt.resolvedUrl("artwork/back.png")
10
141
        text: i18n.tr("Back")
142
        text: i18n.tr("Back")
11
142
        visible: toolbarItems.pageStack && toolbarItems.pageStack.depth > 1
143
        visible: toolbarItems.pageStack && toolbarItems.pageStack.depth > 1
12
143
144
13
=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
14
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2013-10-02 07:01:03 +0000
15
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2013-10-14 16:41:00 +0000
16
@@ -183,6 +183,11 @@
17
183
        return self.select_single(
183
        return self.select_single(
18
184
            ActionSelectionPopover, objectName=object_name)
184
            ActionSelectionPopover, objectName=object_name)
19
185
185
20
186
    def go_back(self):
21
187
        """Go to the previous page."""
22
188
        toolbar = self.open_toolbar()
23
189
        toolbar.click_back_button()
24
190
25
186
191
26
187
class Header(UbuntuUIToolkitEmulatorBase):
192
class Header(UbuntuUIToolkitEmulatorBase):
27
188
    """Header Autopilot emulator."""
193
    """Header Autopilot emulator."""
28
@@ -223,6 +228,10 @@
29
223
    def _get_button(self, object_name):
228
    def _get_button(self, object_name):
30
224
        return self.select_single('ActionItem', objectName=object_name)
229
        return self.select_single('ActionItem', objectName=object_name)
31
225
230
32
231
    def click_back_button(self):
33
232
        """Click the back button of the toolbar."""
34
233
        self.click_button('back_toolbar_button')
35
234
36
226
235
37
227
class Tabs(UbuntuUIToolkitEmulatorBase):
236
class Tabs(UbuntuUIToolkitEmulatorBase):
38
228
    """Tabs Autopilot emulator."""
237
    """Tabs Autopilot emulator."""
39
229
238
40
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
41
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2013-10-03 03:35:03 +0000
42
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2013-10-14 16:41:00 +0000
43
@@ -445,3 +445,58 @@
44
445
        with mock.patch.object(input.Pointer, 'click_object') as mock_click:
445
        with mock.patch.object(input.Pointer, 'click_object') as mock_click:
45
446
            self.toggle.uncheck()
446
            self.toggle.uncheck()
46
447
        self.assertFalse(mock_click.called)
447
        self.assertFalse(mock_click.called)
47
448
48
449
49
450
class PageStackTestCase(tests.QMLStringAppTestCase):
50
451
51
452
    test_qml = ("""
52
453
import QtQuick 2.0
53
454
import Ubuntu.Components 0.1
54
455
55
456
MainView {
56
457
    width: units.gu(48)
57
458
    height: units.gu(60)
58
459
59
460
    PageStack {
60
461
        id: pageStack
61
462
        Component.onCompleted: push(page0)
62
463
63
464
        Page {
64
465
            id: page0
65
466
            title: "Page 0"
66
467
            visible: false
67
468
68
469
            Button {
69
470
                objectName: "go_to_page1"
70
471
                text: "Go to page 1"
71
472
                onClicked: pageStack.push(page1)
72
473
            }
73
474
        }
74
475
75
476
        Page {
76
477
            id: page1
77
478
            title: "Page 1"
78
479
            visible: false
79
480
        }
80
481
    }
81
482
}
82
483
""")
83
484
84
485
    def setUp(self):
85
486
        super(PageStackTestCase, self).setUp()
86
487
        self.header = self.main_view.get_header()
87
488
        self.assertEqual(self.header.title, 'Page 0')
88
489
89
490
    def test_open_page(self):
90
491
        self._go_to_page1()
91
492
        self.assertEqual(self.header.title, 'Page 1')
92
493
93
494
    def _go_to_page1(self):
94
495
        button = self.main_view.select_single(
95
496
            'Button', objectName='go_to_page1')
96
497
        self.pointing_device.click_object(button)
97
498
98
499
    def test_go_back(self):
99
500
        self._go_to_page1()
100
501
        self.main_view.go_back()
101
502
        self.assertEqual(self.header.title, 'Page 0')
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-10-18
Martin Pitt (community)		2013-10-14	Approve on 2013-10-14
Ubuntu SDK team		2013-10-14	Pending
Review via email: mp+191002@code.launchpad.net