From 86d83d54e9c92830c89d2a8c0edb30b78ac5e5e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20J=C3=A4genstedt?= <philip@foolip.org>
Date: Tue, 15 Nov 2022 10:19:56 +0100
Subject: [PATCH] Test that element.requestFullscreen() consumes user
 activation

This makes a bunch of other tests redundant, as they're also calling
requestFullscreen() twice, and should all fail in exactly the same way.

element-request-fullscreen-same-manual.html is also converted to ensure
that a second call in a new click does work, to ensure the failure isn't
because the element is the same as the fullscreen element.

Follows https://github.com/whatwg/fullscreen/pull/153.
---
 ...st-fullscreen-consume-user-activation.html | 28 ++++++++
 ...ement-request-fullscreen-same-element.html | 25 +++++++
 ...lement-request-fullscreen-same-manual.html | 30 ---------
 ...ement-request-fullscreen-twice-manual.html | 27 --------
 ...est-fullscreen-twice-manual.tentative.html | 46 -------------
 ...equest-fullscreen-two-elements-manual.html | 37 -----------
 ...lscreen-two-elements-manual.tentative.html | 56 ----------------
 ...request-fullscreen-two-iframes-manual.html | 48 --------------
 ...llscreen-two-iframes-manual.tentative.html | 65 -------------------
 9 files changed, 53 insertions(+), 309 deletions(-)
 create mode 100644 fullscreen/api/element-request-fullscreen-consume-user-activation.html
 create mode 100644 fullscreen/api/element-request-fullscreen-same-element.html
 delete mode 100644 fullscreen/api/element-request-fullscreen-same-manual.html
 delete mode 100644 fullscreen/api/element-request-fullscreen-twice-manual.html
 delete mode 100644 fullscreen/api/element-request-fullscreen-twice-manual.tentative.html
 delete mode 100644 fullscreen/api/element-request-fullscreen-two-elements-manual.html
 delete mode 100644 fullscreen/api/element-request-fullscreen-two-elements-manual.tentative.html
 delete mode 100644 fullscreen/api/element-request-fullscreen-two-iframes-manual.html
 delete mode 100644 fullscreen/api/element-request-fullscreen-two-iframes-manual.tentative.html
diff --git a/fullscreen/api/element-request-fullscreen-consume-user-activation.html b/fullscreen/api/element-request-fullscreen-consume-user-activation.html
new file mode 100644
index 00000000000000..8c509f76a3a1dc
--- /dev/null
+++ b/fullscreen/api/element-request-fullscreen-consume-user-activation.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<title>Element#requestFullscreen() consumes user activation</title>
+<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>
+<div id="log"></div>
+<script>
+promise_test(async (t) => {
+    t.add_cleanup(() => { document.exitFullscreen() });
+
+    const div = document.querySelector("div");
+
+    const promises = [];
+
+    await test_driver.bless("fullscreen", () => {
+      // Request fullscreen twice in a row. The first request should consume the
+      // user activation and succeed, and the second request should fail because
+      // of the user activation requirement.
+      const p1 = div.requestFullscreen();
+      const p2 = div.requestFullscreen();
+      promises.push(p1);
+      promises.push(promise_rejects_js(t, TypeError, p2));
+    });
+
+    await Promise.all(promises);
+});
+</script>
diff --git a/fullscreen/api/element-request-fullscreen-same-element.html b/fullscreen/api/element-request-fullscreen-same-element.html
new file mode 100644
index 00000000000000..904056132e61e3
--- /dev/null
+++ b/fullscreen/api/element-request-fullscreen-same-element.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<title>Element#requestFullscreen() on the current fullscreen element</title>
+<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>
+<div id="log"></div>
+<script>
+promise_test(async (t) => {
+    t.add_cleanup(() => { document.exitFullscreen() });
+
+    // Use the body element as the fullscreen element, because the second
+    // test_driver.bless() call needs to insert a button inside of it, which
+    // can't be clicked if another element is already fullscreen.
+    const target = document.body;
+
+    // First enter fullscreen.
+    await test_driver.bless("fullscreen", () => target.requestFullscreen());
+    assert_equals(document.fullscreenElement, target, "fullscreen element after first request");
+
+    // Now request fullscreen again, which should be a no-op.
+    await test_driver.bless("fullscreen", () => target.requestFullscreen());
+    assert_equals(document.fullscreenElement, target, "fullscreen element after second request");
+});
+</script>
diff --git a/fullscreen/api/element-request-fullscreen-same-manual.html b/fullscreen/api/element-request-fullscreen-same-manual.html
deleted file mode 100644
index defe9ce54d07eb..00000000000000
--- a/fullscreen/api/element-request-fullscreen-same-manual.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<title>Element#requestFullscreen() on the current fullscreen element</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../trusted-click.js"></script>
-<div id="log"></div>
-<div id="target"></div>
-<script>
-async_test(t => {
-  var target = document.getElementById("target");
-
-  document.onfullscreenchange = t.step_func(() => {
-    assert_equals(document.fullscreenElement, target);
-
-    // The next requestFullscreen() should fire no events due to "If element is
-    // doc's fullscreen element, terminate these subsubsteps."
-    document.onfullscreenchange = t.unreached_func("fullscreenchange event");
-
-    trusted_click(t, () => {
-      target.requestFullscreen();
-
-      // Wait until after the next animation frame.
-      requestAnimationFrame(t.step_func_done());
-    }, target);
-  });
-  document.onfullscreenerror = t.unreached_func("fullscreenerror event");
-
-  trusted_request(t, target);
-});
-</script>
diff --git a/fullscreen/api/element-request-fullscreen-twice-manual.html b/fullscreen/api/element-request-fullscreen-twice-manual.html
deleted file mode 100644
index 06641deb48b119..00000000000000
--- a/fullscreen/api/element-request-fullscreen-twice-manual.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<title>Element#requestFullscreen() twice</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../trusted-click.js"></script>
-<div id="log"></div>
-<script>
-async_test(t => {
-  const div = document.querySelector("div");
-
-  document.onfullscreenchange = t.step_func(() => {
-    assert_equals(document.fullscreenElement, div);
-    // Done, but ensure that there's only one fullscreenchange event.
-    document.onfullscreenchange = t.unreached_func("second fullscreenchange event");
-    step_timeout(t.step_func_done());
-  });
-  document.onfullscreenerror = t.unreached_func("fullscreenerror event");
-
-  trusted_click(t, () => {
-    // Request fullscreen twice.
-    div.requestFullscreen();
-    assert_equals(document.fullscreenElement, null, "fullscreenElement after first requestFullscreen()");
-    div.requestFullscreen();
-    assert_equals(document.fullscreenElement, null, "fullscreenElement after second requestFullscreen()");
-  }, document.body);
-});
-</script>
diff --git a/fullscreen/api/element-request-fullscreen-twice-manual.tentative.html b/fullscreen/api/element-request-fullscreen-twice-manual.tentative.html
deleted file mode 100644
index a8b5531fa1835a..00000000000000
--- a/fullscreen/api/element-request-fullscreen-twice-manual.tentative.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<!--
-   Tentative due to:
-    https://github.com/whatwg/fullscreen/issues/152
-
--->
-<title>Element#requestFullscreen() twice</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../trusted-click.js"></script>
-<div id="log"></div>
-<script>
-promise_test(async (test) => {
-  const div = document.querySelector("div");
-
-  const fullscreenChangePromise = new Promise((resolve, reject) => {
-    document.onfullscreenchange = test.step_func(() => {
-      assert_equals(document.fullscreenElement, div);
-      // Ensure that there's only one fullscreenchange event.
-      document.onfullscreenchange = test.unreached_func("second fullscreenchange event");
-      resolve();
-    });
-  });
-
-  const fullscreenErrorPromise = new Promise((resolve, reject) => {
-    document.onfullscreenerror = test.step_func(() => {
-      resolve();
-    });
-  });
-
-  trusted_click(test, () => {
-    // Request fullscreen twice.
-    div.requestFullscreen();
-    assert_equals(document.fullscreenElement, null, "fullscreenElement after first requestFullscreen()");
-    var p = div.requestFullscreen();
-    if (p) {
-      p.then(test.unreached_func("promise unexpectedly resolved"), ()=>{});
-    }
-  }, document.body);
-
-  await Promise.all([
-    fullscreenChangePromise,
-    fullscreenErrorPromise,
-  ]);
-});
-</script>
diff --git a/fullscreen/api/element-request-fullscreen-two-elements-manual.html b/fullscreen/api/element-request-fullscreen-two-elements-manual.html
deleted file mode 100644
index 11baad7da7885b..00000000000000
--- a/fullscreen/api/element-request-fullscreen-two-elements-manual.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<title>Element#requestFullscreen() on two elements in the same document</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../trusted-click.js"></script>
-<div id="log"></div>
-<div id="a"></div>
-<div id="b"></div>
-<script>
-async_test(t => {
-  // Request fullscreen on both elements, but in reverse tree order.
-  const a = document.getElementById('a');
-  const b = document.getElementById('b');
-
-  // Expect two fullscreenchange events, with document.fullscreenElement
-  // changing in the same order as the requests.
-  const order = [];
-  document.onfullscreenchange = t.step_func(() => {
-    assert_in_array(document.fullscreenElement, [a, b]);
-    order.push(document.fullscreenElement.id);
-    if (order.length == 2) {
-      // Since fullscreenchange event occurs at animation frame timing we might
-      // have not seen the transition from null -> 'b' but just see the
-      // resulting 'a' transition twice.
-      assert_true(order[0] == 'a' || order[0] == 'b', 'first id seen is a or b');
-      assert_equals(order[1], 'a', 'second id seen is b');
-      t.done();
-    }
-  });
-  document.onfullscreenerror = t.unreached_func('fullscreenerror event');
-
-  trusted_click(t, () => {
-    b.requestFullscreen();
-    a.requestFullscreen();
-  }, document.body);
-});
-</script>
diff --git a/fullscreen/api/element-request-fullscreen-two-elements-manual.tentative.html b/fullscreen/api/element-request-fullscreen-two-elements-manual.tentative.html
deleted file mode 100644
index 5ebc628b3b3b56..00000000000000
--- a/fullscreen/api/element-request-fullscreen-two-elements-manual.tentative.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<!--
-   Tentative due to:
-    https://github.com/whatwg/fullscreen/issues/152
-
--->
-<title>Element#requestFullscreen() on two elements in the same document</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../trusted-click.js"></script>
-<div id="log"></div>
-<div id="a"></div>
-<div id="b"></div>
-<script>
-promise_test(async (test) => {
-  // Request fullscreen on both elements, but in reverse tree order.
-  const a = document.getElementById('a');
-  const b = document.getElementById('b');
-
-  // Expect two fullscreenchange events, with document.fullscreenElement
-  // changing in the same order as the requests.
-  const order = [];
-  const fullscreenChangePromise = new Promise((resolve, reject) => {
-    document.onfullscreenchange = test.step_func(() => {
-      assert_in_array(document.fullscreenElement, [a, b]);
-      order.push(document.fullscreenElement.id);
-      if (order.length == 2) {
-        // Since fullscreenchange event occurs at animation frame timing we might
-        // have not seen the transition from null -> 'b' but just see the
-        // resulting 'a' transition twice.
-        assert_true(order[0] == 'a' || order[0] == 'b', 'first id seen is a or b');
-        assert_equals(order[1], 'a', 'second id seen is b');
-      }
-      resolve();
-    });
-  });
-  const fullscreenErrorPromise = new Promise((resolve, reject) => {
-    document.onfullscreenerror = test.step_func(() => {
-      resolve();
-    });
-  });
-
-  trusted_click(test, () => {
-    b.requestFullscreen();
-    var p = a.requestFullscreen();
-    if (p) {
-      p.then(test.unreached_func("promise unexpectedly resolved"), ()=>{});
-    }
-  }, document.body);
-
-  await Promise.all([
-    fullscreenChangePromise,
-    fullscreenErrorPromise,
-  ]);
-});
-</script>
diff --git a/fullscreen/api/element-request-fullscreen-two-iframes-manual.html b/fullscreen/api/element-request-fullscreen-two-iframes-manual.html
deleted file mode 100644
index 916ae7969502ce..00000000000000
--- a/fullscreen/api/element-request-fullscreen-two-iframes-manual.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<title>Element#requestFullscreen() on two elements in different iframes</title>
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../trusted-click.js"></script>
-<div id="log"></div>
-<iframe id="a" allowfullscreen></iframe>
-<iframe id="b" allowfullscreen></iframe>
-<script>
-async_test(t => {
-  // Request fullscreen on the body elements of both iframes, but in reverse
-  // tree order.
-  const a = document.getElementById('a');
-  const b = document.getElementById('b');
-
-  // Expect two fullscreenchange events, with document.fullscreenElement
-  // changing in the same order as the requests. (Events should also fire on the
-  // iframes' documents, but this is not covered by this test.)
-  const order = [];
-  document.onfullscreenchange = t.step_func(() => {
-    assert_in_array(document.fullscreenElement, [a, b]);
-    order.push(document.fullscreenElement.id);
-    if (order.length == 2) {
-      // When the second event arrived, the fullscreen element may still be the
-      // old one.
-      //
-      // TODO(mustaq): We need a better explanation here to cover the tree-order
-      // idea of the spec.
-      assert_true(order[0] == 'a' || order[0] == 'b', 'first id seen is a or b');
-      assert_equals(order[1], 'a', 'second id seen is a');
-      t.done();
-    }
-  });
-  document.onfullscreenerror = t.unreached_func('fullscreenerror event');
-
-  // Make a trusted click on frame 'b' to activate it.
-  trusted_click(t, () => {
-    // Now queue a trusted click on frame 'a' to make back-to-back calls.
-    setTimeout(() => {
-      trusted_click(t, () => {
-        b.contentDocument.body.requestFullscreen();
-        a.contentDocument.body.requestFullscreen();
-      }, a.contentDocument.body);
-    }, 0);
-  }, b.contentDocument.body);
-});
-</script>
diff --git a/fullscreen/api/element-request-fullscreen-two-iframes-manual.tentative.html b/fullscreen/api/element-request-fullscreen-two-iframes-manual.tentative.html
deleted file mode 100644
index 691c221904e90c..00000000000000
--- a/fullscreen/api/element-request-fullscreen-two-iframes-manual.tentative.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<!--
-   Tentative due to:
-    https://github.com/whatwg/fullscreen/issues/152
-
--->
-<title>Element#requestFullscreen() on two elements in different iframes</title>
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../trusted-click.js"></script>
-<div id="log"></div>
-<iframe id="a" allowfullscreen></iframe>
-<iframe id="b" allowfullscreen></iframe>
-<script>
-promise_test(async (test) => {
-  // Request fullscreen on the body elements of both iframes, but in reverse
-  // tree order.
-  const a = document.getElementById('a');
-  const b = document.getElementById('b');
-  var rejected = false;
-
-  // Expect two fullscreenchange events, with document.fullscreenElement
-  // changing in the same order as the requests. (Events should also fire on the
-  // iframes' documents, but this is not covered by this test.)
-  const order = [];
-  const fullscreenChangePromise = new Promise((resolve, reject) => {
-    document.onfullscreenchange = test.step_func(() => {
-      assert_in_array(document.fullscreenElement, [a, b]);
-      order.push(document.fullscreenElement.id);
-      if (order.length == 2) {
-        // When the second event arrived, the fullscreen element may still be the
-        // old one.
-        //
-        // TODO(mustaq): We need a better explanation here to cover the tree-order
-        // idea of the spec.
-        assert_true(order[0] == 'a' || order[0] == 'b', 'first id seen is a or b');
-        assert_equals(order[1], 'a', 'second id seen is a');
-      }
-      resolve();
-    });
-  });
-  const fullscreenErrorPromise = new Promise((resolve, reject) => {
-    document.onfullscreenerror = test.step_func(() => {
-      resolve();
-    });
-  });
-
-  // Make a trusted click on frame 'b' to activate it.
-  trusted_click(test, () => {
-    // Now queue a trusted click on frame 'a' to make back-to-back calls.
-    setTimeout(() => {
-      trusted_click(test, () => {
-        b.contentDocument.body.requestFullscreen();
-        a.contentDocument.body.requestFullscreen().catch(test.step_func_done());
-      }, a.contentDocument.body);
-    }, 0);
-  }, b.contentDocument.body);
-
-  await Promise.all([
-    fullscreenChangePromise,
-    fullscreenErrorPromise,
-  ]);
-});
-</script>
