diff options
author | Kirill Burtsev <kirill.burtsev@qt.io> | 2020-07-31 16:02:36 +0200 |
---|---|---|
committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2020-08-31 10:04:44 +0200 |
commit | 5f1f7e8913b74f9a88864b4155db8753007db52c (patch) | |
tree | 907faa08759152b4a8a6f802732532b9b38fb81e /tests/auto/core | |
parent | cb9e6a7d90035cd50e389f000df1a3103e312af0 (diff) |
Make HttpServer to server resource from dirs for unhandled requests
Change-Id: I2e15dff77c8f18af60a565cb74558f57c3527db8
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'tests/auto/core')
-rw-r--r-- | tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp index aad7a205c..e3b7af18c 100644 --- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp +++ b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp @@ -188,37 +188,6 @@ public: } }; -class TestServer : public HttpServer -{ -public: - TestServer() - { - connect(this, &HttpServer::newRequest, this, &TestServer::onNewRequest); - } - -private: - void onNewRequest(HttpReqRep *rr) - { - const QDir resourceDir(TESTS_SOURCE_DIR "qwebengineurlrequestinterceptor/resources"); - QString path = rr->requestPath(); - path.remove(0, 1); - - if (rr->requestMethod() != "GET" || !resourceDir.exists(path)) { - rr->sendResponse(404); - return; - } - - QFile file(resourceDir.filePath(path)); - file.open(QIODevice::ReadOnly); - QByteArray data = file.readAll(); - rr->setResponseBody(data); - QMimeDatabase db; - QMimeType mime = db.mimeTypeForFileNameAndData(file.fileName(), data); - rr->setResponseHeader(QByteArrayLiteral("content-type"), mime.name().toUtf8()); - rr->sendResponse(); - } -}; - class ConsolePage : public QWebEnginePage { Q_OBJECT public: @@ -759,7 +728,8 @@ void tst_QWebEngineUrlRequestInterceptor::jsServiceWorker() { QFETCH(InterceptorSetter, setter); - TestServer server; + HttpServer server; + server.setResourceDirs({ TESTS_SOURCE_DIR "qwebengineurlrequestinterceptor/resources" }); QVERIFY(server.start()); QWebEngineProfile profile(QStringLiteral("Test")); |