summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2018-08-09 11:18:11 +0200
committerMichal Klocek <michal.klocek@qt.io>2018-08-09 09:39:14 +0000
commit9cbe64c54dee8451794e29f4357ccfac6d883e6b (patch)
treea9eb363b39a3c9bcaa160aa89cc354deb543f610 /tests
parent04355f4d6f311adebfc354b094a5f79c6327e86f (diff)
Revert "Add HTTP request headers to custom URL schemes"
This reverts commit a5bdc6236ad52586579a9a3da6a059835ed60761 and 04355f4d6f311adebfc354b094a5f79c6327e86f. CI still crashes on tst_QWebEngineProfile::urlSchemeHandler tests, issue is not reproducible locally and it will take time to investigate. Task-number: QTBUG-69844 Change-Id: I7ddb6a32383400d553fe692c24effb6dfb7b6102 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/widgets/qwebengineprofile/BLACKLIST2
-rw-r--r--tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp61
2 files changed, 0 insertions, 63 deletions
diff --git a/tests/auto/widgets/qwebengineprofile/BLACKLIST b/tests/auto/widgets/qwebengineprofile/BLACKLIST
index 14d8da912..fc1c957dd 100644
--- a/tests/auto/widgets/qwebengineprofile/BLACKLIST
+++ b/tests/auto/widgets/qwebengineprofile/BLACKLIST
@@ -2,6 +2,4 @@
*
[disableCache]
*
-[urlSchemeHandlerRequestHeaders]
-*
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index 7e1796ffb..a04a1ac6f 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -29,7 +29,6 @@
#include "../util.h"
#include <QtCore/qbuffer.h>
#include <QtTest/QtTest>
-#include <QtWebEngineCore/qwebengineurlrequestinterceptor.h>
#include <QtWebEngineCore/qwebengineurlrequestjob.h>
#include <QtWebEngineCore/qwebengineurlschemehandler.h>
#include <QtWebEngineWidgets/qwebengineprofile.h>
@@ -53,7 +52,6 @@ private Q_SLOTS:
void urlSchemeHandlerFailRequest();
void urlSchemeHandlerFailOnRead();
void urlSchemeHandlerStreaming();
- void urlSchemeHandlerRequestHeaders();
void customUserAgent();
void httpAcceptLanguage();
void downloadItem();
@@ -445,65 +443,6 @@ void tst_QWebEngineProfile::urlSchemeHandlerStreaming()
QCOMPARE(toPlainTextSync(view.page()), QString::fromLatin1(result));
}
-class ExtraHeaderInterceptor : public QWebEngineUrlRequestInterceptor
-{
-public:
- ExtraHeaderInterceptor() { }
-
- void setExtraHeader(const QByteArray &key, const QByteArray &value)
- {
- m_extraKey = key;
- m_extraValue = value;
- }
-
- void interceptRequest(QWebEngineUrlRequestInfo &info) override
- {
- info.setHttpHeader(m_extraKey, m_extraValue);
- }
-
- QByteArray m_extraKey;
- QByteArray m_extraValue;
-};
-
-class RequestHeadersUrlSchemeHandler : public ReplyingUrlSchemeHandler
-{
-public:
- void setExpectedHeader(const QByteArray &key, const QByteArray &value)
- {
- m_expectedKey = key;
- m_expectedValue = value;
- }
- void requestStarted(QWebEngineUrlRequestJob *job) override
- {
- const auto requestHeaders = job->requestHeaders();
- QVERIFY(requestHeaders.contains(m_expectedKey));
- QCOMPARE(requestHeaders.value(m_expectedKey), m_expectedValue);
- ReplyingUrlSchemeHandler::requestStarted(job);
- }
- QByteArray m_expectedKey;
- QByteArray m_expectedValue;
-};
-
-void tst_QWebEngineProfile::urlSchemeHandlerRequestHeaders()
-{
- RequestHeadersUrlSchemeHandler handler;
- ExtraHeaderInterceptor interceptor;
-
- interceptor.setExtraHeader("Hello", "World");
- handler.setExpectedHeader("Hello", "World");
-
- QWebEngineProfile profile;
- profile.setRequestInterceptor(&interceptor);
- profile.installUrlSchemeHandler("myscheme", &handler);
-
- QWebEngineView view;
- QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool)));
- view.setPage(new QWebEnginePage(&profile, &view));
- view.load(QUrl(QStringLiteral("myscheme://whatever")));
- QVERIFY(loadFinishedSpy.wait());
-}
-
-
void tst_QWebEngineProfile::customUserAgent()
{
QString defaultUserAgent = QWebEngineProfile::defaultProfile()->httpUserAgent();