From 43076fa68af1fe60f7521940a5cfe2d8fb26b277 Mon Sep 17 00:00:00 2001
From: Anne van Kesteren <annevk@annevk.nl>
Date: Thu, 2 Apr 2020 16:46:54 +0200
Subject: [PATCH] wip

---
 ...Child-script-and-iframe-from-fragment.html | 33 ++++++--------
 .../Node-appendChild-script-and-iframe.html   | 34 +++++++-------
 ...Child-script-and-source-from-fragment.html | 39 ++++++----------
 ...dChild-script-and-style-from-fragment.html | 42 +++++++-----------
 .../Node-appendChild-script-and-style.html    | 40 +++++++----------
 ...ipt-and-stylesheet-link-from-fragment.html | 37 +++++++---------
 ...ppendChild-script-and-stylesheet-link.html | 35 +++++++--------
 .../Node-appendChild-script-in-script.html    | 44 +++++++------------
 8 files changed, 122 insertions(+), 182 deletions(-)
diff --git a/dom/nodes/Node-appendChild-script-and-iframe-from-fragment.html b/dom/nodes/Node-appendChild-script-and-iframe-from-fragment.html
index 1004dbbbcb29e1..37d44756a7f435 100644
--- a/dom/nodes/Node-appendChild-script-and-iframe-from-fragment.html
+++ b/dom/nodes/Node-appendChild-script-and-iframe-from-fragment.html
@@ -1,31 +1,26 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>Node.appendChild: inserting script and iframe from a div</title>
-<link rel=help href="https://dom.spec.whatwg.org/#dom-node-appendChild">
-<link rel=help href="https://dom.spec.whatwg.org/#concept-node-insert">
-<link rel=help href="https://github.com/whatwg/dom/issues/575">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <div id="log"></div>
-</head>
-<body>
 <script>
-var iframe = document.createElement("iframe");
-iframe.src = "data:text/html,"
+let happened = [];
+const iframe = document.createElement("iframe");
+test(() => {
+  iframe.src = "data:text/html,"
 
-var script = document.createElement("script");
-var scriptRan = false;
-script.textContent = `
-    assert_not_equals(iframe.contentWindow, null, "iframe does not have a content window");
-    scriptRan = true;
+  const script = document.createElement("script");
+  script.textContent = `
+    happened.push(iframe.contentWindow === null);
 `;
 
-var df = document.createDocumentFragment();
-df.appendChild(script);
-df.appendChild(iframe);
+  const df = document.createDocumentFragment();
+  df.appendChild(script);
+  df.appendChild(iframe);
 
-assert_false(scriptRan, "script ran");
-document.body.appendChild(df);
-assert_true(scriptRan, "script has not run");
-done();
+  assert_array_equals(happened, []);
+  document.body.appendChild(df);
+  assert_array_equals(happened, [false])
+});
 </script>
diff --git a/dom/nodes/Node-appendChild-script-and-iframe.html b/dom/nodes/Node-appendChild-script-and-iframe.html
index a6f70dd8c754bd..fa4f7da4a10f85 100644
--- a/dom/nodes/Node-appendChild-script-and-iframe.html
+++ b/dom/nodes/Node-appendChild-script-and-iframe.html
@@ -1,31 +1,27 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>Node.appendChild: inserting script and iframe from a div</title>
-<link rel=help href="https://dom.spec.whatwg.org/#dom-node-appendChild">
-<link rel=help href="https://dom.spec.whatwg.org/#concept-node-insert">
-<link rel=help href="https://github.com/whatwg/dom/issues/575">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <div id="log"></div>
-</head>
-<body>
 <script>
-var iframe = document.createElement("iframe");
-iframe.src = "data:text/html,"
+const happened = [];
+const iframe = document.createElement("iframe");
 
-var script = document.createElement("script");
-var scriptRan = false;
-script.textContent = `
-    assert_not_equals(iframe.contentWindow, null, "iframe does not have a content window");
-    scriptRan = true;
+test(() => {
+  iframe.src = "data:text/html,"
+
+  const script = document.createElement("script");
+  script.textContent = `
+    happened.push(iframe.contentWindow === null);
 `;
 
-var div = document.createElement("div");
-div.appendChild(script);
-div.appendChild(iframe);
+  const div = document.createElement("div");
+  div.appendChild(script);
+  div.appendChild(iframe);
 
-assert_false(scriptRan, "script ran");
-document.body.appendChild(div);
-assert_true(scriptRan, "script has not run");
-done();
+  assert_array_equals(happened, []);
+  document.body.appendChild(div);
+  assert_array_equals(happened, [false])
+});
 </script>
diff --git a/dom/nodes/Node-appendChild-script-and-source-from-fragment.html b/dom/nodes/Node-appendChild-script-and-source-from-fragment.html
index 2aaff89387396e..1dc95f577d1408 100644
--- a/dom/nodes/Node-appendChild-script-and-source-from-fragment.html
+++ b/dom/nodes/Node-appendChild-script-and-source-from-fragment.html
@@ -1,37 +1,26 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>Node.appendChild: inserting script and source from a fragment</title>
-<link rel=help href="https://dom.spec.whatwg.org/#dom-node-appendChild">
-<link rel=help href="https://dom.spec.whatwg.org/#concept-node-insert">
-<link rel=help href="https://github.com/whatwg/dom/issues/575">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <div id="log"></div>
-</head>
-<body>
 <video id="media"></video>
 <script>
-var media = document.getElementById("media");
-
-var source = document.createElement("source");
-
-var script = document.createElement("script");
-var scriptRan = false;
-script.textContent = `
-    assert_equals(
-        media.networkState,
-        HTMLMediaElement.NETWORK_NO_SOURCE,
-        "resource selection did not start",
-    );
-    scriptRan = true;
+const happened = [];
+const media = document.getElementById("media");
+test(() => {
+  const source = document.createElement("source");
+  const script = document.createElement("script");
+  script.textContent = `
+    happened.push(media.networkState);
 `;
 
-var df = document.createDocumentFragment();
-df.appendChild(script);
-df.appendChild(source);
+  const df = document.createDocumentFragment();
+  df.appendChild(script);
+  df.appendChild(source);
 
-assert_false(scriptRan, "script ran");
-media.appendChild(df);
-assert_true(scriptRan, "script has not run");
-done();
+  assert_array_equals(happened, []);
+  media.appendChild(df);
+  assert_array_equals(happened, [HTMLMediaElement.NETWORK_NO_SOURCE]);
+});
 </script>
diff --git a/dom/nodes/Node-appendChild-script-and-style-from-fragment.html b/dom/nodes/Node-appendChild-script-and-style-from-fragment.html
index 02dd3c37d400b9..9e2c0766f858d0 100644
--- a/dom/nodes/Node-appendChild-script-and-style-from-fragment.html
+++ b/dom/nodes/Node-appendChild-script-and-style-from-fragment.html
@@ -1,38 +1,30 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>Node.appendChild: inserting a script and a style from a fragment</title>
-<link rel=help href="https://dom.spec.whatwg.org/#dom-node-appendChild">
-<link rel=help href="https://dom.spec.whatwg.org/#concept-node-insert">
-<link rel=help href="https://github.com/whatwg/dom/issues/575">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
-<body></body>
 <div id="log"></div>
 <script>
-var style = document.createElement("style");
-var styleSheet = null;
-style.appendChild(new Text("body {}"));
-
-var script = document.createElement("script");
-var scriptRan = false;
-script.textContent = `
-    assert_equals(style.sheet, null, "style sheet is created");
-
+const happened = []
+const style = document.createElement("style");
+let styleSheet = null;
+test(() => {
+  style.appendChild(new Text("body {}"));
+  const script = document.createElement("script");
+  script.textContent = `
+    happened.push(style.sheet === null);
     style.appendChild(new Text("body {}"));
-    assert_not_equals(style.sheet, null, "style sheet is not created");
-    assert_equals(style.sheet.cssRules.length, 2, "style sheet does not have two rules");
+    happened.push(style.sheet.cssRules.length);
     styleSheet = style.sheet;
-
-    scriptRan = true;
 `;
 
-var df = document.createDocumentFragment();
-df.appendChild(script);
-df.appendChild(style);
+  const df = document.createDocumentFragment();
+  df.appendChild(script);
+  df.appendChild(style);
 
-assert_false(scriptRan, "script ran");
-document.body.appendChild(df);
-assert_true(scriptRan, "script did not run");
-assert_not_equals(style.sheet, styleSheet, "style sheet was created only once");
-done();
+  assert_array_equals(happened, []);
+  document.body.appendChild(df);
+  assert_array_equals(happened, [true, 2]);
+  assert_not_equals(style.sheet, styleSheet, "style sheet was created only once");
+});
 </script>
diff --git a/dom/nodes/Node-appendChild-script-and-style.html b/dom/nodes/Node-appendChild-script-and-style.html
index 27826709882870..9b75159f473e20 100644
--- a/dom/nodes/Node-appendChild-script-and-style.html
+++ b/dom/nodes/Node-appendChild-script-and-style.html
@@ -1,38 +1,30 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>Node.appendChild: inserting a script and a style where the script modifies the style</title>
-<link rel=help href="https://dom.spec.whatwg.org/#dom-node-appendChild">
-<link rel=help href="https://dom.spec.whatwg.org/#concept-node-insert">
-<link rel=help href="https://github.com/whatwg/dom/issues/575">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
-<body></body>
 <div id="log"></div>
 <script>
-var style = document.createElement("style");
-var styleSheet = null;
+const happened = [];
+const style = document.createElement("style");
+let styleSheet = null;
+test(() => {
 style.appendChild(new Text("body {}"));
-
-var script = document.createElement("script");
-var scriptRan = false;
-script.textContent = `
-    assert_equals(style.sheet, null, "style sheet is created");
-
+  const script = document.createElement("script");
+  script.textContent = `
+    happened.push(style.sheet === null);
     style.appendChild(new Text("body {}"));
-    assert_not_equals(style.sheet, null, "style sheet is not created");
-    assert_equals(style.sheet.cssRules.length, 2, "style sheet does not have two rules");
+    happened.push(style.sheet.cssRules.length);
     styleSheet = style.sheet;
-
-    scriptRan = true;
 `;
 
-var div = document.createElement("div");
-div.appendChild(script);
-div.appendChild(style);
+  const div = document.createElement("div");
+  div.appendChild(script);
+  div.appendChild(style);
 
-assert_false(scriptRan, "script ran");
-document.body.appendChild(div);
-assert_true(scriptRan, "script did not run");
-assert_not_equals(style.sheet, styleSheet, "style sheet was created only once");
-done();
+  assert_array_equals(happened, []);
+  document.body.appendChild(div);
+  assert_array_equals(happened, [true, 2]);
+  assert_not_equals(style.sheet, styleSheet, "style sheet was created only once");
+});
 </script>
diff --git a/dom/nodes/Node-appendChild-script-and-stylesheet-link-from-fragment.html b/dom/nodes/Node-appendChild-script-and-stylesheet-link-from-fragment.html
index 8b253df27e14b8..c8f18dbb7fc621 100644
--- a/dom/nodes/Node-appendChild-script-and-stylesheet-link-from-fragment.html
+++ b/dom/nodes/Node-appendChild-script-and-stylesheet-link-from-fragment.html
@@ -1,32 +1,27 @@
 <!doctype html>
 <meta charset=utf-8>
-<title>Node.appendChild: inserting script and stylesheet link from a div</title>
-<link rel=help href="https://dom.spec.whatwg.org/#dom-node-appendChild">
-<link rel=help href="https://dom.spec.whatwg.org/#concept-node-insert">
-<link rel=help href="https://github.com/whatwg/dom/issues/575">
+<title>Node.appendChild: inserting script and stylesheet link from a fragment</title>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <div id="log"></div>
-</head>
-<body>
 <script>
-var link = document.createElement("link");
-link.rel = "stylesheet";
-link.href = "data:text/css,"
+const happened = [];
+const link = document.createElement("link");
+test(() => {
+  link.rel = "stylesheet";
+  link.href = "data:text/css,"
 
-var script = document.createElement("script");
-var scriptRan = false;
-script.textContent = `
-    assert_not_equals(link.sheet, null, "link does not have a stylesheet");
-    scriptRan = true;
+  const script = document.createElement("script");
+  script.textContent = `
+    happened.push(link.sheet === null);
 `;
 
-var df = document.createDocumentFragment();
-df.appendChild(script);
-df.appendChild(link);
+  const df = document.createDocumentFragment();
+  df.appendChild(script);
+  df.appendChild(link);
 
-assert_false(scriptRan, "script ran");
-document.body.appendChild(df);
-assert_true(scriptRan, "script has not run");
-done();
+  assert_array_equals(happened, []);
+  document.body.appendChild(df);
+  assert_array_equals(happened, [true]);
+});
 </script>
diff --git a/dom/nodes/Node-appendChild-script-and-stylesheet-link.html b/dom/nodes/Node-appendChild-script-and-stylesheet-link.html
index afc9adb092bd28..f803f955484bf7 100644
--- a/dom/nodes/Node-appendChild-script-and-stylesheet-link.html
+++ b/dom/nodes/Node-appendChild-script-and-stylesheet-link.html
@@ -1,32 +1,27 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>Node.appendChild: inserting script and stylesheet link from a div</title>
-<link rel=help href="https://dom.spec.whatwg.org/#dom-node-appendChild">
-<link rel=help href="https://dom.spec.whatwg.org/#concept-node-insert">
-<link rel=help href="https://github.com/whatwg/dom/issues/575">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <div id="log"></div>
-</head>
-<body>
 <script>
-var link = document.createElement("link");
-link.rel = "stylesheet";
-link.href = "data:text/css,"
+const happened = [];
+const link = document.createElement("link");
+test(() => {
+  link.rel = "stylesheet";
+  link.href = "data:text/css,"
 
-var script = document.createElement("script");
-var scriptRan = false;
-script.textContent = `
-    assert_not_equals(link.sheet, null, "link does not have a stylesheet");
-    scriptRan = true;
+  const script = document.createElement("script");
+  script.textContent = `
+    happened.push(link.sheet === null);
 `;
 
-var div = document.createElement("div");
-div.appendChild(script);
-div.appendChild(link);
+  const div = document.createElement("div");
+  div.appendChild(script);
+  div.appendChild(link);
 
-assert_false(scriptRan, "script ran");
-document.body.appendChild(div);
-assert_true(scriptRan, "script has not run");
-done();
+  assert_array_equals(happened, []);
+  document.body.appendChild(div);
+  assert_array_equals(happened, [true]);
+});
 </script>
diff --git a/dom/nodes/Node-appendChild-script-in-script.html b/dom/nodes/Node-appendChild-script-in-script.html
index 3a71dc87da5a5c..b8cd5bc2cac805 100644
--- a/dom/nodes/Node-appendChild-script-in-script.html
+++ b/dom/nodes/Node-appendChild-script-in-script.html
@@ -1,41 +1,27 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>Node.appendChild: inserting a script and some code in an empty script</title>
-<link rel=help href="https://dom.spec.whatwg.org/#dom-node-appendChild">
-<link rel=help href="https://dom.spec.whatwg.org/#concept-node-insert">
-<link rel=help href="https://github.com/whatwg/dom/issues/575">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
-<body></body>
 <div id="log"></div>
 <script id="s1"></script>
 <script>
-var s1 = document.getElementById("s1");
-var s1Started = false;
-var s1Ran = false;
-
-var s2 = document.createElement("script");
-var s2Started = false;
-var s2Ran = false;
-s2.textContent = `
-    s2Started = true;
-    assert_false(s1Started, "s1 already started");
-    s1.appendChild(new Text("s1Ran = true;"));
-    assert_true(s1Started, "s1 did not start");
-    assert_true(s1Ran, "s1 did not run completely");
-    s2Ran = true;
+const happened = [];
+test(() => {
+  const s1 = document.getElementById("s1");
+  const s2 = document.createElement("script");
+  s2.textContent = `
+    happened.push("s2");
+    s1.appendChild(new Text("happened.push('s1ran');"));
+    happened.push("s2ran");
 `;
 
-var df = document.createDocumentFragment();
-df.appendChild(new Text(`
-    s1Started = true;
-    assert_true(s2Started, "s2 did not start");
-    assert_false(s2Ran, "s2 already ran completely");
-`));
-df.appendChild(s2);
+  const df = document.createDocumentFragment();
+  df.appendChild(new Text(`happened.push("s1");`));
+  df.appendChild(s2);
 
-assert_false(s1Ran, "s1 ran");
-s1.appendChild(df);
-assert_true(s2Ran, "s2 did not run");
-done();
+  assert_array_equals(happened, []);
+  s1.appendChild(df);
+  assert_array_equals(happened, ["s1", "s1ran", "s2", "s2ran"]);
+});
 </script>
