From cbeef3ee920576d668664ca2e0b8a55ae307959a Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 18 Mar 2019 10:59:16 +0100 Subject: Do not report client redirects as link-clicked MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes false navigation type on http-equiv refresh, and javascript redirects. Task-number: QTBUG-74490 Change-Id: Ie6fa5c94ae9642a7e9c689198a4977747f4101ce Reviewed-by: Michael Brüning --- tests/auto/widgets/qwebenginepage/resources/reload.html | 8 ++++++++ tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 8 +++++++- tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 tests/auto/widgets/qwebenginepage/resources/reload.html (limited to 'tests') diff --git a/tests/auto/widgets/qwebenginepage/resources/reload.html b/tests/auto/widgets/qwebenginepage/resources/reload.html new file mode 100644 index 000000000..d9c33dfcd --- /dev/null +++ b/tests/auto/widgets/qwebenginepage/resources/reload.html @@ -0,0 +1,8 @@ + + + + + +This is test content + + diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index fdff57254..8c3b4002c 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -600,11 +600,17 @@ void tst_QWebEnginePage::acceptNavigationRequestNavigationType() QTRY_COMPARE(loadSpy.count(), 4); QTRY_COMPARE(page.navigations.count(), 4); + page.load(QUrl("qrc:///resources/reload.html")); + QTRY_COMPARE(loadSpy.count(), 6); + QTRY_COMPARE(page.navigations.count(), 6); + QList expectedList; expectedList << QWebEnginePage::NavigationTypeTyped << QWebEnginePage::NavigationTypeTyped << QWebEnginePage::NavigationTypeBackForward - << QWebEnginePage::NavigationTypeReload; + << QWebEnginePage::NavigationTypeReload + << QWebEnginePage::NavigationTypeTyped + << QWebEnginePage::NavigationTypeOther; QVERIFY(expectedList.count() == page.navigations.count()); for (int i = 0; i < expectedList.count(); ++i) { QCOMPARE(page.navigations[i].type, expectedList[i]); diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc index 3bb88cbe1..f2bf8c6ff 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc @@ -14,6 +14,7 @@ resources/user.css resources/image.png resources/pasteimage.html + resources/reload.html resources/style.css resources/test1.html resources/test2.html -- cgit v1.2.3