Skip to content

Commit

Permalink
Bug 1733575 [wpt PR 30777] - Added WPTs for user-activation from keyp…
Browse files Browse the repository at this point in the history
…ress and keyup events., a=testonly

Automatic update from web-platform-tests
Added WPTs for user-activation from keypress and keyup events.

These tests are for the following HTML PR:
whatwg/html#6818

Also renamed the existing click event test for consistency.

Change-Id: If77750f4159828b68bd91a4b48f46606421b7df6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3159551
Reviewed-by: Robert Flack <flackr@chromium.org>
Commit-Queue: Mustaq Ahmed <mustaq@chromium.org>
Cr-Commit-Position: refs/heads/main@{#926812}

--

wpt-commits: aa4a6c240131c34425819ecd981423332f9028f0
wpt-pr: 30777
  • Loading branch information
mustaqahmed authored and moz-wptsync-bot committed Oct 5, 2021
1 parent 7e92cee commit 82404bf
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 30 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<!DOCTYPE html>
<html>
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/resources/testdriver.js"></script>
<script src="/resources/testdriver-vendor.js"></script>
<script src="resources/utils.js"></script>
</head>
<body>
<h1>Test for click activation trigger</h1>
<p>Tests that a popup is allowed with user activation from a click event.</p>
<ol id="instructions">
<li>Click anywhere in the document.
</ol>
<script>
promise_test(async () => {
test_driver.click(document.body);
await getEvent('click');
let consumed = await consumeTransientActivation();
assert_true(consumed, "click event should result in activation");
}, "Activation through mouse event");
</script>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<!DOCTYPE html>
<html>
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/resources/testdriver.js"></script>
<script src="/resources/testdriver-vendor.js"></script>
<script src="resources/utils.js"></script>
</head>
<body>
<h1>Test for keypress activation trigger</h1>
<p>Tests that a popup is allowed with user activation from a keypress event.</p>
<input type="text" autofocus />
<ol id="instructions">
<li>Press ENTER key.
</ol>
<script>
promise_test(async () => {
const ENTER_KEY = '\uE007';
test_driver.send_keys(document.body, ENTER_KEY);

let keyup_event = getEvent('keyup');

await getEvent('keypress');
let consumed = await consumeTransientActivation();
assert_true(consumed,
"ENTER keypress event should result in activation");

await keyup_event;
consumed = await consumeTransientActivation();
assert_false(consumed,
"ENTER keyup should have no activation after keypress consumption");
}, "Activation through keyboard event");
</script>
</body>
</html>
30 changes: 0 additions & 30 deletions testing/web-platform/tests/html/user-activation/basic.html

This file was deleted.

24 changes: 24 additions & 0 deletions testing/web-platform/tests/html/user-activation/resources/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,27 @@ function delayByFrames(f, num_frames) {
}
recurse(num_frames);
}

// Returns a Promise which is resolved with the event object when the event is
// fired.
function getEvent(eventType) {
return new Promise(resolve => {
document.body.addEventListener(eventType, e => resolve(e), {once: true});
});
}


// Returns a Promise which is resolved with a "true" iff transient activation
// was available and successfully consumed.
//
// This function relies on Fullscreen API to check/consume user activation
// state.
async function consumeTransientActivation() {
try {
await document.body.requestFullscreen();
await document.exitFullscreen();
return true;
} catch(e) {
return false;
}
}

0 comments on commit 82404bf

Please sign in to comment.