Skip to content

GitLab

T
tangled
Commit 50b853d1 authored by Lan Wei's avatar Lan Wei Committed by Commit Bot
Browse files
Options

Simulate user inputs in focus-events/focus.html, fix event order. 

Use testdriver Action API to simulate mouse actions in
uievents/order-of-events/focus-events/focus.html.

This test now matches major browser implementations that "focus"
preceeds "focusin", and "blur" preceeds "focusout".  See:
    https://github.com/w3c/uievents/issues/276.

Bug: 1145677
Change-Id: I9e5965c90a18560cce560b73a3df88d0e840473d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2519193Reviewed-by: default avatarMustaq Ahmed <mustaq@chromium.org>
Commit-Queue: Lan Wei <lanwei@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827515}
parent ba04a73c
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 20 deletions
third_party/blink/web_tests/TestExpectations
View file @ 50b853d1
...@@ -1794,9 +1794,6 @@ crbug.com/472330 fast/borders/border-image-outset-split-inline-vertical-lr.html ...@@ -1794,9 +1794,6 @@ crbug.com/472330 fast/borders/border-image-outset-split-inline-vertical-lr.html
crbug.com/472330 fast/writing-mode/box-shadow-vertical-lr.html [ Failure ] crbug.com/472330 fast/writing-mode/box-shadow-vertical-lr.html [ Failure ]
crbug.com/472330 fast/writing-mode/box-shadow-vertical-rl.html [ Failure ] crbug.com/472330 fast/writing-mode/box-shadow-vertical-rl.html [ Failure ]
# These are the failing tests because Chrome hasn't implemented according to the spec.
crbug.com/645988 external/wpt/uievents/order-of-events/focus-events/focus-manual.html [ Failure ]
crbug.com/346473 fast/events/drag-on-mouse-move-cancelled.html [ Failure ] crbug.com/346473 fast/events/drag-on-mouse-move-cancelled.html [ Failure ]
# These tests are skipped as there is no touch support on Mac. # These tests are skipped as there is no touch support on Mac.
......
third_party/blink/web_tests/external/wpt/uievents/order-of-events/focus-events/focus-manual.html → third_party/blink/web_tests/external/wpt/uievents/order-of-events/focus-events/focus.html
View file @ 50b853d1
...@@ -5,10 +5,12 @@ ...@@ -5,10 +5,12 @@
<title>Focus-related events should fire in the correct order</title> <title>Focus-related events should fire in the correct order</title>
<link rel="author" title="Chris Rebert" href="http://chrisrebert.com"> <link rel="author" title="Chris Rebert" href="http://chrisrebert.com">
<link rel="help" href="https://w3c.github.io/uievents/#events-focusevent-event-order"> <link rel="help" href="https://w3c.github.io/uievents/#events-focusevent-event-order">
<meta name="flags" content="interact">
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="/uievents/resources/eventrecorder.js"></script> <script src="/uievents/resources/eventrecorder.js"></script>
<script src="/resources/testdriver.js"></script>
<script src="/resources/testdriver-actions.js"></script>
<script src="/resources/testdriver-vendor.js"></script>
</head> </head>
<body> <body>
...@@ -40,7 +42,9 @@ var relevantEvents = [ ...@@ -40,7 +42,9 @@ var relevantEvents = [
window.onload = function () { window.onload = function () {
var a = document.getElementById("a"); var a = document.getElementById("a");
var b = document.getElementById("b"); var b = document.getElementById("b");
var button = document.getElementById("done");
var inputs = [a, b]; var inputs = [a, b];
var actions_promise;
EventRecorder.configure({ EventRecorder.configure({
objectMap: { objectMap: {
"a": a, "a": a,
...@@ -50,25 +54,41 @@ window.onload = function () { ...@@ -50,25 +54,41 @@ window.onload = function () {
EventRecorder.addEventListenersForNodes(relevantEvents, inputs, stopPropagation); EventRecorder.addEventListenersForNodes(relevantEvents, inputs, stopPropagation);
var expected = [ var expected = [
{type: "focusin", target: "a"},
{type: "focus", target: "a"}, {type: "focus", target: "a"},
{type: "focusout", target: "a"}, {type: "focusin", target: "a"},
{type: "focusin", target: "b"},
{type: "blur", target: "a"}, {type: "blur", target: "a"},
{type: "focusout", target: "a"},
{type: "focus", target: "b"}, {type: "focus", target: "b"},
{type: "focusout", target: "b"}, {type: "focusin", target: "b"},
{type: "blur", target: "b"} {type: "blur", target: "b"},
{type: "focusout", target: "b"}
]; ];
async_test(function(t) { async_test(function(t) {
document.getElementById("done").addEventListener("click", function () { button.addEventListener("click", function () {
t.step(function () { t.step(function () {
assert_true(EventRecorder.checkRecords(expected)); assert_true(EventRecorder.checkRecords(expected));
t.done(); // Make sure the test finishes after all the input actions are completed.
actions_promise.then( () => {
t.done();
});
}); });
}, false); }, false);
}, "Focus-related events should fire in the correct order"); }, "Focus-related events should fire in the correct order");
EventRecorder.start(); EventRecorder.start();
// Inject mouse inputs.
actions_promise = new test_driver.Actions()
.pointerMove(0, 0, {origin: a})
.pointerDown()
.pointerUp()
.pointerMove(0, 0, {origin: b})
.pointerDown()
.pointerUp()
.pointerMove(0, 0, {origin: button})
.pointerDown()
.pointerUp()
.send();
}; };
</script> </script>
</html> </html>
third_party/blink/web_tests/external/wpt_automation/uievents/order-of-events/focus-events/focus-manual-automation.js deleted 100644 → 0
View file @ ba04a73c
importAutomationScript('/pointerevents/pointerevent_common_input.js');
function inject_input() {
return mouseClickInTarget('#a').then(function() {
return mouseClickInTarget('#b');
}).then(function() {
return mouseClickInTarget('#done');
});
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment