1 files changed, 31 insertions, 43 deletions

diff --git a/tests/auto/quick/qmltests/data/tst_certificateError.qml b/tests/auto/quick/qmltests/data/tst_certificateError.qml
index 976de88a9..220ef9ac8 100644
--- a/tests/auto/quick/qmltests/data/tst_certificateError.qml
+++ b/tests/auto/quick/qmltests/data/tst_certificateError.qml
@@ -1,36 +1,11 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.0
-import QtWebEngine 1.9
-
-import Test.Shared 1.0 as Shared
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+import QtQuick
+import QtTest
+import QtWebEngine
+
+import Test.Shared as Shared
 
 TestWebEngineView {
     id: view; width: 320; height: 320
@@ -45,6 +20,7 @@ TestWebEngineView {
     }
 
     TestCase {
+        id: testCase
         name: 'CertificateError'
         when: windowShown
 
@@ -89,7 +65,8 @@ TestWebEngineView {
             }
             view.certificateError.connect(handleCertificateError)
 
-            view.url = Shared.HttpsServer.url()
+            const server_url = Shared.HttpsServer.url()
+            view.url = server_url
 
             if (data.deferError) {
                 spyError.wait()
@@ -112,23 +89,34 @@ TestWebEngineView {
             compare(data.expectedContent, view.getBodyText())
 
             view.certificateError.disconnect(handleCertificateError)
+
+            let error = spyError.signalArguments[0][0]
+            compare(error.url, server_url)
+            verify(error.description.length > 0)
+            verify(error.overridable)
+            compare(error.type, WebEngineCertificateError.CertificateAuthorityInvalid)
         }
 
         function test_fatalError() {
-            var handleCertificateError = function(error) {
-                verify(!error.overrideable);
-                // QQuickWebEngineViewPrivate::allowCertificateError() will implicitly reject
-                // fatal errors and it should not crash if already rejected in handler.
-                error.rejectCertificate();
-            }
+            let error = undefined
+            var handleCertificateError = function(e) { error = e; }
             view.certificateError.connect(handleCertificateError);
 
             view.url = Qt.resolvedUrl('https://revoked.badssl.com');
-            if (!view.waitForLoadFailed(10000))
+            if (!view.waitForLoadResult()) {
+                verify(!error, "There shouldn't be any certificate error if not loaded due to missing internet access!");
                 skip("Couldn't load page from network, skipping test.");
-            compare(spyError.count, 1);
-
+            }
             view.certificateError.disconnect(handleCertificateError);
+
+            // revoked certificate might not be reported as invalid by chromium and the load will silently succeed
+            const failed = view.loadStatus == WebEngineView.LoadFailedStatus, hasError = Boolean(error)
+            compare(hasError, failed)
+            if (failed) {
+                verify(!error.overridable);
+                // Fatal certificate errors are implicitly rejected. But second call should not cause crash.
+                error.rejectCertificate();
+            }
         }
     }
 }