Merge lp:~osomon/webbrowser-app/bottomedgebar-autopilot-tests into lp:webbrowser-app

Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
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
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+284892@code.launchpad.net

Commit message

Use the new bottom edge bar to open the tabs view in autopilot tests.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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
6 MouseArea {
7 id: bottomEdgeBar
8+ objectName: "bottomEdgeBar"
9 anchors {
10 left: parent.left
11 right: parent.right
12
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 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
18 #
19-# Copyright 2013-2015 Canonical
20+# Copyright 2013-2016 Canonical
21 #
22 # This program is free software: you can redistribute it and/or modify it
23 # under the terms of the GNU General Public License version 3, as published
24@@ -186,6 +186,9 @@
25 def get_bottom_edge_hint(self):
26 return self.select_single("QQuickImage", objectName="bottomEdgeHint")
27
28+ def get_bottom_edge_bar(self):
29+ return self.select_single(objectName="bottomEdgeBar", visible=True)
30+
31 def get_bookmark_options(self):
32 return self.select_single(BookmarkOptions)
33
34
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 def open_tabs_view(self):
40 self.assertFalse(self.main_window.wide)
41 if model() == 'Desktop':
42- chrome = self.main_window.chrome
43- drawer_button = chrome.get_drawer_button()
44- self.pointing_device.click_object(drawer_button)
45- chrome.get_drawer()
46- tabs_action = chrome.get_drawer_action("tabs")
47- self.pointing_device.click_object(tabs_action)
48+ bar = self.main_window.get_bottom_edge_bar()
49+ self.pointing_device.click_object(bar)
50 else:
51 self.drag_bottom_edge_upwards(0.75)
52 tabs_view = self.main_window.get_tabs_view()

Subscribers

People subscribed via source and target branches

to status/vote changes: