From cc5bf0d5852d4e55abdda12061eb3908f8d84856 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 10 Aug 2020 13:47:05 +0200 Subject: Load page to inspect before testing inspection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Makes it more stable. Change-Id: I2b479330e66e9d87355b09ebb0f4c4064ef96963 Reviewed-by: Qt CI Bot Reviewed-by: Tamas Zakor Reviewed-by: Michael Brüning --- tests/auto/quick/inspectorserver/BLACKLIST | 6 ------ tests/auto/quick/inspectorserver/tst_inspectorserver.cpp | 10 ++++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 tests/auto/quick/inspectorserver/BLACKLIST diff --git a/tests/auto/quick/inspectorserver/BLACKLIST b/tests/auto/quick/inspectorserver/BLACKLIST deleted file mode 100644 index 92c76505a..000000000 --- a/tests/auto/quick/inspectorserver/BLACKLIST +++ /dev/null @@ -1,6 +0,0 @@ -[testRemoteDebuggingMessage] -osx - -[openRemoteDebuggingSession] -osx -msvc-2019 diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp index 224814f7e..85257fcb7 100644 --- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp +++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp @@ -125,6 +125,11 @@ void tst_InspectorServer::testPageList() void tst_InspectorServer::testRemoteDebuggingMessage() { + const QUrl testPageUrl = QUrl::fromLocalFile(QLatin1String(TESTS_SOURCE_DIR "/html/basic_page.html")); + QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QQuickWebEngineLoadRequest*))); + webView()->setUrl(testPageUrl); + QTRY_VERIFY(loadSpy.size() && !webView()->isLoading()); + QJsonArray pageList = fetchPageList(); QCOMPARE(pageList.size(), 1); QVERIFY(pageList.at(0).toObject().contains("webSocketDebuggerUrl")); @@ -154,6 +159,11 @@ void tst_InspectorServer::testRemoteDebuggingMessage() void tst_InspectorServer::openRemoteDebuggingSession() { + const QUrl testPageUrl = QUrl::fromLocalFile(QLatin1String(TESTS_SOURCE_DIR "/html/basic_page.html")); + QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QQuickWebEngineLoadRequest*))); + webView()->setUrl(testPageUrl); + QTRY_VERIFY(loadSpy.size() && !webView()->isLoading()); + QJsonArray pageList = fetchPageList(); QCOMPARE(pageList.size(), 1); QVERIFY(pageList.at(0).toObject().contains("devtoolsFrontendUrl")); -- cgit v1.2.3