Skip to content

GitLab

T
tangled
Commit 1eba109a authored by Alex Moshchuk's avatar Alex Moshchuk Committed by Commit Bot
Browse files
Options

Revert "Adjusted references in tests to match new helper.sub.js file" 

This reverts commit ac436aaa.

Reason for revert: 
Sorry for the revert, but this might be breaking some layout tests on 
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Linux%20Tests/71090 (see also a few subsequent builds)

Failing tests include:
 external/wpt/trusted-types/HTMLImageElement-src.tentative.html
 external/wpt/trusted-types/HTMLMediaElement-src.tentative.html
 external/wpt/trusted-types/HTMLSourceElement-src.tentative.html
 external/wpt/trusted-types/block-string-assignment-to-HTMLImageElement-src.tentative.html
 external/wpt/trusted-types/block-string-assignment-to-HTMLMediaElement-src.tentative.html
 external/wpt/trusted-types/block-string-assignment-to-HTMLSourceElement-src.tentative.html

Sample failure output (from external/wpt/trusted-types/HTMLImageElement-src.tentative.html, others are similar):

This is a testharness.js-based test.
FAIL src = TrustedURL.create(). URLS is not defined
FAIL src = TrustedURL.unsafelyCreate(). URLS is not defined
Harness: the test ran to completion.



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}

TBR=vogelheim@chromium.org,mkwst@chromium.org,kabusm@google.com

Change-Id: Ieaa3bba36a970c7aa7547939c8f97a57a1b32544
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 739170
Reviewed-on: https://chromium-review.googlesource.com/1142165Reviewed-by: default avatarAlex Moshchuk <alexmos@chromium.org>
Commit-Queue: Alex Moshchuk <alexmos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576103}
parent efd90969
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
third_party/WebKit/LayoutTests/external/wpt/trusted-types/DOMParser-requiresTrustedTypes.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types"> <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
<body> <body>
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/DOMParser.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<body> <body>
<script> <script>
test(t => { test(t => {
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/HTMLBaseElement-href.tentative.html
View file @ 1eba109a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="support/helper.js"></script>
<script> <script>
//helper function for the tests //helper function for the tests
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/TrustedHTML.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<script> <script>
test(t => { test(t => {
var html = TrustedHTML.escape(STRINGS.unescapedHTML); var html = TrustedHTML.escape(STRINGS.unescapedHTML);
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/TrustedScriptURL.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<script> <script>
test(t => { test(t => {
var url = TrustedScriptURL.unsafelyCreate(URLS.safe); var url = TrustedScriptURL.unsafelyCreate(URLS.safe);
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/TrustedURL.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<script> <script>
test(t => { test(t => {
var url = TrustedURL.create(URLS.safe); var url = TrustedURL.create(URLS.safe);
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/block-string-assignment-to-HTMLBaseElement-href.tentative.html
View file @ 1eba109a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="support/helper.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types"> <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/block-string-assignment-to-createContextualFragment.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="support/helper.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types"> <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
<body> <body>
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/block-string-assignment-to-innerHTML.tentative.html
View file @ 1eba109a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types"> <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
</head> </head>
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/block-string-assignment-to-insertAdjacentHTML.tentative.html
View file @ 1eba109a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types"> <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
</head> </head>
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/block-string-assignment-to-location-assign.tentative.html
View file @ 1eba109a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types"> <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
</head> </head>
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/block-string-assignment-to-location-href.tentative.html
View file @ 1eba109a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types"> <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
</head> </head>
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/block-string-assignment-to-location-replace.tentative.html
View file @ 1eba109a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types"> <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
</head> </head>
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/block-string-assignment-to-outerHTML.tentative.html
View file @ 1eba109a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types"> <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
</head> </head>
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/block-string-assignment-to-script-src.tentative.html
View file @ 1eba109a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types"> <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
</head> </head>
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/createContextualFragment.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<body> <body>
<script> <script>
test(t => { test(t => {
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/document-write.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<body> <body>
<script> <script>
promise_test(t => { promise_test(t => {
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/innerHTML.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<body> <body>
<script> <script>
test(t => { test(t => {
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/insertAdjacentHTML.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<body> <body>
<div id="container"></div> <div id="container"></div>
<script> <script>
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/location-assign.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="support/helper.js"></script>
<body> <body>
<script> <script>
test(t => { test(t => {
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/location-href.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<body> <body>
<script> <script>
promise_test(t => { promise_test(t => {
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/location-replace.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="support/helper.js"></script>
<body> <body>
<script> <script>
test(t => { test(t => {
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/outerHTML.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<body> <body>
<div id="container"></div> <div id="container"></div>
<script> <script>
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/script-src.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<body> <body>
<script> <script>
test(t => { test(t => {
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/srcDoc-requiresTrustedTypes.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<meta http-equiv="Content-Security-Policy" content="require-trusted-types"> <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
<body> <body>
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/srcDoc.tentative.html
View file @ 1eba109a
<!DOCTYPE html> <!DOCTYPE html>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="support/helper.sub.js"></script> <script src="./support/helper.js"></script>
<body> <body>
<script> <script>
async_test(t => { async_test(t => {
......
third_party/WebKit/LayoutTests/external/wpt/trusted-types/support/helper.sub.js → third_party/WebKit/LayoutTests/external/wpt/trusted-types/support/helper.js
View file @ 1eba109a
...@@ -5,7 +5,7 @@ var STRINGS = { ...@@ -5,7 +5,7 @@ var STRINGS = {
}; };
var URLS = { var URLS = {
safe: "http://{{host}}:{{ports[http][0]}}/", safe: "https://example.test/",
javascript: "javascript:'scripted'", javascript: "javascript:'scripted'",
external: "custom-handler:whatever", external: "custom-handler:whatever",
sanitized: "about:invalid" sanitized: "about:invalid"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment