diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2017-02-01 11:34:27 +0100 |
---|---|---|
committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2017-04-05 14:48:35 +0000 |
commit | 6252f0231f85e5f4e6b887a6814d4968acae13bd (patch) | |
tree | 86d552557ee3e37057d1b1acac238af846ec78ea /tests/auto/quick/qmltests/data/tst_navigationRequested.qml | |
parent | 5bf0846938574020ab6684a471560c5f15009593 (diff) |
Yet another speculative fix of linkHovered QML tests
When the test moves the mouse cursor out of the link area it positions
the cursor above an iframe. We should not expect linkHovered signal
above an iframe until its load is succeeded. Since we don't have API to
test iframes' loading state, remove the iframe from the test.
Moreover, increase signal timeout values to 12sec as it is used in other
tests too since the 55-based chromium update.
Task-number: QTBUG-55870
Change-Id: Id47494ac41a9d34f8a5bf4804fc5c157868cf923
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests/auto/quick/qmltests/data/tst_navigationRequested.qml')
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_navigationRequested.qml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_navigationRequested.qml b/tests/auto/quick/qmltests/data/tst_navigationRequested.qml index b1c94e601..96128574e 100644 --- a/tests/auto/quick/qmltests/data/tst_navigationRequested.qml +++ b/tests/auto/quick/qmltests/data/tst_navigationRequested.qml @@ -92,9 +92,9 @@ TestWebEngineView { function test_navigationRequested() { // Test if we get notified about main frame and iframe loads compare(navigationSpy.count, 0) - webEngineView.url = Qt.resolvedUrl("test2.html") + webEngineView.url = Qt.resolvedUrl("test-iframe.html") navigationSpy.wait() - compare(attributes.mainUrl, Qt.resolvedUrl("test2.html")) + compare(attributes.mainUrl, Qt.resolvedUrl("test-iframe.html")) navigationSpy.wait() compare(attributes.iframeUrl, Qt.resolvedUrl("test1.html")) compare(navigationSpy.count, 2) @@ -111,7 +111,7 @@ TestWebEngineView { function test_ignoreLinkClickedRequest() { // Test if we can ignore clicked link requests compare(navigationSpy.count, 0) - webEngineView.url = Qt.resolvedUrl("test2.html") + webEngineView.url = Qt.resolvedUrl("test-iframe.html") verify(webEngineView.waitForLoadSucceeded()) shouldIgnoreLinkClicks = true @@ -129,9 +129,9 @@ TestWebEngineView { function test_ignoreSubFrameRequest() { // Test if we can ignore sub frame requests shouldIgnoreSubFrameRequests = true - webEngineView.url = Qt.resolvedUrl("test2.html") + webEngineView.url = Qt.resolvedUrl("test-iframe.html") tryCompare(navigationSpy, "count", 2) - compare(attributes.mainUrl, Qt.resolvedUrl("test2.html")) + 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. |