Fix a bug in test_driver.bless()

mfreed7 · chromium-wpt-export-bot · commit 1a0b11fda1b0 · 2024-12-16T14:24:56.000-08:00
This code was previously doing this: let wait_click = new Promise(resolve => { button.addEventListener("click", resolve)); }; return test_driver.click(button) .then(wait_click) .then(... but the argument to `.then(wait_click)` isn't a function, it's the promise to return. Therefore .then() creates an already-resolved promise containing `wait_click` as its resolved value. Which the next `.then()` block ignores. So this wasn't actually waiting for the click to occur. This triggered a number of test bugs (caused by erroneous assumptions accidentally baked into the tests. I fixed a few, and filed a few bugs for the rest (after failing to figure out how to fix them). Note that the WPT version of testdriver.js is rolled into Chromium, so that change is being made here: #49691 Bug: 384009734,384050894 Change-Id: Ibdb8a97d23998ad89c5a48c23a7e780dc605283b
diff --git a/fullscreen/rendering/backdrop-object.html b/fullscreen/rendering/backdrop-object.html
@@ -11,13 +11,14 @@
   background: blue;
 }
 </style>
-<object width="200" type="image/svg+xml" data="/images/100px-green-rect.svg"></object>
+<object width="200" type="image/svg+xml"></object>
+
 <script>
 const object = document.querySelector("object");
-Promise.all([
-    new Promise((resolve, reject) => document.addEventListener("fullscreenchange", resolve)),
-    new Promise((resolve, reject) => object.addEventListener("load", resolve))
-]).then(() => document.documentElement.classList.remove('reftest-wait'));
-
-test_driver.bless('fullscreen', () => object.requestFullscreen());
+test_driver.bless('fullscreen')
+  .then(() => {object.data="/images/100px-green-rect.svg";})
+  .then(() => new Promise((resolve) => object.addEventListener("load", resolve)))
+  .then(() => object.requestFullscreen())
+  .then(() => new Promise((resolve) => document.addEventListener("fullscreenchange", resolve)))
+  .then(() => document.documentElement.classList.remove('reftest-wait'));
 </script>
diff --git a/html/semantics/forms/the-input-element/show-picker-user-gesture.html b/html/semantics/forms/the-input-element/show-picker-user-gesture.html
@@ -5,39 +5,39 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
-<body></body>
+
+<body>
 <script type=module>
 import inputTypes from "./input-types.js";
 
-for (const inputType of inputTypes) {
-  test(() => {
-    const input = document.createElement("input");
-    input.setAttribute("type", inputType);
+// File pickers can't be closed.
+const types = inputTypes.filter((t) => t != 'file');
 
+function createElement(t,type) {
+  const input = document.createElement("input");
+  input.setAttribute("type", type);
+  document.body.appendChild(input);
+  t.add_cleanup(() => input.remove());
+  return input;
+}
+for (const inputType of types) {
+  promise_test(async (t) => {
+    const input = createElement(t,inputType);
     assert_throws_dom('NotAllowedError', () => { input.showPicker(); });
   }, `input[type=${inputType}] showPicker() requires a user gesture`);
-}
-
-for (const inputType of inputTypes) {
-  promise_test(async t => {
-    const input = document.createElement("input");
-    input.setAttribute("type", inputType);
 
+  promise_test(async (t) => {
+    const input = createElement(t,inputType);
     await test_driver.bless('show picker');
     input.showPicker();
     input.blur();
   }, `input[type=${inputType}] showPicker() does not throw when user activation is active`);
-}
-
-for (const inputType of inputTypes) {
-  promise_test(async () => {
-    const input = document.createElement('input');
-    input.setAttribute('type', inputType);
 
+  promise_test(async (t) => {
+    const input = createElement(t,inputType);
     await test_driver.bless('show picker');
     input.showPicker();
     input.blur();
-
     assert_false(navigator.userActivation.isActive);
   }, `input[type=${inputType}] showPicker() consumes user activation`);
 }
diff --git a/resources/testdriver.js b/resources/testdriver.js
@@ -250,8 +250,8 @@
             let wait_click = new Promise(resolve => button.addEventListener("click", resolve));
 
             return test_driver.click(button)
-                .then(wait_click)
-                .then(function() {
+                .then(() => wait_click)
+                .then(() => {
                     button.remove();
 
                     if (typeof action === "function") {
