summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets
diff options
context:
space:
mode:
authorJüri Valdmann <juri.valdmann@qt.io>2020-05-20 14:49:03 +0200
committerJüri Valdmann <juri.valdmann@qt.io>2020-05-29 14:38:06 +0200
commit29a687c1743dbb0ba42bab08e751755eec3454a8 (patch)
treeba28a1417200f5953c450a2141cebbb03e53402a /tests/auto/widgets
parenta79aee10e96a5f89579f087b440e0a8f204d9261 (diff)
Extend tst_QWebEngineScript::matchQrcUrl with negative match
Change-Id: Idee9e3742ea3cb949f786d0e55a2e2f8530c7b1e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests/auto/widgets')
-rw-r--r--tests/auto/widgets/qwebenginescript/resources/title_a.html9
-rw-r--r--tests/auto/widgets/qwebenginescript/resources/title_b.html9
-rw-r--r--tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp17
-rw-r--r--tests/auto/widgets/qwebenginescript/tst_qwebenginescript.qrc2
4 files changed, 26 insertions, 11 deletions
diff --git a/tests/auto/widgets/qwebenginescript/resources/title_a.html b/tests/auto/widgets/qwebenginescript/resources/title_a.html
new file mode 100644
index 000000000..d1ca96eaa
--- /dev/null
+++ b/tests/auto/widgets/qwebenginescript/resources/title_a.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>A</title>
+ </head>
+ <body>
+ <p>Page A</p>
+ </body>
+</html>
diff --git a/tests/auto/widgets/qwebenginescript/resources/title_b.html b/tests/auto/widgets/qwebenginescript/resources/title_b.html
new file mode 100644
index 000000000..fd1fda99e
--- /dev/null
+++ b/tests/auto/widgets/qwebenginescript/resources/title_b.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>B</title>
+ </head>
+ <body>
+ <p>Page B</p>
+ </body>
+</html>
diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
index 2044f0df4..32384aec2 100644
--- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
@@ -593,27 +593,22 @@ void tst_QWebEngineScript::webChannelWithBadString()
void tst_QWebEngineScript::matchQrcUrl()
{
- QWebEnginePage page;
- QWebEngineView view;
- view.setPage(&page);
+ QWebEngineProfile profile;
+ QWebEnginePage page(&profile);
QWebEngineScript s;
s.setInjectionPoint(QWebEngineScript::DocumentReady);
s.setWorldId(QWebEngineScript::MainWorld);
-
-
s.setSourceCode(QStringLiteral(R"(
// ==UserScript==
-// @match qrc:/*main.html
+// @match qrc:/*title_b.html
// ==/UserScript==
document.title = 'New title';
)"));
-
page.scripts().insert(s);
- page.load(QUrl("qrc:/resources/test_iframe_main.html"));
- view.show();
- QSignalSpy spyFinished(&page, &QWebEnginePage::loadFinished);
- QVERIFY(spyFinished.wait());
+ loadSync(&page, QUrl("qrc:/resources/title_a.html"));
+ QCOMPARE(page.title(), "A");
+ loadSync(&page, QUrl("qrc:/resources/title_b.html"));
QCOMPARE(page.title(), "New title");
}
diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.qrc b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.qrc
index ada06119a..3290cb588 100644
--- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.qrc
+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.qrc
@@ -4,6 +4,8 @@
<file>resources/test_iframe_outer.html</file>
<file>resources/test_iframe_inner.html</file>
<file>resources/test_window_open.html</file>
+ <file>resources/title_a.html</file>
+ <file>resources/title_b.html</file>
<file>resources/webChannelWithBadString.html</file>
</qresource>
</RCC>