1
=== modified file 'src/app/webbrowser/Browser.qml'
2
--- src/app/webbrowser/Browser.qml	2016-01-28 22:12:27 +0000
3
+++ src/app/webbrowser/Browser.qml	2016-02-03 11:57:58 +0000
4
@@ -753,6 +753,7 @@
5
753
753
6
754
    MouseArea {
754
    MouseArea {
7
755
        id: bottomEdgeBar
755
        id: bottomEdgeBar
8
756
        objectName: "bottomEdgeBar"
9
756
        anchors {
757
        anchors {
10
757
            left: parent.left
758
            left: parent.left
11
758
            right: parent.right
759
            right: parent.right
12
759
760
13
=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
14
--- tests/autopilot/webbrowser_app/emulators/browser.py	2015-12-16 15:34:21 +0000
15
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2016-02-03 11:57:58 +0000
16
@@ -1,6 +1,6 @@
17
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
18
2
#
2
#
20
3
# Copyright 2013-2015 Canonical
3
# Copyright 2013-2016 Canonical
21
4
#
4
#
22
5
# This program is free software: you can redistribute it and/or modify it
5
# This program is free software: you can redistribute it and/or modify it
23
6
# under the terms of the GNU General Public License version 3, as published
6
# under the terms of the GNU General Public License version 3, as published
24
@@ -186,6 +186,9 @@
25
186
    def get_bottom_edge_hint(self):
186
    def get_bottom_edge_hint(self):
26
187
        return self.select_single("QQuickImage", objectName="bottomEdgeHint")
187
        return self.select_single("QQuickImage", objectName="bottomEdgeHint")
27
188
188
28
189
    def get_bottom_edge_bar(self):
29
190
        return self.select_single(objectName="bottomEdgeBar", visible=True)
30
191
31
189
    def get_bookmark_options(self):
192
    def get_bookmark_options(self):
32
190
        return self.select_single(BookmarkOptions)
193
        return self.select_single(BookmarkOptions)
33
191
194
34
192
195
35
=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
36
--- tests/autopilot/webbrowser_app/tests/__init__.py	2016-01-21 10:29:17 +0000
37
+++ tests/autopilot/webbrowser_app/tests/__init__.py	2016-02-03 11:57:58 +0000
38
@@ -131,12 +131,8 @@
39
131
    def open_tabs_view(self):
131
    def open_tabs_view(self):
40
132
        self.assertFalse(self.main_window.wide)
132
        self.assertFalse(self.main_window.wide)
41
133
        if model() == 'Desktop':
133
        if model() == 'Desktop':
48
134
            chrome = self.main_window.chrome
134
            bar = self.main_window.get_bottom_edge_bar()
49
135
            drawer_button = chrome.get_drawer_button()
135
            self.pointing_device.click_object(bar)
44
136
            self.pointing_device.click_object(drawer_button)
45
137
            chrome.get_drawer()
46
138
            tabs_action = chrome.get_drawer_action("tabs")
47
139
            self.pointing_device.click_object(tabs_action)
50
140
        else:
136
        else:
51
141
            self.drag_bottom_edge_upwards(0.75)
137
            self.drag_bottom_edge_upwards(0.75)
52
142
        tabs_view = self.main_window.get_tabs_view()
138
        tabs_view = self.main_window.get_tabs_view()
Status:	Merged
Approved by:	Olivier Tilloy on 2016-02-15
Approved revision:	1345
Merged at revision:	1349
Proposed branch:	lp:~osomon/webbrowser-app/bottomedgebar-autopilot-tests
Merge into:	lp:webbrowser-app
Diff against target:	52 lines (+7/-7) 3 files modified src/app/webbrowser/Browser.qml (+1/-0) tests/autopilot/webbrowser_app/emulators/browser.py (+4/-1) tests/autopilot/webbrowser_app/tests/__init__.py (+2/-6)
To merge this branch:	bzr merge lp:~osomon/webbrowser-app/bottomedgebar-autopilot-tests
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-02-04
Ubuntu Phablet Team		2016-02-03	Pending
Review via email: mp+284892@code.launchpad.net