1 files changed, 29 insertions, 47 deletions

diff --git a/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml b/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml
index 658071005..6e91b2e77 100644
--- a/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml
+++ b/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml
@@ -1,54 +1,21 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** 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
-import QtWebEngine.testsupport 1.0
-import "../../qmltests/data" 1.0
-import "../mock-delegates/TestParams" 1.0
+// Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+import QtQuick
+import QtTest
+import QtWebEngine
+import "../../qmltests/data"
+import "../mock-delegates/TestParams"
 
 TestWebEngineView {
     id: webEngineView
     anchors.fill: parent
 
-    testSupport: WebEngineTestSupport {
-        property bool windowCloseRejectedSignalEmitted: false
-
-        function waitForWindowCloseRejected() {
-            return _waitFor(function () {
-                    return testSupport.windowCloseRejectedSignalEmitted;
-                });
-        }
+    property bool windowCloseRejectedCalled: false
 
-        onWindowCloseRejected: {
-            windowCloseRejectedSignalEmitted = true;
-        }
+    // Called by QQuickWebEngineViewPrivate::windowCloseRejected()
+    function windowCloseRejected() {
+        windowCloseRejectedCalled = true;
     }
 
     TestCase {
@@ -112,17 +79,32 @@ TestWebEngineView {
             simulateUserGesture()
             webEngineView.triggerWebAction(WebEngineView.RequestClose);
             verify(webEngineView.waitForWindowCloseRequested());
+
+            // Navigate away from page with onbeforeunload handler,
+            // otherwise it would trigger an extra dialog request when
+            // navigating in the subsequent test.
+            webEngineView.url = Qt.resolvedUrl("about:blank");
+            verify(webEngineView.waitForLoadSucceeded());
+            compare(JSDialogParams.dialogCount, 2)
         }
 
         function test_rejectClose() {
             webEngineView.url = Qt.resolvedUrl("confirmclose.html");
             verify(webEngineView.waitForLoadSucceeded());
-            webEngineView.testSupport.windowCloseRejectedSignalEmitted = false;
+            webEngineView.windowCloseRejectedCalled = false;
             JSDialogParams.shouldAcceptDialog = false;
 
             simulateUserGesture()
             webEngineView.triggerWebAction(WebEngineView.RequestClose);
-            verify(webEngineView.testSupport.waitForWindowCloseRejected());
+            tryVerify(function() { return webEngineView.windowCloseRejectedCalled; });
+
+            // Navigate away from page with onbeforeunload handler,
+            // otherwise it would trigger an extra dialog request when
+            // navigating in the subsequent test.
+            JSDialogParams.shouldAcceptDialog = true;
+            webEngineView.url = Qt.resolvedUrl("about:blank");
+            verify(webEngineView.waitForLoadSucceeded());
+            compare(JSDialogParams.dialogCount, 2)
         }
 
         function test_prompt() {