Squashed commit of the following:

commit 0032bc0 Author: Simon Pieters <[email protected]> Date: Sun Jun 10 12:28:37 2018 +0200 Add functional selftests, set status to ERROR when mixing single_test and test commit c3c3625 Author: Simon Pieters <[email protected]> Date: Sun Jun 10 09:56:40 2018 +0200 Docs commit bff2d71 Author: Simon Pieters <[email protected]> Date: Sun Jun 10 09:44:46 2018 +0200 Rename single() to single_test() and allow passing test name commit 0bc6450 Author: Simon Pieters <[email protected]> Date: Tue Jun 5 16:59:23 2018 +0200 [testharness.js] Implement `single()` opt-in to single page test Fixes #10853. Closes #11024.
web-platform-tests · Sep 22, 2019 · c01e1b7 · c01e1b7
1 parent d89d13d
commit c01e1b7
Show file tree

Hide file tree

Showing 68 changed files with 190 additions and 25 deletions.
diff --git a/FileAPI/url/multi-global-origin-serialization.sub.html b/FileAPI/url/multi-global-origin-serialization.sub.html
@@ -13,6 +13,7 @@
 
 <script>
 "use strict";
+single_test();
 document.domain = "{{host}}";
 
 window.onload = () => {

diff --git a/docs/writing-tests/testharness-api.md b/docs/writing-tests/testharness-api.md
@@ -261,11 +261,9 @@ wrapping everything in functions for isolation becomes
 burdensome. For these cases `testharness.js` support "single page
 tests".
 
-In order for a test to be interpreted as a single page test, then
-it must simply not call `test()` or `async_test()` anywhere on the page, and
-must call the `done()` function to indicate that the test is complete. All
-the `assert_*` functions are available as normal, but are called without
-the normal step function wrapper. For example:
+To write a single page test, call `single_test()`. Call the `done()` function to
+indicate that the test is complete. All the `assert_*` functions are available
+as normal, but are called without the normal step function wrapper. For example:
 
 ```html
 <!doctype html>
@@ -274,12 +272,14 @@ the normal step function wrapper. For example:
 <script src="/resources/testharnessreport.js"></script>
 <body>
   <script>
+    single_test();
     assert_equals(document.body, document.getElementsByTagName("body")[0])
     done()
- </script>
+  </script>
 ```
 
-The test title for single page tests is always taken from `document.title`.
+The test title for single page tests is taken from `document.title` or from the
+argument to `single_test()`.
 
 ## Making assertions ##
 

diff --git a/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html b/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html
@@ -5,6 +5,7 @@
 <script src=/resources/testharnessreport.js></script>
 <iframe src="Element-getElementsByTagName-change-document-HTMLNess-iframe.xml"></iframe>
 <script>
+  single_test();
   onload = function() {
     var parent = document.createElement("div");
     var child1 = document.createElementNS("http://www.w3.org/1999/xhtml", "a");

diff --git a/fetch/content-length/content-length.html b/fetch/content-length/content-length.html
@@ -4,6 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
+single_test();
 onload = function() {
   assert_equals(document.body.textContent, "PASS");
   done();

diff --git a/fetch/content-length/content-length.html.headers b/fetch/content-length/content-length.html.headers
@@ -1 +1 @@
-Content-Length: 373
+Content-Length: 383
diff --git a/fetch/corb/script-js-mislabeled-as-html-nosniff.sub.html b/fetch/corb/script-js-mislabeled-as-html-nosniff.sub.html
@@ -16,6 +16,7 @@
 <div id=log></div>
 
 <script>
+single_test();
 window.has_executed_script = false;
 </script>
 

diff --git a/fetch/corb/script-js-mislabeled-as-html.sub.html b/fetch/corb/script-js-mislabeled-as-html.sub.html
@@ -8,6 +8,7 @@
 <div id=log></div>
 
 <script>
+single_test();
 window.has_executed_script = false;
 </script>
 

diff --git a/fetch/corb/style-css-mislabeled-as-html-nosniff.sub.html b/fetch/corb/style-css-mislabeled-as-html-nosniff.sub.html
@@ -31,6 +31,7 @@ <h1 id="header">Header example</h1>
 </body>
 
 <script>
+single_test();
 // Verify that CSS is not applied (because of nosniff + non-text/css headers).
 let style = getComputedStyle(document.getElementById('header'));
 const external_color = 'rgb(255, 0, 0)';  // red

diff --git a/fetch/corb/style-css-mislabeled-as-html.sub.html b/fetch/corb/style-css-mislabeled-as-html.sub.html
@@ -25,6 +25,7 @@ <h1 id="header">Header example</h1>
 </body>
 
 <script>
+single_test();
 // Verify that CSS is not applied (because of strict content-type enforcement
 // for cross-origin stylesheets).
 let style = getComputedStyle(document.getElementById('header'));

diff --git a/fetch/corb/style-css-with-json-parser-breaker.sub.html b/fetch/corb/style-css-with-json-parser-breaker.sub.html
@@ -26,6 +26,7 @@ <h1 id="header">Header example</h1>
 </body>
 
 <script>
+single_test();
 // Verify that CSS got applied / did not get blocked by CORB.
 let style = getComputedStyle(document.getElementById('header'));
 const external_color = 'rgb(255, 0, 0)';  // red

diff --git a/fetch/corb/style-html-correctly-labeled.sub.html b/fetch/corb/style-html-correctly-labeled.sub.html
@@ -32,6 +32,7 @@ <h1 id="header">Header example</h1>
 </body>
 
 <script>
+single_test();
 // Verify that CSS is not applied (because of mismatched Content-Type header).
 var style = getComputedStyle(document.getElementById('header'));
 const default_color = 'rgb(0, 128, 0)';  // green

diff --git a/gamepad/events-manual.html b/gamepad/events-manual.html
@@ -8,6 +8,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 setup({explicit_timeout: true});
+single_test();
 
 function set_instructions(text) {
   document.getElementById("instructions").textContent = text;

diff --git a/gamepad/timestamp-manual.html b/gamepad/timestamp-manual.html
@@ -7,6 +7,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 setup({explicit_timeout: true});
+single_test();
 
 function set_instructions(text) {
   document.getElementById("instructions").textContent = text;

diff --git a/...s/browsing-the-web/navigating-across-documents/source/navigate-child-function-parent.html b/...s/browsing-the-web/navigating-across-documents/source/navigate-child-function-parent.html
@@ -6,6 +6,7 @@
 <div id=log></div>
 <iframe></iframe>
 <script>
+  single_test();
   onload = function() {
     var fr = document.querySelector("iframe")
     fr.contentWindow.location = "support/dummy.html"

diff --git a/...s/browsing-the-web/navigating-across-documents/source/navigate-child-src-about-blank.html b/...s/browsing-the-web/navigating-across-documents/source/navigate-child-src-about-blank.html
@@ -6,6 +6,7 @@
 <div id=log></div>
 <iframe></iframe>
 <script>
+  single_test();
   onload = function() {
     var fr = document.querySelector("iframe")
     fr.src = "about:blank"

diff --git a/html/rendering/non-replaced-elements/flow-content-0/dialog-display.html b/html/rendering/non-replaced-elements/flow-content-0/dialog-display.html
@@ -7,6 +7,7 @@
 </style>
 <dialog open id=dialog></dialog>
 <script>
+single_test();
 assert_equals(getComputedStyle(document.getElementById('dialog')).display, 'block');
 done();
 </script>
diff --git a/html/rendering/non-replaced-elements/tables/table-vspace-hspace-s.html b/html/rendering/non-replaced-elements/tables/table-vspace-hspace-s.html
@@ -7,6 +7,7 @@
 <table vspace=25 hspace=25><tr><td>x</table>
 <div>x</div>
 <script>
+single_test();
 var style = getComputedStyle(document.querySelector('table'));
 ['marginTop', 'marginRight', 'marginBottom', 'marginLeft'].forEach(function(m) {
   assert_equals(style[m], '0px', m);

diff --git a/html/rendering/non-replaced-elements/tables/table-vspace-hspace.html b/html/rendering/non-replaced-elements/tables/table-vspace-hspace.html
@@ -7,6 +7,7 @@
 <table vspace=25 hspace=25><tr><td>x</table>
 <div>x</div> <!-- prevent margin collapsing quirks -->
 <script>
+single_test();
 var style = getComputedStyle(document.querySelector('table'));
 ['marginTop', 'marginRight', 'marginBottom', 'marginLeft'].forEach(function(m) {
   assert_equals(style[m], '0px', m);

diff --git a/html/rendering/non-replaced-elements/the-page/iframe-marginwidth-marginheight.html b/html/rendering/non-replaced-elements/the-page/iframe-marginwidth-marginheight.html
@@ -4,6 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <iframe src="/common/blank.html" marginwidth=0 marginheight=0></iframe>
 <script>
+single_test();
 onload = () => {
   assert_equals(window[0].document.body.attributes.length, 0, "Number of attributes on the child document's body");
   done();

diff --git a/...element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-1.html b/...element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-1.html
@@ -9,6 +9,7 @@
 
 <script>
 "use strict";
+single_test();
 
 const sourceIFrame = document.createElement("iframe");
 sourceIFrame.setAttribute("sandbox", "allow-same-origin");

diff --git a/...element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-2.html b/...element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-2.html
@@ -9,6 +9,7 @@
 
 <script>
 "use strict";
+single_test();
 
 const sourceIFrame = document.createElement("iframe");
 

diff --git a/...adata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/dynamic-append.html b/...adata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/dynamic-append.html
@@ -9,6 +9,7 @@
 
 <script>
 "use strict";
+single_test();
 
 const iframe = document.createElement("iframe");
 let loadCount = 0;

diff --git a/...a/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/not-in-shadow-tree.html b/...a/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/not-in-shadow-tree.html
@@ -9,6 +9,7 @@
 <div id="log"></div>
 <script>
 "use strict";
+single_test();
 
 const iframe = document.createElement("iframe");
 iframe.src = "support/ufoo";

diff --git a/...the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/remove-from-document.html b/...the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/remove-from-document.html
@@ -9,6 +9,7 @@
 
 <script>
 "use strict";
+single_test();
 
 const sourceIFrame = document.createElement("iframe");
 let sourceLoadCount = 0;

diff --git a/...emantics/embedded-content/media-elements/ready-states/autoplay-with-slow-text-tracks.html b/...emantics/embedded-content/media-elements/ready-states/autoplay-with-slow-text-tracks.html
@@ -17,6 +17,7 @@
 //
 // So if the text tracks are not yet ready, we can't autoplay.
 
+single_test();
 var started = 0;
 var numOfTests = 5;
 

diff --git a/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html b/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html
@@ -6,6 +6,7 @@
 <iframe src="about:blank"></iframe>
 <div id="target"></div>
 <script>
+single_test();
 onload = function() {
   var ifr = document.getElementsByTagName('iframe')[0];
   ifr.contentDocument.body.appendChild(ifr.contentDocument.createElement('p')).textContent = 'Modified document';

diff --git a/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html b/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html
@@ -6,6 +6,7 @@
 <iframe src="about:blank"></iframe>
 <div id="target"></div>
 <script>
+single_test();
 onload = function() {
   var ifr = document.getElementsByTagName('iframe')[0];
   ifr.contentDocument.open();

diff --git a/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_03.html b/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_03.html
@@ -6,6 +6,7 @@
 <iframe src="support/blank.htm"></iframe>
 <div id="target"></div>
 <script>
+single_test();
 onload = function() {
   var ifr = document.getElementsByTagName('iframe')[0];
   ifr.contentDocument.body.appendChild(ifr.contentDocument.createElement('p')).textContent = 'Modified document';
@@ -17,4 +18,4 @@
     document.getElementById('target').appendChild(ifr);
   }, 100);
 }
-</script>
+</script>
diff --git a/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html b/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html
@@ -6,6 +6,7 @@
 <iframe src="support/blank.htm"></iframe>
 <div id="target"></div>
 <script>
+single_test();
 onload = function(){
   var ifr = document.getElementsByTagName('iframe')[0];
   ifr.contentDocument.open();
@@ -19,4 +20,4 @@
     document.getElementById('target').appendChild(ifr);
   }, 100);
 }
-</script>
+</script>
diff --git a/html/semantics/embedded-content/the-img-element/data-url.html b/html/semantics/embedded-content/the-img-element/data-url.html
@@ -5,6 +5,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
 <script>
+single_test();
 var c = document.createElement("canvas"),
     con = c.getContext("2d"),
     img = document.createElement("img")

diff --git a/html/semantics/embedded-content/the-img-element/update-src-complete.html b/html/semantics/embedded-content/the-img-element/update-src-complete.html
@@ -5,6 +5,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <p id="display"><img src="image.png"></p>
 <script>
+    single_test();
     function check() {
         var img = document.querySelector("img");
         assert_true(img.complete, "By onload, image should have loaded");

diff --git a/html/semantics/forms/autofocus/first-when-later-but-before.html b/html/semantics/forms/autofocus/first-when-later-but-before.html
@@ -12,6 +12,7 @@
 
 <script>
 "use strict";
+single_test();
 
 promise_test(async () => {
   const input1 = document.querySelector("input");

diff --git a/html/semantics/forms/autofocus/first-when-later.html b/html/semantics/forms/autofocus/first-when-later.html
@@ -12,6 +12,7 @@
 
 <script>
 "use strict";
+single_test();
 
 promise_test(async () => {
   const input1 = document.querySelector("input");

diff --git a/html/semantics/forms/autofocus/first.html b/html/semantics/forms/autofocus/first.html
@@ -13,6 +13,7 @@
 
 <script>
 "use strict";
+single_test();
 
 promise_test(async () => {
   const [input1, input2] = document.querySelectorAll("input");

diff --git a/html/semantics/forms/autofocus/not-on-first-task.html b/html/semantics/forms/autofocus/not-on-first-task.html
@@ -12,6 +12,7 @@
 
 <script>
 "use strict";
+single_test();
 
 const input = document.querySelector("input");
 

diff --git a/html/webappapis/timers/negative-setinterval.html b/html/webappapis/timers/negative-setinterval.html
@@ -3,6 +3,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
+single_test();
 var i = 0;
 var interval;
 function next() {

diff --git a/html/webappapis/timers/negative-settimeout.html b/html/webappapis/timers/negative-settimeout.html
@@ -3,6 +3,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
+ single_test();
  setTimeout(done, -100);
  setTimeout(assert_unreached, 10);
 </script>
diff --git a/html/webappapis/timers/type-long-setinterval.html b/html/webappapis/timers/type-long-setinterval.html
@@ -3,6 +3,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
+single_test();
 var interval;
 function next() {
   clearInterval(interval);

diff --git a/html/webappapis/timers/type-long-settimeout.html b/html/webappapis/timers/type-long-settimeout.html
@@ -3,6 +3,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
+single_test();
 setTimeout(done, Math.pow(2, 32));
 setTimeout(assert_unreached, 100);
 </script>
diff --git a/infrastructure/browsers/firefox/prefs.html b/infrastructure/browsers/firefox/prefs.html
@@ -2,6 +2,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
+single_test();
 assert_equals(getComputedStyle(document.documentElement).color, "rgb(0, 255, 0)")
 done();
 </script>

diff --git a/navigation-timing/nav2_test_navigate_within_document.html b/navigation-timing/nav2_test_navigate_within_document.html
@@ -13,6 +13,7 @@ <h1>Description</h1>
         <p>This test validates that all of the window.performance.getEntriesByType("navigation") attributes remain unchanged after an in document navigation (URL fragment change).</p>
 
         <script>
+            single_test();
             var navTiming2Attributes = [
                 'connectEnd',
                 'connectStart',

diff --git a/preload/single-download-late-used-preload.html b/preload/single-download-late-used-preload.html
@@ -5,6 +5,7 @@
 <script src="/preload/resources/preload_helper.js"></script>
 <link rel=preload href="resources/square.png?pipe=trickle(d1)" as=image>
 <script>
+    single_test();
     var link = document.getElementsByTagName("link")[0]
     assert_equals(link.as, "image");
     link.addEventListener("load", () => {

diff --git a/resources/test/tests/functional/single-page-test-and-test.html b/resources/test/tests/functional/single-page-test-and-test.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML>
+<title>Example with single_test() and test()</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  single_test();
+  test();
+  done();
+</script>
+<script type="text/json" id="expected">
+{
+  "summarized_status": {
+    "status_string": "ERROR",
+    "message": "Tried to create a test after calling single_test()"
+  },
+  "summarized_tests": [
+    {
+      "status_string": "FAIL",
+      "name": "Example with single_test() and test()",
+      "properties": {},
+      "message": "Tried to create a test after calling single_test()"
+    }
+  ],
+  "type": "complete"
+}
+</script>