summaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qmltests/data/tst_viewSource.qml
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2016-10-06 16:52:14 +0200
committerPeter Varga <pvarga@inf.u-szeged.hu>2016-10-17 09:14:13 +0000
commit1eb814230515ffb3417e0ac9533fc24847c1ebb9 (patch)
tree21194417aa8b9331e9609e1542064821d079cc48 /tests/auto/quick/qmltests/data/tst_viewSource.qml
parent41ba9b70525139fb52d00ba81eb8a53293ad71db (diff)
Speculative fix of title check in quick auto tests
Title might be changed after a successful page load too. The order is not guaranteed. Implement wait for the expected title change. Task-number: QTBUG-56180 Change-Id: If8c529e6246fe9e8c93e41be84c8934c8ed8d729 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'tests/auto/quick/qmltests/data/tst_viewSource.qml')
-rw-r--r--tests/auto/quick/qmltests/data/tst_viewSource.qml12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_viewSource.qml b/tests/auto/quick/qmltests/data/tst_viewSource.qml
index 79b097b80..8076d99f8 100644
--- a/tests/auto/quick/qmltests/data/tst_viewSource.qml
+++ b/tests/auto/quick/qmltests/data/tst_viewSource.qml
@@ -74,7 +74,7 @@ TestWebEngineView {
function test_viewSource() {
webEngineView.url = Qt.resolvedUrl("test1.html");
verify(webEngineView.waitForLoadSucceeded());
- compare(webEngineView.title, "Test page 1");
+ tryCompare(webEngineView, "title", "Test page 1");
// FIXME(pvarga): Reintroduce this check in the fix for QTBUG-56117
//verify(webEngineView.canViewSource, true);
@@ -83,14 +83,14 @@ TestWebEngineView {
tryCompare(newViewRequestedSpy, "count", 1);
verify(webEngineView.waitForLoadSucceeded());
// The first titleChanged signal is emitted by adoptWebContents()
- tryCompare(titleChangedSpy, "count", 2);
+ tryVerify(function() { return titleChangedSpy.count >= 2; });
compare(viewRequest.destination, WebEngineView.NewViewInTab);
verify(viewRequest.userInitiated);
// FIXME(pvarga): Reintroduce this check in the fix for QTBUG-56117
//verify(!webEngineView.canViewSource);
- compare(webEngineView.title, "test1.html");
+ tryCompare(webEngineView, "title", "test1.html");
compare(webEngineView.url, "view-source:" + Qt.resolvedUrl("test1.html"));
}
@@ -114,14 +114,14 @@ TestWebEngineView {
if (row.loadSucceed) {
verify(webEngineView.waitForLoadSucceeded());
- tryCompare(titleChangedSpy, "count", 1);
+ tryVerify(function() { return titleChangedSpy.count >= 1; });
} else {
verify(webEngineView.waitForLoadFailed());
- tryCompare(titleChangedSpy, "count", 2);
+ tryVerify(function() { return titleChangedSpy.count >= 2; });
}
compare(webEngineView.url, row.url);
- compare(webEngineView.title, row.title);
+ tryCompare(webEngineView, "title", row.title);
// FIXME(pvarga): Reintroduce this check in the fix for QTBUG-56117
//verify(!webEngineView.canViewSource);
}