Merge lp:~osomon/webbrowser-app/workaround-1526940 into lp:webbrowser-app

[Olivier Tilloy]

Work around what appears to be a regression in the UITK by specifying a non-null delay when swiping a list item to delete it in unit tests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1298
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2542/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5841/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1296
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1296
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1296/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1296
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4505/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5854
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5854/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26139

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

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Looks good, and makes the tests reliable again (the CI failures are unrelated, caused by libubuntugestures5 attempting to overwrite a file in libubuntugestures)

review: Approve

=== modified file 'tests/unittests/qml/WebbrowserTestCase.qml'
--- tests/unittests/qml/WebbrowserTestCase.qml	2015-11-17 17:19:13 +0000
+++ tests/unittests/qml/WebbrowserTestCase.qml	2015-12-16 21:29:34 +0000
@@ -48,7 +48,10 @@
     }
 
     function swipeToDeleteAndConfirm(listitem) {
-        flick(listitem, listitem.width / 10, listitem.height / 2, listitem.width / 2, 0)
+        flick(listitem,
+              listitem.width / 10, listitem.height / 2, listitem.width / 2, 0,
+              // work around https://launchpad.net/bugs/1526940 by specifying a non-null delay
+              -1, -1, Qt.LeftButton, Qt.NoModifiers, 1)
         var confirm = findChild(listitem, "actionbutton_leadingAction.delete")
         clickItem(confirm)
     }