summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2014-08-21 14:02:10 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-09-02 23:55:38 +0200
commitede95c2a1186c17996091950ec57c5998f73fa7a (patch)
tree96703d5c7c5968d775517ca249123c97890873eb /tests/auto
parentce7797dadce021c7da5d18a9b945100ae08c8224 (diff)
Don't forward loading of error pages to the API layer
The fact that the error pages are HTML and get loaded through the same mechanism should be kept an implementation detail and not be considered as a new load in the API sense. Also implement HasErrorPage for good measure and remove an anoying warning from the demo browser. The issue of the url not being changed remains in the QML test (but it doesn't affect a typical browser-like UI since the user input is still there untouched in the address bar), just make sure that failure does not affect the later checks. It also seems like we have a focus problem somehow, but the test should probably use a click for that matter. Change-Id: Ib5e363981a11287fdf4bfe84b93c999d96ed8087 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/quick/qmltests/data/tst_loadUrl.qml5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_loadUrl.qml b/tests/auto/quick/qmltests/data/tst_loadUrl.qml
index be7ede626..41faa6bc3 100644
--- a/tests/auto/quick/qmltests/data/tst_loadUrl.qml
+++ b/tests/auto/quick/qmltests/data/tst_loadUrl.qml
@@ -124,9 +124,9 @@ TestWebEngineView {
var handleLoadFailed = function(loadRequest) {
if (loadRequest.status == WebEngineView.LoadFailedStatus) {
+ webEngineView.loadHtml("load failed", bogusSite)
compare(webEngineView.url, bogusSite)
compare(loadRequest.url, bogusSite)
- webEngineView.loadHtml("load failed", bogusSite)
}
}
webEngineView.loadingChanged.connect(handleLoadFailed)
@@ -166,8 +166,7 @@ TestWebEngineView {
}
lastUrl = webEngineView.url
webEngineView.loadingChanged.connect(handleLoadRequest)
- webEngineView.forceActiveFocus()
- keyPress(Qt.Key_Return) // Link is focused
+ mouseClick(webEngineView, 10, 10, Qt.LeftButton, Qt.NoModifiers, 50)
verify(webEngineView.waitForLoadSucceeded())
compare(webEngineView.url, url)
webEngineView.loadingChanged.disconnect(handleLoadRequest)