From bc85483842bda619a8a5fff121a5c61ca7f3dfa4 Mon Sep 17 00:00:00 2001
From: Domenic Denicola <domenic@chromium.org>
Date: Tue, 29 Mar 2022 09:44:42 -0700
Subject: [PATCH] Navigation API: focusReset should reset SFNSP

SFNSP = sequential focus navigation starting point.

This was noticed while writing the spec at
https://github.com/WICG/navigation-api/pull/201.

Bug: 1183545
Change-Id: If13f3c12e9c6ef2dbed628a65b823754ae04cd3d
---
 navigation-api/focus-reset/basic.html         |  2 ++
 .../focus-reset/multiple-transitionWhile.html |  2 ++
 .../focus-reset/resources/helpers.mjs         | 32 +++++++++++++++++--
 3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/navigation-api/focus-reset/basic.html b/navigation-api/focus-reset/basic.html
index 8a62d88ba65983..1ffaa022ee4ba5 100644
--- a/navigation-api/focus-reset/basic.html
+++ b/navigation-api/focus-reset/basic.html
@@ -1,6 +1,8 @@
 <!doctype html>
 <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 type="module">
 import { testFocusWasReset, testFocusWasNotReset } from "./resources/helpers.mjs";
diff --git a/navigation-api/focus-reset/multiple-transitionWhile.html b/navigation-api/focus-reset/multiple-transitionWhile.html
index c1d028524a5e8c..3420991f9a8617 100644
--- a/navigation-api/focus-reset/multiple-transitionWhile.html
+++ b/navigation-api/focus-reset/multiple-transitionWhile.html
@@ -1,6 +1,8 @@
 <!doctype html>
 <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 type="module">
 import { testFocusWasReset, testFocusWasNotReset } from "./resources/helpers.mjs";
diff --git a/navigation-api/focus-reset/resources/helpers.mjs b/navigation-api/focus-reset/resources/helpers.mjs
index e7e9a52009dd4c..0a8a0439e1c885 100644
--- a/navigation-api/focus-reset/resources/helpers.mjs
+++ b/navigation-api/focus-reset/resources/helpers.mjs
@@ -2,12 +2,19 @@
 // clean up any navigate event listeners, e.g. by using { once: true }, between
 // tests.
 
+const TAB_KEY = "\uE004";
+
 export function testFocusWasReset(setupFunc, description) {
   promise_test(async t => {
     setupFunc(t);
 
     const button = document.body.appendChild(document.createElement("button"));
-    t.add_cleanup(() => { button.remove(); });
+    const button2 = document.body.appendChild(document.createElement("button"));
+    button2.tabIndex = 0;
+    t.add_cleanup(() => {
+      button.remove();
+      button2.remove();
+    });
 
     assert_equals(document.activeElement, document.body, "Start on body");
     button.focus();
@@ -20,6 +27,11 @@ export function testFocusWasReset(setupFunc, description) {
 
     await finished.catch(() => {});
     assert_equals(document.activeElement, document.body, "Focus reset after the transition");
+
+    button2.onfocus = t.unreached_func("button2 must not be focused after pressing Tab");
+    const focusPromise = waitForFocus(t, button);
+    await test_driver.send_keys(document.body, TAB_KEY);
+    await focusPromise;
   }, description);
 }
 
@@ -28,7 +40,12 @@ export function testFocusWasNotReset(setupFunc, description) {
     setupFunc(t);
 
     const button = document.body.appendChild(document.createElement("button"));
-    t.add_cleanup(() => { button.remove(); });
+    const button2 = document.body.appendChild(document.createElement("button"));
+    button2.tabIndex = 0;
+    t.add_cleanup(() => {
+      button.remove();
+      button2.remove();
+    });
 
     assert_equals(document.activeElement, document.body, "Start on body");
     button.focus();
@@ -41,5 +58,16 @@ export function testFocusWasNotReset(setupFunc, description) {
 
     await finished.catch(() => {});
     assert_equals(document.activeElement, button, "Focus stays on the button after the transition");
+
+    button.onfocus = t.unreached_func("button must not be focused after pressing Tab");
+    const focusPromise = waitForFocus(t, button2);
+    await test_driver.send_keys(document.body, TAB_KEY);
+    await focusPromise;
   }, description);
 }
+
+function waitForFocus(t, target) {
+  return new Promise(resolve => {
+    target.addEventListener("focus", () => resolve(), { once: true });
+  });
+}
