Ensure certificate error callback call for all types

Amends a2a9ea11f9. Actually reject certificate when it's considered to
be fatal. Adapt tests for possible regression but checking if load
really failed (due to missing internet access) or was just halted by
missing callback call internaly.

Pick-to: 6.2
Change-Id: I656525c353ce410f7bda8c55227a29fcd617bfdd
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 13 insertions, 3 deletions

diff --git a/tests/auto/quick/qmltests/data/TestWebEngineView.qml b/tests/auto/quick/qmltests/data/TestWebEngineView.qml
index aa9d67d99..68417c6c5 100644
--- a/tests/auto/quick/qmltests/data/TestWebEngineView.qml
+++ b/tests/auto/quick/qmltests/data/TestWebEngineView.qml
@@ -35,19 +35,29 @@ WebEngineView {
     property bool windowCloseRequestedSignalEmitted: false
     settings.focusOnNavigationEnabled: true
 
+    function loadSucceeded() { return loadStatus == WebEngineView.LoadSucceededStatus }
+    function loadFailed() { return loadStatus == WebEngineView.LoadFailedStatus }
+    function loadStopped() { return loadStatus == WebEngineView.LoadStoppedStatus }
+
+    function waitForLoadResult(timeout) {
+        loadStatus = null
+        var r = _waitFor(function() { return loadStatus != null && loadStatus != WebEngineView.LoadStartedStatus }, timeout)
+        return r
+    }
+
     function waitForLoadSucceeded(timeout) {
-        var success = _waitFor(function() { return loadStatus == WebEngineView.LoadSucceededStatus }, timeout)
         loadStatus = null
+        var success = _waitFor(function() { return loadStatus == WebEngineView.LoadSucceededStatus }, timeout)
         return success
     }
     function waitForLoadFailed(timeout) {
-        var failure = _waitFor(function() { return loadStatus == WebEngineView.LoadFailedStatus }, timeout)
         loadStatus = null
+        var failure = _waitFor(function() { return loadStatus == WebEngineView.LoadFailedStatus }, timeout)
         return failure
     }
     function waitForLoadStopped(timeout) {
-        var stop = _waitFor(function() { return loadStatus == WebEngineView.LoadStoppedStatus }, timeout)
         loadStatus = null
+        var stop = _waitFor(function() { return loadStatus == WebEngineView.LoadStoppedStatus }, timeout)
         return stop
     }
     function waitForWindowCloseRequested() {