diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-31 15:12:16 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-31 15:12:41 +0200 |
| commit | 68774e4e76dac8a58f103122973bc7c3ba144c6c (patch) | |
| tree | 5d108fd84711d43abeee0b3b4ecb5548dc10a60a /tests | |
| parent | 3b4ca800635003844ed54d2e056ee3f6559b108b (diff) | |
| parent | 71916012ea9434247c31e361a3033ae69c4781c6 (diff) | |
Merge branch '5.7' into dev
Change-Id: I31793735d6523e157558d731f46bf10bfc1156d0
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qmltests/BLACKLIST | 1 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/data/geolocation.html | 1 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/data/tst_geopermission.qml | 5 |
3 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/quick/qmltests/BLACKLIST b/tests/auto/quick/qmltests/BLACKLIST index 3abcd82d0..035e49a83 100644 --- a/tests/auto/quick/qmltests/BLACKLIST +++ b/tests/auto/quick/qmltests/BLACKLIST @@ -6,4 +6,3 @@ osx [WebViewGeopermission::test_geoPermissionRequest] osx -windows diff --git a/tests/auto/quick/qmltests/data/geolocation.html b/tests/auto/quick/qmltests/data/geolocation.html index c095a6b9e..8b116c8ee 100644 --- a/tests/auto/quick/qmltests/data/geolocation.html +++ b/tests/auto/quick/qmltests/data/geolocation.html @@ -8,6 +8,7 @@ function successHandler(location) { message.innerHTML = "Latitude: " + location.coords.latitude + "<br>Longitude: " + location.coords.longitude; + console.error("Success"); } function errorHandler(error) { diff --git a/tests/auto/quick/qmltests/data/tst_geopermission.qml b/tests/auto/quick/qmltests/data/tst_geopermission.qml index a08ec155c..642cf2016 100644 --- a/tests/auto/quick/qmltests/data/tst_geopermission.qml +++ b/tests/auto/quick/qmltests/data/tst_geopermission.qml @@ -83,8 +83,9 @@ TestWebEngineView { featurePermissionSpy.wait() verify(geoPermissionRequested) compare(featurePermissionSpy.count, 1) - if (consoleErrorMessageSpy.count) // Print the error message if it fails to get user's location - fail(consoleErrorMessageSpy.signalArguments[0][0]) + consoleErrorMessageSpy.wait() + verify(consoleErrorMessageSpy.signalArguments[0][0] === "Success" || + consoleErrorMessageSpy.signalArguments[0][0] === "") } function test_deniedGeolocationByUser() { |