Reland "Adjusted references in tests to match new helper.sub.js file"
This is a reland of ac436aaa9d361c99dcf4df11bd11ad201a2bccd8
Original change's description:
> Adjusted references in tests to match new helper.sub.js file
>
> helper.js changed to helper.sub.js.
> URLS.safe modified to work with wpt.
>
> Bug: 739170
> Change-Id: I89e0efdb07c94e78be826c8807d0577ede8a97ec
> Reviewed-on: https://chromium-review.googlesource.com/1141725
> Reviewed-by: Mike West <mkwst@chromium.org>
> Commit-Queue: Maja Kabus <kabusm@google.com>
> Cr-Commit-Position: refs/heads/master@{#576037}
Bug: 739170
Tbr: alexmos@chromium.org
Change-Id: Idc1e5d5cc4b1dbbc4de4145af38b894c5f4a65b5
Reviewed-on: https://chromium-review.googlesource.com/1142169
Commit-Queue: Ian Clelland <iclelland@chromium.org>
Reviewed-by: Ian Clelland <iclelland@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576229}
diff --git a/trusted-types/DOMParser-requiresTrustedTypes.tentative.html b/trusted-types/DOMParser-requiresTrustedTypes.tentative.html
index 2541c49..7e21fea 100644
--- a/trusted-types/DOMParser-requiresTrustedTypes.tentative.html
+++ b/trusted-types/DOMParser-requiresTrustedTypes.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types">
<body>
diff --git a/trusted-types/DOMParser.tentative.html b/trusted-types/DOMParser.tentative.html
index 9541ba6..53d2b44 100644
--- a/trusted-types/DOMParser.tentative.html
+++ b/trusted-types/DOMParser.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<body>
<script>
test(t => {
diff --git a/trusted-types/HTMLBaseElement-href.tentative.html b/trusted-types/HTMLBaseElement-href.tentative.html
index 322d740..80bed80 100644
--- a/trusted-types/HTMLBaseElement-href.tentative.html
+++ b/trusted-types/HTMLBaseElement-href.tentative.html
@@ -3,7 +3,7 @@
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
- <script src="support/helper.js"></script>
+ <script src="support/helper.sub.js"></script>
<script>
//helper function for the tests
diff --git a/trusted-types/HTMLImageElement-src.tentative.html b/trusted-types/HTMLImageElement-src.tentative.html
index e4c0a3e..5797aa5 100644
--- a/trusted-types/HTMLImageElement-src.tentative.html
+++ b/trusted-types/HTMLImageElement-src.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="./support/helper.sub.js"></script>
<body>
<script>
diff --git a/trusted-types/HTMLMediaElement-src.tentative.html b/trusted-types/HTMLMediaElement-src.tentative.html
index ece95ea..c54dfdd 100644
--- a/trusted-types/HTMLMediaElement-src.tentative.html
+++ b/trusted-types/HTMLMediaElement-src.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="./support/helper.sub.js"></script>
<body>
<script>
diff --git a/trusted-types/HTMLSourceElement-src.tentative.html b/trusted-types/HTMLSourceElement-src.tentative.html
index e32a1fc..6791a0f 100644
--- a/trusted-types/HTMLSourceElement-src.tentative.html
+++ b/trusted-types/HTMLSourceElement-src.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="./support/helper.sub.js"></script>
<body>
<script>
test(t => {
diff --git a/trusted-types/TrustedHTML.tentative.html b/trusted-types/TrustedHTML.tentative.html
index 2a28f1b..a8d4e78 100644
--- a/trusted-types/TrustedHTML.tentative.html
+++ b/trusted-types/TrustedHTML.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<script>
test(t => {
var html = TrustedHTML.escape(STRINGS.unescapedHTML);
diff --git a/trusted-types/TrustedScriptURL.tentative.html b/trusted-types/TrustedScriptURL.tentative.html
index 39a920a..92bc87f 100644
--- a/trusted-types/TrustedScriptURL.tentative.html
+++ b/trusted-types/TrustedScriptURL.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<script>
test(t => {
var url = TrustedScriptURL.unsafelyCreate(URLS.safe);
diff --git a/trusted-types/TrustedURL.tentative.html b/trusted-types/TrustedURL.tentative.html
index 599a0c6..5048326 100644
--- a/trusted-types/TrustedURL.tentative.html
+++ b/trusted-types/TrustedURL.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<script>
test(t => {
var url = TrustedURL.create(URLS.safe);
diff --git a/trusted-types/block-string-assignment-to-HTMLBaseElement-href.tentative.html b/trusted-types/block-string-assignment-to-HTMLBaseElement-href.tentative.html
index 88aeb5b..a973e29 100644
--- a/trusted-types/block-string-assignment-to-HTMLBaseElement-href.tentative.html
+++ b/trusted-types/block-string-assignment-to-HTMLBaseElement-href.tentative.html
@@ -3,7 +3,7 @@
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
- <script src="support/helper.js"></script>
+ <script src="support/helper.sub.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types">
diff --git a/trusted-types/block-string-assignment-to-HTMLImageElement-src.tentative.html b/trusted-types/block-string-assignment-to-HTMLImageElement-src.tentative.html
index e2c7dcb..4446106 100644
--- a/trusted-types/block-string-assignment-to-HTMLImageElement-src.tentative.html
+++ b/trusted-types/block-string-assignment-to-HTMLImageElement-src.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="./support/helper.sub.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types">
<body>
diff --git a/trusted-types/block-string-assignment-to-HTMLMediaElement-src.tentative.html b/trusted-types/block-string-assignment-to-HTMLMediaElement-src.tentative.html
index 8e4b039..38ac53f 100644
--- a/trusted-types/block-string-assignment-to-HTMLMediaElement-src.tentative.html
+++ b/trusted-types/block-string-assignment-to-HTMLMediaElement-src.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="./support/helper.sub.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types">
<body>
diff --git a/trusted-types/block-string-assignment-to-HTMLSourceElement-src.tentative.html b/trusted-types/block-string-assignment-to-HTMLSourceElement-src.tentative.html
index 06262ff..37ab90c 100644
--- a/trusted-types/block-string-assignment-to-HTMLSourceElement-src.tentative.html
+++ b/trusted-types/block-string-assignment-to-HTMLSourceElement-src.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="./support/helper.sub.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types">
<body>
diff --git a/trusted-types/block-string-assignment-to-createContextualFragment.tentative.html b/trusted-types/block-string-assignment-to-createContextualFragment.tentative.html
index 0840623..1d67a51 100644
--- a/trusted-types/block-string-assignment-to-createContextualFragment.tentative.html
+++ b/trusted-types/block-string-assignment-to-createContextualFragment.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types">
<body>
diff --git a/trusted-types/block-string-assignment-to-embed-src.tentative.html b/trusted-types/block-string-assignment-to-embed-src.tentative.html
index 51d553f..005dfe2 100644
--- a/trusted-types/block-string-assignment-to-embed-src.tentative.html
+++ b/trusted-types/block-string-assignment-to-embed-src.tentative.html
@@ -3,7 +3,7 @@
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
- <script src="./support/helper.js"></script>
+ <script src="./support/helper.sub.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types">
</head>
diff --git a/trusted-types/block-string-assignment-to-innerHTML.tentative.html b/trusted-types/block-string-assignment-to-innerHTML.tentative.html
index 698bf9d..67faf6e 100644
--- a/trusted-types/block-string-assignment-to-innerHTML.tentative.html
+++ b/trusted-types/block-string-assignment-to-innerHTML.tentative.html
@@ -3,7 +3,7 @@
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
- <script src="./support/helper.js"></script>
+ <script src="support/helper.sub.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types">
</head>
diff --git a/trusted-types/block-string-assignment-to-insertAdjacentHTML.tentative.html b/trusted-types/block-string-assignment-to-insertAdjacentHTML.tentative.html
index 5b3bea8..70bb803 100644
--- a/trusted-types/block-string-assignment-to-insertAdjacentHTML.tentative.html
+++ b/trusted-types/block-string-assignment-to-insertAdjacentHTML.tentative.html
@@ -3,7 +3,7 @@
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
- <script src="./support/helper.js"></script>
+ <script src="support/helper.sub.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types">
</head>
diff --git a/trusted-types/block-string-assignment-to-location-assign.tentative.html b/trusted-types/block-string-assignment-to-location-assign.tentative.html
index 63fa9b4..76725da 100644
--- a/trusted-types/block-string-assignment-to-location-assign.tentative.html
+++ b/trusted-types/block-string-assignment-to-location-assign.tentative.html
@@ -3,7 +3,7 @@
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
- <script src="./support/helper.js"></script>
+ <script src="support/helper.sub.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types">
</head>
diff --git a/trusted-types/block-string-assignment-to-location-href.tentative.html b/trusted-types/block-string-assignment-to-location-href.tentative.html
index 6581ac2..07cc4d5 100644
--- a/trusted-types/block-string-assignment-to-location-href.tentative.html
+++ b/trusted-types/block-string-assignment-to-location-href.tentative.html
@@ -3,7 +3,7 @@
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
- <script src="./support/helper.js"></script>
+ <script src="support/helper.sub.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types">
</head>
diff --git a/trusted-types/block-string-assignment-to-location-replace.tentative.html b/trusted-types/block-string-assignment-to-location-replace.tentative.html
index ae8bdcd..9736a84 100644
--- a/trusted-types/block-string-assignment-to-location-replace.tentative.html
+++ b/trusted-types/block-string-assignment-to-location-replace.tentative.html
@@ -3,7 +3,7 @@
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
- <script src="./support/helper.js"></script>
+ <script src="support/helper.sub.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types">
</head>
diff --git a/trusted-types/block-string-assignment-to-outerHTML.tentative.html b/trusted-types/block-string-assignment-to-outerHTML.tentative.html
index 0e420e5..8cf6c4b 100644
--- a/trusted-types/block-string-assignment-to-outerHTML.tentative.html
+++ b/trusted-types/block-string-assignment-to-outerHTML.tentative.html
@@ -3,7 +3,7 @@
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
- <script src="./support/helper.js"></script>
+ <script src="support/helper.sub.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types">
</head>
diff --git a/trusted-types/block-string-assignment-to-script-src.tentative.html b/trusted-types/block-string-assignment-to-script-src.tentative.html
index e0d2bc7..ade7684 100644
--- a/trusted-types/block-string-assignment-to-script-src.tentative.html
+++ b/trusted-types/block-string-assignment-to-script-src.tentative.html
@@ -3,7 +3,7 @@
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
- <script src="./support/helper.js"></script>
+ <script src="support/helper.sub.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types">
</head>
diff --git a/trusted-types/createContextualFragment.tentative.html b/trusted-types/createContextualFragment.tentative.html
index 7e60f0b..5e50acc 100644
--- a/trusted-types/createContextualFragment.tentative.html
+++ b/trusted-types/createContextualFragment.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<body>
<script>
test(t => {
diff --git a/trusted-types/document-write.tentative.html b/trusted-types/document-write.tentative.html
index 0934db9..1279419 100644
--- a/trusted-types/document-write.tentative.html
+++ b/trusted-types/document-write.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<body>
<script>
promise_test(t => {
diff --git a/trusted-types/embed-src.tentative.html b/trusted-types/embed-src.tentative.html
index a06adc0..7576027 100644
--- a/trusted-types/embed-src.tentative.html
+++ b/trusted-types/embed-src.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="./support/helper.sub.js"></script>
<body>
<script>
test(t => {
diff --git a/trusted-types/innerHTML.tentative.html b/trusted-types/innerHTML.tentative.html
index 6a72dfa..f9f32d4 100644
--- a/trusted-types/innerHTML.tentative.html
+++ b/trusted-types/innerHTML.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<body>
<script>
test(t => {
diff --git a/trusted-types/insertAdjacentHTML.tentative.html b/trusted-types/insertAdjacentHTML.tentative.html
index 5341f3b..a95dd6c 100644
--- a/trusted-types/insertAdjacentHTML.tentative.html
+++ b/trusted-types/insertAdjacentHTML.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<body>
<div id="container"></div>
<script>
diff --git a/trusted-types/location-assign.tentative.html b/trusted-types/location-assign.tentative.html
index 1eb47dd..07cb4a8 100644
--- a/trusted-types/location-assign.tentative.html
+++ b/trusted-types/location-assign.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<body>
<script>
test(t => {
diff --git a/trusted-types/location-href.tentative.html b/trusted-types/location-href.tentative.html
index 6dd4816..2527fbf 100644
--- a/trusted-types/location-href.tentative.html
+++ b/trusted-types/location-href.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<body>
<script>
promise_test(t => {
diff --git a/trusted-types/location-replace.tentative.html b/trusted-types/location-replace.tentative.html
index acde7ff..097c24d 100644
--- a/trusted-types/location-replace.tentative.html
+++ b/trusted-types/location-replace.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<body>
<script>
test(t => {
diff --git a/trusted-types/outerHTML.tentative.html b/trusted-types/outerHTML.tentative.html
index 0a25dc2..1deb46b 100644
--- a/trusted-types/outerHTML.tentative.html
+++ b/trusted-types/outerHTML.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<body>
<div id="container"></div>
<script>
diff --git a/trusted-types/script-src.tentative.html b/trusted-types/script-src.tentative.html
index bc8c332..7235cc3 100644
--- a/trusted-types/script-src.tentative.html
+++ b/trusted-types/script-src.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<body>
<script>
test(t => {
diff --git a/trusted-types/srcDoc-requiresTrustedTypes.tentative.html b/trusted-types/srcDoc-requiresTrustedTypes.tentative.html
index c1a560e..b957488 100644
--- a/trusted-types/srcDoc-requiresTrustedTypes.tentative.html
+++ b/trusted-types/srcDoc-requiresTrustedTypes.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types">
<body>
diff --git a/trusted-types/srcDoc.tentative.html b/trusted-types/srcDoc.tentative.html
index 1521615..b23703e 100644
--- a/trusted-types/srcDoc.tentative.html
+++ b/trusted-types/srcDoc.tentative.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
<body>
<script>
async_test(t => {
diff --git a/trusted-types/support/helper.js b/trusted-types/support/helper.sub.js
similarity index 95%
rename from trusted-types/support/helper.js
rename to trusted-types/support/helper.sub.js
index 1094e72..036dbed 100644
--- a/trusted-types/support/helper.js
+++ b/trusted-types/support/helper.sub.js
@@ -5,7 +5,7 @@
};
var URLS = {
- safe: "https://example.test/",
+ safe: "http://{{host}}:{{ports[http][0]}}/",
javascript: "javascript:'scripted'",
external: "custom-handler:whatever",
sanitized: "about:invalid"
