third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-strict-dynamic.html - Issue 2360293002: Fix 'strict-dynamic' tests (generateURL / assert mismatch).

Unified Diff: third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-strict-dynamic.html

Issue 2360293002: Fix 'strict-dynamic' tests (generateURL / assert mismatch). (Closed)

Patch Set: Fix misplaced parentheses. Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-strict-dynamic-whitelist.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-strict-dynamic.html

diff --git a/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-strict-dynamic.html b/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-strict-dynamic.html

index 5d15d0c18d6a2618d70db15a9e21f69a1c5bc776..41654c3c8b28ee596b0b50722e1a7443cf70d321 100644

--- a/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-strict-dynamic.html

+++ b/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-strict-dynamic.html

@@ -27,7 +27,7 @@

// Delay the check until after the postMessage has a chance to execute.

setTimeout(t.step_func_done(function () {

assert_true(loaded[generateURL("append")]);

- }, 1));

+ }), 1);

});

e.onerror = t.unreached_func("Error should not be triggered.");

document.body.appendChild(e);

@@ -41,7 +41,7 @@

// Delay the check until after the postMessage has a chance to execute.

setTimeout(t.step_func_done(function () {

assert_true(loaded[generateURL("append-async")]);

- }, 1));

+ }), 1);

});

e.onerror = t.unreached_func("Error should not be triggered.");

document.body.appendChild(e);

@@ -55,7 +55,7 @@

// Delay the check until after the postMessage has a chance to execute.

setTimeout(t.step_func_done(function () {

assert_true(loaded[generateURL("append-defer")]);

- }, 1));

+ }), 1);

});

e.onerror = t.unreached_func("Error should not be triggered.");

document.body.appendChild(e);

@@ -66,7 +66,7 @@

setTimeout(t.step_func_done(function () {

assert_equals(loaded[generateURL("write")], undefined);

assert_true(blocked[65]);

- }, 1));

+ }), 1);

}, "Script injected via 'document.write' is not allowed with 'strict-dynamic'.");

async_test(function (t) {

@@ -74,7 +74,7 @@

setTimeout(t.step_func_done(function () {

assert_equals(loaded[generateURL("write-defer")], undefined);

assert_true(blocked[73]);

- }, 1));

+ }), 1);

}, "Deferred script injected via 'document.write' is not allowed with 'strict-dynamic'.");

async_test(function (t) {

@@ -82,7 +82,7 @@

setTimeout(t.step_func_done(function () {

assert_equals(loaded[generateURL("write-async")], undefined);

assert_true(blocked[81]);

- }, 1));

+ }), 1);

}, "Async script injected via 'document.write' is not allowed with 'strict-dynamic'.");

</script>

@@ -94,7 +94,7 @@

setTimeout(t.step_func_done(function () {

assert_true(loaded[generateURL("defer-append")]);

assert_equals(blocked[generateURL("defer-append")], undefined);

- }, 1));

+ }), 1);

});

e.onerror = t.unreached_func("Error should not be triggered.");

document.body.appendChild(e);

@@ -109,7 +109,7 @@

setTimeout(t.step_func_done(function () {

assert_true(loaded[generateURL("defer-append-async")]);

assert_equals(blocked[generateURL("defer-append-async")], undefined);

- }, 1));

+ }), 1);

});

e.onerror = t.unreached_func("Error should not be triggered.");

document.body.appendChild(e);

@@ -124,26 +124,26 @@

setTimeout(t.step_func_done(function () {

assert_true(loaded[generateURL("defer-append-defer")]);

assert_equals(blocked[generateURL("defer-append-defer")], undefined);

- }, 1));

+ }), 1);

});

e.onerror = t.unreached_func("Error should not be triggered.");

document.body.appendChild(e);

}, "Deferred script injected via deferred 'appendChild' is allowed with 'strict-dynamic'.");

async_test(function (t) {

- document.write("<scr" + "ipt src='" + generateURL("write") + "'></scr" + "ipt>");

+ document.write("<scr" + "ipt src='" + generateURL("defer-write") + "'></scr" + "ipt>");

setTimeout(t.step_func_done(function () {

assert_equals(loaded[generateURL("defer-write")], undefined);

assert_true(blocked[134]);

- }, 1));

+ }), 1);

}, "Script injected via deferred 'document.write' is not allowed with 'strict-dynamic'.");

async_test(function (t) {

document.write("<scr" + "ipt defer src='" + generateURL("defer-write-defer") + "'></scr" + "ipt>");

setTimeout(t.step_func_done(function () {

- assert_equals(loaded[generateURL("write-defer")], undefined);

+ assert_equals(loaded[generateURL("defer-write-defer")], undefined);

assert_true(blocked[142]);

- }, 1));

+ }), 1);

}, "Deferred script injected via deferred 'document.write' is not allowed with 'strict-dynamic'.");

async_test(function (t) {

@@ -151,7 +151,7 @@

setTimeout(t.step_func_done(function () {

assert_equals(loaded[generateURL("defer-write-async")], undefined);

assert_true(blocked[150]);

- }, 1));

+ }), 1);

}, "Async script injected via deferred 'document.write' is not allowed with 'strict-dynamic'.");

</script>

</body>