summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/quick/qmltests/data/tst_keyboardEvents.qml2
-rw-r--r--tests/auto/quick/qmltests/data/tst_newViewRequest.qml6
-rw-r--r--tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml b/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml
index 677727632..2536f319b 100644
--- a/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml
+++ b/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml
@@ -143,7 +143,7 @@ TestWebEngineView {
keyPress(Qt.Key_B);
compareElementValue("combobox", "b");
// Must wait with the second key press to simulate selection of another element
- wait(1000);
+ wait(1100); // blink::typeAheadTimeout + 0.1s
keyPress(Qt.Key_C);
compareElementValue("combobox", "c");
diff --git a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml
index 754a9e018..7a04d5f5b 100644
--- a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml
+++ b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml
@@ -93,7 +93,7 @@ TestWebEngineView {
compare(newViewRequest.destination, WebEngineView.NewViewInTab);
verify(!newViewRequest.userInitiated);
- verify(dialog.webEngineView.waitForLoadSucceeded);
+ verify(dialog.webEngineView.waitForLoadSucceeded());
compare(dialog.webEngineView.url, "");
newViewRequestedSpy.clear();
dialog.destroy();
@@ -109,7 +109,7 @@ TestWebEngineView {
compare(newViewRequest.destination, WebEngineView.NewViewInDialog);
verify(!newViewRequest.userInitiated);
- verify(dialog.webEngineView.waitForLoadSucceeded);
+ verify(dialog.webEngineView.waitForLoadSucceeded());
newViewRequestedSpy.clear();
dialog.destroy();
@@ -128,7 +128,7 @@ TestWebEngineView {
compare(newViewRequest.destination, WebEngineView.NewViewInDialog);
verify(newViewRequest.userInitiated);
- verify(dialog.webEngineView.waitForLoadSucceeded);
+ verify(dialog.webEngineView.waitForLoadSucceeded());
newViewRequestedSpy.clear();
dialog.destroy();
}
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index ce88ace16..32a518ad8 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -1109,7 +1109,7 @@ void tst_QWebEngineView::keyboardEvents()
QTest::keyPress(view.focusProxy(), Qt::Key_B);
QTRY_COMPARE(evaluateJavaScriptSync(view.page(), "document.getElementById('combobox').value").toString(), QStringLiteral("b"));
// Must wait with the second key press to simulate selection of another element
- QTest::keyPress(view.focusProxy(), Qt::Key_C, Qt::NoModifier, 1000);
+ QTest::keyPress(view.focusProxy(), Qt::Key_C, Qt::NoModifier, 1100 /* blink::typeAheadTimeout + 0.1s */);
QTRY_COMPARE(evaluateJavaScriptSync(view.page(), "document.getElementById('combobox').value").toString(), QStringLiteral("c"));
// Test the Enter key by loading a page with a hyperlink