Merge lp:~osomon/webbrowser-app/autopilot-failures-desktop-1499411 into lp:webbrowser-app

[Olivier Tilloy]

Fix a couple of autopilot test failures on desktop.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1203
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2281/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4348
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1035/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1035
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1035/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1035/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3544
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4345
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4345/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23646

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2281/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-09-22 01:27:19 +0000
+++ src/app/webbrowser/Browser.qml	2015-09-24 16:03:10 +0000
@@ -367,21 +367,21 @@
                     objectName: "share"
                     text: i18n.tr("Share")
                     iconName: "share"
-                    visible: (formFactor == "mobile") && browser.currentWebview && browser.currentWebview.url.toString()
+                    enabled: (formFactor == "mobile") && browser.currentWebview && browser.currentWebview.url.toString()
                     onTriggered: internal.shareLink(browser.currentWebview.url, browser.currentWebview.title)
                 },
                 Action {
                     objectName: "history"
                     text: i18n.tr("History")
                     iconName: "history"
-                    visible: browser.historyModel
+                    enabled: browser.historyModel
                     onTriggered: historyViewLoader.active = true
                 },
                 Action {
                     objectName: "tabs"
                     text: i18n.tr("Open tabs")
                     iconName: "browser-tabs"
-                    visible: (formFactor != "mobile") && !browser.wide
+                    enabled: (formFactor != "mobile") && !browser.wide
                     onTriggered: {
                         recentView.state = "shown"
                         recentToolbar.state = "shown"
@@ -391,14 +391,14 @@
                     objectName: "newtab"
                     text: i18n.tr("New tab")
                     iconName: browser.incognito ? "private-tab-new" : "tab-new"
-                    visible: (formFactor != "mobile") && !browser.wide
+                    enabled: (formFactor != "mobile") && !browser.wide
                     onTriggered: browser.openUrlInNewTab("", true)
                 },
                 Action {
                     objectName: "findinpage"
                     text: i18n.tr("Find in page")
                     iconName: "search"
-                    visible: !chrome.findInPageMode && !newTabViewLoader.active
+                    enabled: !chrome.findInPageMode && !newTabViewLoader.active
                     onTriggered: {
                         chrome.findInPageMode = true
                         chrome.focus = true

=== modified file 'tests/autopilot/webbrowser_app/tests/test_new_tab_view.py'
--- tests/autopilot/webbrowser_app/tests/test_new_tab_view.py	2015-08-12 12:31:56 +0000
+++ tests/autopilot/webbrowser_app/tests/test_new_tab_view.py	2015-09-24 16:03:10 +0000
@@ -458,8 +458,7 @@
         bookmark = bookmarks[1]
         title = bookmark.title
         grip = bookmark.get_grip()
-        original_x = grip.globalRect.x
-        original_y = grip.globalRect.y
+        rect = grip.globalRect
 
         # Test that when hovering normal bookmarks item the grip appears
         self.assertThat(grip.opacity, Equals(0))
@@ -467,27 +466,39 @@
         self.assertThat(grip.opacity, Eventually(Equals(1.0)))
 
         # Test that an item bounces back when dragged within the list itself
-        self.pointing_device.drag(original_x, original_y,
-                                  original_x, original_y + 200)
+        self.pointing_device.drag(rect.x, rect.y,
+                                  rect.x, rect.y + 200)
+        self.assertThat(grip.globalRect, Eventually(Equals(rect)))
 
         # Test that an item bounces back when dragged to the same folder
         folder = folders[0]
         folder_cx = folder.globalRect.x + folder.width / 2
         folder_cy = folder.globalRect.y + folder.height / 2
-        self.pointing_device.drag(original_x, original_y,
-                                  folder_cx, folder_cy)
-
-        self.assertThat(lambda: (grip.globalRect.x, grip.globalRect.y),
-                        Eventually(Equals((original_x, original_y))))
+        # Work around https://launchpad.net/bugs/1499437 by dragging downwards
+        # a little bit first, then to the target folder.
+        self.pointing_device.move_to_object(grip)
+        pos = self.pointing_device.position()
+        self.pointing_device.press()
+        self.pointing_device.move(pos[0], pos[1] + 20)
+        self.pointing_device.move(folder_cx, folder_cy)
+        self.pointing_device.release()
+        self.assertThat(grip.globalRect, Eventually(Equals(rect)))
 
         # Test that dragging an item to another folder removes it from this one
         # and adds it to the target folder
         folder = folders[2]
         folder_cx = folder.globalRect.x + folder.width / 2
         folder_cy = folder.globalRect.y + folder.height / 2
-        self.pointing_device.drag(original_x, original_y,
-                                  folder_cx, folder_cy)
-
+        # Work around https://launchpad.net/bugs/1499437 by dragging downwards
+        # a little bit first, then to the target folder.
+        self.pointing_device.move_to_object(grip)
+        pos = self.pointing_device.position()
+        self.pointing_device.press()
+        self.pointing_device.move(pos[0], pos[1] + 20)
+        # Move the cursor to a few pixels below the vertical center of the
+        # folder to ensure that the folder above doesn’t get targetted instead.
+        self.pointing_device.move(folder_cx, folder_cy + 5)
+        self.pointing_device.release()
         self.assertThat(lambda: len(view.get_bookmarks_list()),
                         Eventually(NotEquals(previous_count)))