diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2017-06-15 16:47:30 +0200 |
---|---|---|
committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2017-07-13 09:25:46 +0000 |
commit | 9e2caf8b8845e1b35dfbfc40fbd856762ddd461a (patch) | |
tree | 25c5087eb839d72e3cf7a7040e63f3b63bfd3882 /tests | |
parent | ec73b97ab7bb70178e58fd3bf59e88a168c73f87 (diff) |
Suppress extra loadStarted signal for data URL with specified base URL
In these cases two NavigationHandles are created. One for the data URL
and another one for the base URL. Suppress the loadStarted signal for
data URL one since it is expected to be informed about the base URL.
Change-Id: I1a3006cf552a26b8419bd76454e26c0e33c2e898
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_loadUrl.qml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_loadUrl.qml b/tests/auto/quick/qmltests/data/tst_loadUrl.qml index 84509eb01..80d7a18b3 100644 --- a/tests/auto/quick/qmltests/data/tst_loadUrl.qml +++ b/tests/auto/quick/qmltests/data/tst_loadUrl.qml @@ -217,7 +217,7 @@ TestWebEngineView { } webEngineView.loadingChanged.connect(handleLoadFailed); webEngineView.url = bogusSite - tryCompare(loadRequestArray, "length", 5, 12000); + tryCompare(loadRequestArray, "length", 4, 12000); webEngineView.loadingChanged.disconnect(handleLoadFailed); loadRequest = loadRequestArray[0]; @@ -231,14 +231,11 @@ TestWebEngineView { loadRequest = loadRequestArray[2]; compare(loadRequest.status, WebEngineView.LoadStartedStatus); compare(loadRequest.activeUrl, aboutBlank); - // FIXME: This 4th request probably shouldn't be here as it an error-page of sorts in dataUrl form - // Appeared with Chromium 58 + compare(loadRequest.url, bogusSite) loadRequest = loadRequestArray[3]; - compare(loadRequest.status, WebEngineView.LoadStartedStatus); - compare(loadRequest.activeUrl, aboutBlank); - loadRequest = loadRequestArray[4]; compare(loadRequest.status, WebEngineView.LoadSucceededStatus); compare(loadRequest.activeUrl, bogusSite); + compare(loadRequest.url, bogusSite) webEngineView.clear(); } |