Merge lp:~osomon/webbrowser-app/ap-tests-bottom-edge-handle into lp:webbrowser-app

[Olivier Tilloy]

Make the autopilot tests more reliable when dragging the bottom edge.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1386
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/112/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/112/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/112/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/112/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/112/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/112/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/112/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/112/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/112/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/112/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/112/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/112/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-03-07 18:44:34 +0000
+++ src/app/webbrowser/Browser.qml	2016-03-21 16:14:51 +0000
@@ -689,6 +689,7 @@
 
     BottomEdgeHandle {
         id: bottomEdgeHandle
+        objectName: "bottomEdgeHandle"
 
         anchors {
             left: parent.left
@@ -727,7 +728,6 @@
 
     Image {
         id: bottomEdgeHint
-        objectName: "bottomEdgeHint"
         source: "assets/bottom_edge_hint.png"
         property bool forceShow: false
         anchors {

=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
--- tests/autopilot/webbrowser_app/emulators/browser.py	2016-02-25 21:09:56 +0000
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2016-03-21 16:14:51 +0000
@@ -183,8 +183,8 @@
                                     objectName="downloadFileButton")
         self.pointing_device.click_object(button)
 
-    def get_bottom_edge_hint(self):
-        return self.select_single("QQuickImage", objectName="bottomEdgeHint")
+    def get_bottom_edge_handle(self):
+        return self.select_single(objectName="bottomEdgeHandle")
 
     def get_bottom_edge_bar(self):
         return self.select_single(objectName="bottomEdgeBar", visible=True)

=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
--- tests/autopilot/webbrowser_app/tests/__init__.py	2016-02-23 11:24:26 +0000
+++ tests/autopilot/webbrowser_app/tests/__init__.py	2016-03-21 16:14:51 +0000
@@ -122,9 +122,9 @@
 
     def drag_bottom_edge_upwards(self, fraction):
         self.assertThat(model(), NotEquals('Desktop'))
-        hint = self.main_window.get_bottom_edge_hint()
-        x = hint.globalRect.x + hint.globalRect.width // 2
-        y0 = hint.globalRect.y + hint.globalRect.height // 2
+        handleRect = self.main_window.get_bottom_edge_handle().globalRect
+        x = handleRect.x + handleRect.width // 2
+        y0 = handleRect.y + handleRect.height // 2
         y1 = y0 - int(self.main_window.height * fraction)
         self.pointing_device.drag(x, y0, x, y1)