Don't duplicate this function

web-platform-tests · Oct 17, 2022 · 3c2f2da · 3c2f2da
1 parent 178d7c5
commit 3c2f2da
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 20 deletions.
diff --git a/...rs/browsing-the-web/navigating-across-documents/about-srcdoc-navigation-blocked.window.js b/...rs/browsing-the-web/navigating-across-documents/about-srcdoc-navigation-blocked.window.js
@@ -2,7 +2,7 @@
 // META: script=../resources/helpers.js
 
 promise_test(async t => {
-  const iframe = await setupAndWaitForSrcdocIframe();
+  const iframe = await addSrcdocIframe();
 
   iframe.contentWindow.location = "/common/blank.html";
   await waitForIframeLoad(iframe);
@@ -22,7 +22,7 @@ promise_test(async t => {
 }, "Navigations to about:srcdoc via window.location must be blocked");
 
 promise_test(async t => {
-  const iframe = await setupAndWaitForSrcdocIframe();
+  const iframe = await addSrcdocIframe();
   iframe.contentWindow.name = "test_frame";
 
   iframe.contentWindow.location = "/common/blank.html";

diff --git a/...browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js b/...browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js
@@ -2,7 +2,7 @@
 // META: script=../resources/helpers.js
 
 promise_test(async () => {
-  const iframe = await setupAndWaitForIframe();
+  const iframe = await addIframe();
 
   iframe.contentWindow.addEventListener("unload", () => {
     iframe.contentWindow.location.href = "//{{hosts[][www]}}/common/blank.html?fail";

diff --git a/...rowsers/browsing-the-web/navigating-across-documents/navigation-unload-data-url.window.js b/...rowsers/browsing-the-web/navigating-across-documents/navigation-unload-data-url.window.js
@@ -2,7 +2,7 @@
 // META: script=../resources/helpers.js
 
 promise_test(async () => {
-  const iframe = await setupAndWaitForIframe();
+  const iframe = await addIframe();
 
   iframe.contentWindow.addEventListener("unload", () => {
     iframe.contentWindow.location.href =

diff --git a/...sers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js b/...sers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js
@@ -2,7 +2,7 @@
 // META: script=../resources/helpers.js
 
 promise_test(async () => {
-  const iframe = await setupAndWaitForIframe();
+  const iframe = await addIframe();
 
   iframe.contentWindow.addEventListener("unload", () => {
     iframe.contentWindow.location.href = "/common/blank.html?fail";

diff --git a/html/browsers/browsing-the-web/resources/helpers.js b/html/browsers/browsing-the-web/resources/helpers.js
@@ -26,21 +26,7 @@ window.addIframe = (url = "/common/blank.html", doc = document) => {
   });
 };
 
-window.waitToAvoidReplace = t => {
-  return new Promise(resolve => t.step_timeout(resolve, 0));
-};
-
-window.setupAndWaitForIframe = async (url = "/common/blank.html") => {
-  const iframe = document.createElement("iframe");
-  iframe.src = url;
-  document.body.append(iframe);
-
-  await waitForIframeLoad(iframe);
-
-  return iframe;
-};
-
-window.setupAndWaitForSrcdocIframe = async () => {
+window.addSrcdocIframe = async () => {
   const iframe = document.createElement("iframe");
   iframe.srcdoc = `<script>window.parent.postMessage("srcdoc ready", "*")</scr` + `ipt>`;
   document.body.append(iframe);
@@ -50,6 +36,10 @@ window.setupAndWaitForSrcdocIframe = async () => {
   return iframe;
 };
 
+window.waitToAvoidReplace = t => {
+  return new Promise(resolve => t.step_timeout(resolve, 0));
+};
+
 window.waitForIframeLoad = iframe => {
   return new Promise(resolve => {
     iframe.addEventListener("load", () => resolve(), { once: true });