1 files changed, 23 insertions, 47 deletions

diff --git a/tests/auto/quick/qmltests/data/tst_navigationRequested.qml b/tests/auto/quick/qmltests/data/tst_navigationRequested.qml
index 96128574e..31c0cf44e 100644
--- a/tests/auto/quick/qmltests/data/tst_navigationRequested.qml
+++ b/tests/auto/quick/qmltests/data/tst_navigationRequested.qml
@@ -1,34 +1,9 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtTest 1.0
-import QtWebEngine 1.2
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+import QtQuick
+import QtTest
+import QtWebEngine
 
 TestWebEngineView {
     id: webEngineView
@@ -59,26 +34,27 @@ TestWebEngineView {
         signalName: "navigationRequested"
     }
 
-    onNavigationRequested: {
+    onNavigationRequested: function(request) {
         if (request.isMainFrame) {
             attributes.mainUrl = request.url
         } else {
             attributes.iframeUrl = request.url
             if (shouldIgnoreSubFrameRequests) {
-                request.action = WebEngineView.IgnoreRequest
+                request.reject()
             }
         }
 
-        if (request.navigationType === WebEngineView.LinkClickedNavigation) {
+        if (request.navigationType === WebEngineNavigationRequest.LinkClickedNavigation) {
             attributes.linkClickedNavigationRequested = true
             if (shouldIgnoreLinkClicks) {
-                request.action = WebEngineView.IgnoreRequest
+                request.reject()
                 attributes.linkClickedNavigationIgnored = true
             }
         }
     }
 
     TestCase {
+        id: testCase
         name: "WebEngineViewNavigationRequested"
         when: windowShown
 
@@ -93,19 +69,17 @@ TestWebEngineView {
             // Test if we get notified about main frame and iframe loads
             compare(navigationSpy.count, 0)
             webEngineView.url = Qt.resolvedUrl("test-iframe.html")
-            navigationSpy.wait()
+            verify(webEngineView.waitForLoadSucceeded())
             compare(attributes.mainUrl, Qt.resolvedUrl("test-iframe.html"))
-            navigationSpy.wait()
             compare(attributes.iframeUrl, Qt.resolvedUrl("test1.html"))
             compare(navigationSpy.count, 2)
-            verify(webEngineView.waitForLoadSucceeded())
 
             // Test if we get notified about clicked links
             mouseClick(webEngineView, 100, 100)
-            tryCompare(navigationSpy, "count", 3)
+            verify(webEngineView.waitForLoadSucceeded())
             compare(attributes.mainUrl, Qt.resolvedUrl("test1.html"))
             verify(attributes.linkClickedNavigationRequested)
-            verify(webEngineView.waitForLoadSucceeded())
+            compare(navigationSpy.count, 3)
         }
 
         function test_ignoreLinkClickedRequest() {
@@ -116,26 +90,28 @@ TestWebEngineView {
 
             shouldIgnoreLinkClicks = true
             mouseClick(webEngineView, 100, 100)
-            tryCompare(navigationSpy, "count", 3)
-            compare(attributes.mainUrl, Qt.resolvedUrl("test1.html"))
-            verify(attributes.linkClickedNavigationRequested)
-            verify(attributes.linkClickedNavigationIgnored)
             // We ignored the main frame request, so we should
             // get notified that the load has been stopped.
             verify(webEngineView.waitForLoadStopped())
             verify(!webEngineView.loading)
+
+            compare(navigationSpy.count, 3)
+            compare(attributes.mainUrl, Qt.resolvedUrl("test1.html"))
+            verify(attributes.linkClickedNavigationRequested)
+            verify(attributes.linkClickedNavigationIgnored)
         }
 
         function test_ignoreSubFrameRequest() {
             // Test if we can ignore sub frame requests
             shouldIgnoreSubFrameRequests = true
             webEngineView.url = Qt.resolvedUrl("test-iframe.html")
-            tryCompare(navigationSpy, "count", 2)
-            compare(attributes.mainUrl, Qt.resolvedUrl("test-iframe.html"))
-            compare(attributes.iframeUrl, Qt.resolvedUrl("test1.html"))
             // We ignored the sub frame request, so
             // the main frame load should still succeed.
             verify(webEngineView.waitForLoadSucceeded())
+
+            compare(navigationSpy.count, 2)
+            compare(attributes.mainUrl, Qt.resolvedUrl("test-iframe.html"))
+            compare(attributes.iframeUrl, Qt.resolvedUrl("test1.html"))
         }
     }
 }