diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-09 17:25:22 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-06-26 08:17:30 +0000 |
commit | 7757ec1a562ae36b65a6cae93b3cd308247755ef (patch) | |
tree | 9da058ac021019317111dd1ad90c0a4a32529afe /tests/auto/quick/qmltests | |
parent | 57c49df9c6fcbaaffc66900e191312d4e0a0edfa (diff) |
Adaptations for Chromium 67
Change-Id: I13cedba56012f74651a044d6fa8f0957487bf3eb
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'tests/auto/quick/qmltests')
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_favicon.qml | 4 | ||||
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_getUserMedia.qml | 3 | ||||
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_loadUrl.qml | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_favicon.qml b/tests/auto/quick/qmltests/data/tst_favicon.qml index 0aa8f0bb8..563a87c83 100644 --- a/tests/auto/quick/qmltests/data/tst_favicon.qml +++ b/tests/auto/quick/qmltests/data/tst_favicon.qml @@ -182,7 +182,7 @@ TestWebEngineView { var url = Qt.resolvedUrl("http://url.invalid") webEngineView.url = url - verify(webEngineView.waitForLoadFailed()) + verify(webEngineView.waitForLoadFailed(20000)) verify(webEngineView.testSupport.waitForErrorPageLoadSucceeded()) compare(iconChangedSpy.count, 0) @@ -198,7 +198,7 @@ TestWebEngineView { var url = Qt.resolvedUrl("http://url.invalid") webEngineView.url = url - verify(webEngineView.waitForLoadFailed()) + verify(webEngineView.waitForLoadFailed(20000)) compare(iconChangedSpy.count, 0) diff --git a/tests/auto/quick/qmltests/data/tst_getUserMedia.qml b/tests/auto/quick/qmltests/data/tst_getUserMedia.qml index b497542e3..d1c894699 100644 --- a/tests/auto/quick/qmltests/data/tst_getUserMedia.qml +++ b/tests/auto/quick/qmltests/data/tst_getUserMedia.qml @@ -32,11 +32,14 @@ import QtWebEngine 1.6 TestWebEngineView { id: webEngineView + width: 400 + height: 400 settings.screenCaptureEnabled: true TestCase { name: "GetUserMedia" + when: windowShown function init_data() { return [ diff --git a/tests/auto/quick/qmltests/data/tst_loadUrl.qml b/tests/auto/quick/qmltests/data/tst_loadUrl.qml index d1b6d6099..ec5c965ea 100644 --- a/tests/auto/quick/qmltests/data/tst_loadUrl.qml +++ b/tests/auto/quick/qmltests/data/tst_loadUrl.qml @@ -204,7 +204,7 @@ TestWebEngineView { // Test loadHtml after a failed load var aboutBlank = "about:blank"; webEngineView.url = aboutBlank; // Reset from previous test - verify(webEngineView.waitForLoadSucceeded()); + tryCompare(loadRequestArray, "length", 2); webEngineView.clear(); var bogusSite = "http://www.somesitethatdoesnotexist.abc/"; @@ -217,7 +217,7 @@ TestWebEngineView { } webEngineView.loadingChanged.connect(handleLoadFailed); webEngineView.url = bogusSite - tryCompare(loadRequestArray, "length", 4, 12000); + tryCompare(loadRequestArray, "length", 4, 30000); webEngineView.loadingChanged.disconnect(handleLoadFailed); loadRequest = loadRequestArray[0]; |