summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/core/certificateerror/tst_certificateerror.cpp1
-rw-r--r--tests/auto/quick/publicapi/tst_publicapi.cpp2
-rw-r--r--tests/auto/quick/qmltests/CMakeLists.txt1
-rw-r--r--tests/auto/quick/qmltests/data/tst_certificateError.qml1
-rw-r--r--tests/auto/quick/qmltests/data/tst_profile.qml66
-rw-r--r--tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp20
6 files changed, 0 insertions, 91 deletions
diff --git a/tests/auto/core/certificateerror/tst_certificateerror.cpp b/tests/auto/core/certificateerror/tst_certificateerror.cpp
index 74c7e3bd4..a2b15a1ae 100644
--- a/tests/auto/core/certificateerror/tst_certificateerror.cpp
+++ b/tests/auto/core/certificateerror/tst_certificateerror.cpp
@@ -30,7 +30,6 @@
#include <QWebEngineCertificateError>
#include <QWebEnginePage>
-#include <QWebEngineProfile>
#include <QWebEngineSettings>
#include <QtTest/QtTest>
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index a0db27fab..52e2454af 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -388,8 +388,6 @@ static const QStringList expectedAPI = QStringList()
<< "QQuickWebEngineProfile.spellCheckLanguagesChanged() --> void"
<< "QQuickWebEngineProfile.storageName --> QString"
<< "QQuickWebEngineProfile.storageNameChanged() --> void"
- << "QQuickWebEngineProfile.useForGlobalCertificateVerification --> bool"
- << "QQuickWebEngineProfile.useForGlobalCertificateVerificationChanged() --> void"
<< "QQuickWebEngineProfile.userScripts --> QQuickWebEngineScriptCollection*"
<< "QQuickWebEngineSettings.AllowAllUnknownUrlSchemes --> UnknownUrlSchemePolicy"
<< "QQuickWebEngineSettings.AllowUnknownUrlSchemesFromUserInteraction --> UnknownUrlSchemePolicy"
diff --git a/tests/auto/quick/qmltests/CMakeLists.txt b/tests/auto/quick/qmltests/CMakeLists.txt
index 0d3b973bc..2cbc52f5f 100644
--- a/tests/auto/quick/qmltests/CMakeLists.txt
+++ b/tests/auto/quick/qmltests/CMakeLists.txt
@@ -38,7 +38,6 @@ set(testList
tst_navigationRequested.qml
tst_newViewRequest.qml
tst_notification.qml
- tst_profile.qml
tst_properties.qml
tst_runJavaScript.qml
tst_scrollPosition.qml
diff --git a/tests/auto/quick/qmltests/data/tst_certificateError.qml b/tests/auto/quick/qmltests/data/tst_certificateError.qml
index dcfd13498..a707f4a74 100644
--- a/tests/auto/quick/qmltests/data/tst_certificateError.qml
+++ b/tests/auto/quick/qmltests/data/tst_certificateError.qml
@@ -56,7 +56,6 @@ TestWebEngineView {
request.sendResponse()
})
view.settings.errorPageEnabled = false
- view.profile.useForGlobalCertificateVerification = true
}
function init() {
diff --git a/tests/auto/quick/qmltests/data/tst_profile.qml b/tests/auto/quick/qmltests/data/tst_profile.qml
deleted file mode 100644
index ee7fa4e99..000000000
--- a/tests/auto/quick/qmltests/data/tst_profile.qml
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 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.0
-import QtTest 1.0
-import QtWebEngine 1.9
-
-TestWebEngineView {
- id: webEngineView
- width: 400
- height: 300
-
-
- WebEngineProfile {
- id: profile1
- }
- WebEngineProfile {
- id: profile2
- }
- property bool profile1UsedForGlobalCertificateVerification: profile1.useForGlobalCertificateVerification
-
- TestCase {
- name: "WebEngineProfile"
-
- function test_useForGlobalCertificateVerification() {
- verify(!profile1.useForGlobalCertificateVerification);
- verify(!profile2.useForGlobalCertificateVerification);
- verify(!webEngineView.profile1UsedForGlobalCertificateVerification);
-
- profile1.useForGlobalCertificateVerification = true;
- verify(profile1.useForGlobalCertificateVerification);
- verify(!profile2.useForGlobalCertificateVerification);
- verify(webEngineView.profile1UsedForGlobalCertificateVerification);
-
- profile2.useForGlobalCertificateVerification = true;
- verify(!webEngineView.profile1UsedForGlobalCertificateVerification);
- verify(!profile1.useForGlobalCertificateVerification);
- verify(profile2.useForGlobalCertificateVerification);
- }
- }
-}
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index a998d7998..662e7a44f 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -77,7 +77,6 @@ private Q_SLOTS:
void changePersistentPath();
void changeHttpUserAgent();
void changeHttpAcceptLanguage();
- void changeUseForGlobalCertificateVerification();
void changePersistentCookiesPolicy();
void initiator();
void badDeleteOrder();
@@ -912,25 +911,6 @@ void tst_QWebEngineProfile::changeHttpAcceptLanguage()
QVERIFY(server.stop());
}
-void tst_QWebEngineProfile::changeUseForGlobalCertificateVerification()
-{
- TestServer server;
- QVERIFY(server.start());
-
- // Check that we don't crash
-
- QWebEngineProfile profile(QStringLiteral("changeUseForGlobalCertifateVerification"));
- std::unique_ptr<QWebEnginePage> page;
- page.reset(new QWebEnginePage(&profile));
- QVERIFY(loadSync(page.get(), server.url("/hedgehog.html")));
- page.reset();
- profile.setUseForGlobalCertificateVerification(true);
- page.reset(new QWebEnginePage(&profile));
- QVERIFY(loadSync(page.get(), server.url("/hedgehog.html")));
- // Don't check for error: there can be disconnects during GET hedgehog.png.
- (void)server.stop();
-}
-
void tst_QWebEngineProfile::changePersistentCookiesPolicy()
{
TestServer server;