Diff
Modified: trunk/LayoutTests/ChangeLog (281780 => 281781)
--- trunk/LayoutTests/ChangeLog 2021-08-30 22:41:08 UTC (rev 281780)
+++ trunk/LayoutTests/ChangeLog 2021-08-30 22:45:43 UTC (rev 281781)
@@ -1,3 +1,19 @@
+2021-08-30 Megan Gardner <[email protected]>
+
+ Fix double-tap-on-editable-content-for-selection-then-drag-* tests.
+ https://bugs.webkit.org/show_bug.cgi?id=229683
+ rdar://59571151
+
+ Reviewed by Wenson Hsieh.
+
+ Add delay to allow double-tap gesture to reset before the other gestures can be invoked.
+ Also update to use more functions from UIHelper, which is newer and more maintained.
+
+ * fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-down-to-change-selected-text.html:
+ * fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-left-to-change-selected-text.html:
+ * fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-right-to-change-selected-text.html:
+ * fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-up-to-change-selected-text.html:
+
2021-08-30 Lauro Moura <[email protected]>
[GLIB] Add new baselines after css-masking WPT update from r281580
Modified: trunk/LayoutTests/fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-down-to-change-selected-text.html (281780 => 281781)
--- trunk/LayoutTests/fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-down-to-change-selected-text.html 2021-08-30 22:41:08 UTC (rev 281780)
+++ trunk/LayoutTests/fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-down-to-change-selected-text.html 2021-08-30 22:45:43 UTC (rev 281781)
@@ -3,6 +3,7 @@
<html>
<head>
<script src=""
+ <script src=""
<script>
if (window.testRunner) {
testRunner.dumpAsText();
@@ -31,7 +32,7 @@
var dragY3 = thirdTargetRect.y + thirdTargetRect.height - editableToNoneditableOffset;
var dragY4 = firstTargetRect.y - firstTargetRect.height - editableToNoneditableOffset;
- await tapAtPoint(tapPointX, tapPointY);
+ await UIHelper.tapAt(tapPointX, tapPointY);
if (document.getSelection().type == "Caret")
output += 'PASS: Has Caret Selection';
else
@@ -40,7 +41,7 @@
await didShowKeyboard();
- await doubleTapAtPoint(doubleTapPointX, doubleTapPointY);
+ await UIHelper.doubleTapAt(doubleTapPointX, doubleTapPointY);
if (document.getSelection().toString() == "sed")
output += 'PASS: Correct Selection';
else
@@ -47,6 +48,8 @@
output += 'FAIL: failed to select a word as a result of a long press. Incorrect Selection: ' + document.getSelection().toString();
output += '<br>';
+ await UIHelper.waitForDoubleTapDelay();
+
await touchAndDragFromPointToPoint(dragX, dragY, dragX, dragY2);
if (document.getSelection().toString() == "sed do eiusmod tempor incididun")
output += 'PASS: Correct Selection';
Modified: trunk/LayoutTests/fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-left-to-change-selected-text.html (281780 => 281781)
--- trunk/LayoutTests/fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-left-to-change-selected-text.html 2021-08-30 22:41:08 UTC (rev 281780)
+++ trunk/LayoutTests/fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-left-to-change-selected-text.html 2021-08-30 22:45:43 UTC (rev 281781)
@@ -3,6 +3,7 @@
<html>
<head>
<script src=""
+ <script src=""
<script>
if (window.testRunner) {
testRunner.dumpAsText();
@@ -31,7 +32,7 @@
var dragX3 = thirdTargetRect.x;
var dragX4 = firstTargetRect.x + firstTargetRect.width;
- await tapAtPoint(tapPointX, tapPointY);
+ await UIHelper.tapAt(tapPointX, tapPointY);
if (document.getSelection().type == "Caret")
output += 'PASS: Has Caret Selection';
else
@@ -40,7 +41,7 @@
await didShowKeyboard();
- await doubleTapAtPoint(doubleTapPointX, doubleTapPointY);
+ await UIHelper.doubleTapAt(doubleTapPointX, doubleTapPointY);
if (document.getSelection().toString() == "magna")
output += 'PASS: Correct Selection';
else
@@ -47,6 +48,8 @@
output += 'FAIL: failed to select a word as a result of a long press. Incorrect Selection: ' + document.getSelection().toString();
output += '<br>';
+ await UIHelper.waitForDoubleTapDelay();
+
await touchAndDragFromPointToPoint(dragX, dragY, dragX2, dragY);
if (document.getSelection().toString() == "aliqua magna")
output += 'PASS: Correct Selection';
Modified: trunk/LayoutTests/fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-right-to-change-selected-text.html (281780 => 281781)
--- trunk/LayoutTests/fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-right-to-change-selected-text.html 2021-08-30 22:41:08 UTC (rev 281780)
+++ trunk/LayoutTests/fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-right-to-change-selected-text.html 2021-08-30 22:45:43 UTC (rev 281781)
@@ -3,6 +3,7 @@
<html>
<head>
<script src=""
+ <script src=""
<script>
if (window.testRunner) {
testRunner.dumpAsText();
@@ -31,7 +32,7 @@
var dragX3 = thirdTargetRect.x;
var dragX4 = firstTargetRect.x - firstTargetRect.width;
- await tapAtPoint(tapPointX, tapPointY);
+ await UIHelper.tapAt(tapPointX, tapPointY);
if (document.getSelection().type == "Caret")
output += 'PASS: Has Caret Selection';
else
@@ -40,7 +41,7 @@
await didShowKeyboard();
- await doubleTapAtPoint(doubleTapPointX, doubleTapPointY);
+ await UIHelper.doubleTapAt(doubleTapPointX, doubleTapPointY);
if (document.getSelection().toString() == "magna")
output += 'PASS: Correct Selection';
else
@@ -47,6 +48,8 @@
output += 'FAIL: failed to select a word as a result of a long press. Incorrect Selection: ' + document.getSelection().toString();
output += '<br>';
+ await UIHelper.waitForDoubleTapDelay();
+
await touchAndDragFromPointToPoint(dragX, dragY, dragX2, dragY);
if (document.getSelection().toString() == "magna aliqua.")
output += 'PASS: Correct Selection';
Modified: trunk/LayoutTests/fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-up-to-change-selected-text.html (281780 => 281781)
--- trunk/LayoutTests/fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-up-to-change-selected-text.html 2021-08-30 22:41:08 UTC (rev 281780)
+++ trunk/LayoutTests/fast/events/touch/ios/double-tap-on-editable-content-for-selection-then-drag-up-to-change-selected-text.html 2021-08-30 22:45:43 UTC (rev 281781)
@@ -3,6 +3,7 @@
<html>
<head>
<script src=""
+ <script src=""
<script>
if (window.testRunner) {
testRunner.dumpAsText();
@@ -31,7 +32,7 @@
var dragY3 = thirdTargetRect.y - editableToNoneditableOffset;
var dragY4 = firstTargetRect.y + firstTargetRect.height - editableToNoneditableOffset;
- await tapAtPoint(tapPointX, tapPointY);
+ await UIHelper.tapAt(tapPointX, tapPointY);
if (document.getSelection().type == "Caret")
output += 'PASS: Has Caret Selection';
else
@@ -40,7 +41,7 @@
await didShowKeyboard();
- await doubleTapAtPoint(doubleTapPointX, doubleTapPointY);
+ await UIHelper.doubleTapAt(doubleTapPointX, doubleTapPointY);
if (document.getSelection().toString() == "at")
output += 'PASS: Correct Selection';
else
@@ -47,6 +48,8 @@
output += 'FAIL: failed to select a word as a result of a long press. Incorrect Selection: ' + document.getSelection().toString();
output += '<br>';
+ await UIHelper.waitForDoubleTapDelay();
+
await touchAndDragFromPointToPoint(dragX, dragY, dragX, dragY2);
if (document.getSelection().toString() == "o eiusmod tempor incididunt at")
output += 'PASS: Correct Selection';
Modified: trunk/Tools/ChangeLog (281780 => 281781)
--- trunk/Tools/ChangeLog 2021-08-30 22:41:08 UTC (rev 281780)
+++ trunk/Tools/ChangeLog 2021-08-30 22:45:43 UTC (rev 281781)
@@ -1,3 +1,17 @@
+2021-08-30 Megan Gardner <[email protected]>
+
+ Fix double-tap-on-editable-content-for-selection-then-drag-* tests.
+ https://bugs.webkit.org/show_bug.cgi?id=229683
+ rdar://59571151
+
+ Reviewed by Wenson Hsieh.
+
+ The swipe keyboard tutorial comes up on first launch. Set the defaults to prevent
+ that from happening and interfering with tests.
+
+ * WebKitTestRunner/ios/TestControllerIOS.mm:
+ (WTR::TestController::platformResetStateToConsistentValues):
+
2021-08-30 Alex Christensen <[email protected]>
Migrate PrivateClickMeasurements from ResourceLoadStatistics database to new database
Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (281780 => 281781)
--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2021-08-30 22:41:08 UTC (rev 281780)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2021-08-30 22:45:43 UTC (rev 281781)
@@ -168,6 +168,10 @@
if (![preferencesActions oneTimeActionCompleted:hardwareKeyboardLastSeenPreferenceKey])
[preferencesActions didTriggerOneTimeAction:hardwareKeyboardLastSeenPreferenceKey];
+ auto didShowContinuousPathIntroductionKey = @"DidShowContinuousPathIntroduction";
+ if (![preferencesActions oneTimeActionCompleted:didShowContinuousPathIntroductionKey])
+ [preferencesActions didTriggerOneTimeAction:didShowContinuousPathIntroductionKey];
+
// Disables the dictation keyboard shortcut for testing.
auto dictationKeyboardShortcutPreferenceKey = @"HWKeyboardDictationShortcut";
auto dictationKeyboardShortcutValueForTesting = @(-1);
