diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-10-14 17:13:59 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-10-18 14:28:11 +0000 |
| commit | 528bad22fa0cdb96b8de9de4af33981ff1750fe6 (patch) | |
| tree | 9c323c52e201045a64915a663167d7cde889009c /tests/auto | |
| parent | 7b7c9cb4183651b496501e89deb497490199b320 (diff) | |
Fix find after navigation
Update Chromium for the actual fix. Add quick auto test for the issue
and unskip WebViewFindText::testfindTextManyMatches.
Task-number: QTBUG-56373
Change-Id: Id70291e5231f572c85b0a7c1ec1b6facd161115a
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/quick/qmltests/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/data/tst_findText.qml | 19 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 1 |
3 files changed, 20 insertions, 3 deletions
diff --git a/tests/auto/quick/qmltests/BLACKLIST b/tests/auto/quick/qmltests/BLACKLIST index 375d89894..0d48724de 100644 --- a/tests/auto/quick/qmltests/BLACKLIST +++ b/tests/auto/quick/qmltests/BLACKLIST @@ -12,6 +12,3 @@ osx [WebEngineViewLoadUrl::test_urlProperty] windows - -[WebViewFindText::test_findTextManyMatches] -* diff --git a/tests/auto/quick/qmltests/data/tst_findText.qml b/tests/auto/quick/qmltests/data/tst_findText.qml index 904a8feb2..4761513c1 100644 --- a/tests/auto/quick/qmltests/data/tst_findText.qml +++ b/tests/auto/quick/qmltests/data/tst_findText.qml @@ -107,5 +107,24 @@ TestWebEngineView { tryCompare(webEngineView, "matchCount", 0) verify(findFailed) } + + function test_findTextAfterNotFound() { + var findFlags = 0 + webEngineView.url = Qt.resolvedUrl("about:blank") + verify(webEngineView.waitForLoadSucceeded()) + + webEngineView.clear() + webEngineView.findText("hello", findFlags, webEngineView.findTextCallback) + tryCompare(webEngineView, "matchCount", 0) + verify(findFailed) + + webEngineView.url = Qt.resolvedUrl("test1.html") + verify(webEngineView.waitForLoadSucceeded()) + + webEngineView.clear() + webEngineView.findText("hello", findFlags, webEngineView.findTextCallback) + tryCompare(webEngineView, "matchCount", 1) + verify(!findFailed) + } } } diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index cc5434807..726519db2 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -45,6 +45,7 @@ OTHER_FILES += \ $$PWD/data/tst_favicon.qml \ $$PWD/data/tst_faviconDownload.qml \ $$PWD/data/tst_filePicker.qml \ + $$PWD/data/tst_findText.qml \ $$PWD/data/tst_focusOnNavigation.qml \ $$PWD/data/tst_formValidation.qml \ $$PWD/data/tst_geopermission.qml \ |