summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-08-10 13:47:05 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-08-13 10:29:29 +0200
commitcc5bf0d5852d4e55abdda12061eb3908f8d84856 (patch)
tree403b5ac410da9a1ef98c4bd46cb52eb3d5ed8b14
parent06b49842131e7da7374e2ba74b6173196a61400f (diff)
Load page to inspect before testing inspection
Makes it more stable. Change-Id: I2b479330e66e9d87355b09ebb0f4c4064ef96963 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tamas Zakor <ztamas@inf.u-szeged.hu> Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
-rw-r--r--tests/auto/quick/inspectorserver/BLACKLIST6
-rw-r--r--tests/auto/quick/inspectorserver/tst_inspectorserver.cpp10
2 files changed, 10 insertions, 6 deletions
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"));