Skip to content
This repository was archived by the owner on Mar 19, 2021. It is now read-only.

Commit 643548a

Browse files
iVanlIshfoolip
iVanlIsh
authored and
foolip
committed
Renaming fetch/metadata web platform tests
Bug: 1011285 Change-Id: I8f96a36e7fd0a27dde66671c3c85e298236d20f3 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1838173 Reviewed-by: Mike West <[email protected]> Commit-Queue: Yifan Luo <[email protected]> Cr-Commit-Position: refs/heads/master@{#702780}
1 parent afcf0c8 commit 643548a

File tree

56 files changed

+202
-204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+202
-204
lines changed

‎fetch/metadata/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Fetch Metadata Tests
2+
====================
3+
4+
This directory contains tests related to the Fetch Metadata proposal:
5+
6+
: Explainer
7+
:: <https://github.com/w3c/webappsec-fetch-metadata>
8+
: "Spec"
9+
:: <https://w3c.github.io/webappsec-fetch-metadata/>

‎fetch/sec-metadata/appcache.tentative.https.sub.html renamed to ‎fetch/metadata/appcache.tentative.https.sub.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<!DOCTYPE html>
2-
<html manifest="/fetch/sec-metadata/resources/record-header.py?file=appcache-manifest{{$id:uuid()}}">
2+
<html manifest="/fetch/metadata/resources/record-header.py?file=appcache-manifest{{$id:uuid()}}">
33
<meta name="timeout" content="long">
44
<script src=/resources/testharness.js></script>
55
<script src=/resources/testharnessreport.js></script>
6-
<script src=/fetch/sec-metadata/resources/helper.js></script>
6+
<script src=/fetch/metadata/resources/helper.js></script>
77
<script src=/common/utils.js></script>
88
<body></body>
99
<script>
1010
async_test(t => {
1111
window.applicationCache.oncached = window.applicationCache.onnoupdate = window.applicationCache.onerror = t.step_func(e => {
12-
fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=appcache-manifest{{$id}}")
12+
fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=appcache-manifest{{$id}}")
1313
.then(t.step_func(response => response.text()))
1414
.then(t.step_func_done(text => assert_header_equals(text, {
1515
"dest": "",
@@ -18,6 +18,6 @@
1818
"mode": "no-cors"
1919
})))
2020
.catch(t.unreached_func("Fetching and verifying the results should succeed."));
21-
});
22-
}, "Appcache!");
21+
});
22+
}, "Appcache!");
2323
</script>

‎fetch/sec-metadata/embed.tentative.https.sub.html renamed to ‎fetch/metadata/embed.tentative.https.sub.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<link rel="author" href="[email protected]" title="Maciek Trzos">
44
<script src=/resources/testharness.js></script>
55
<script src=/resources/testharnessreport.js></script>
6-
<script src=/fetch/sec-metadata/resources/helper.js></script>
6+
<script src=/fetch/metadata/resources/helper.js></script>
77
<script src=/common/utils.js></script>
88
<body>
99
<script>
@@ -14,10 +14,10 @@
1414
let key = "embed-same-origin" + nonce;
1515

1616
let e = document.createElement('embed');
17-
e.src = "https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
17+
e.src = "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
1818
e.onload = e => {
1919
let expected = {"dest":"embed", "site":"same-origin", "user":"", "mode":"no-cors"};
20-
fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
20+
fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
2121
.then(response => response.text())
2222
.then(text => assert_header_equals(text, expected))
2323
.then(_ => resolve())
@@ -33,10 +33,10 @@
3333
let key = "embed-same-site" + nonce;
3434

3535
let e = document.createElement('embed');
36-
e.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
36+
e.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
3737
e.onload = e => {
3838
let expected = {"dest":"embed", "site":"same-site", "user":"", "mode":"no-cors"};
39-
fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
39+
fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
4040
.then(response => response.text())
4141
.then(text => assert_header_equals(text, expected))
4242
.then(_ => resolve())
@@ -52,10 +52,10 @@
5252
let key = "embed-cross-site" + nonce;
5353

5454
let e = document.createElement('embed');
55-
e.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
55+
e.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
5656
e.onload = e => {
5757
let expected = {"dest":"embed", "site":"cross-site", "user":"", "mode":"no-cors"};
58-
fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
58+
fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
5959
.then(response => response.text())
6060
.then(text => assert_header_equals(text, expected))
6161
.then(_ => resolve())

‎fetch/sec-metadata/fetch-preflight.tentative.https.sub.html renamed to ‎fetch/metadata/fetch-preflight.tentative.https.sub.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!DOCTYPE html>
22
<script src=/resources/testharness.js></script>
33
<script src=/resources/testharnessreport.js></script>
4-
<script src=/fetch/sec-metadata/resources/helper.js></script>
4+
<script src=/fetch/metadata/resources/helper.js></script>
55
<script>
66
// Site
77
promise_test(t => {
8-
return fetch("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py",
8+
return fetch("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py",
99
{
1010
mode: "cors",
1111
headers: { 'x-test': 'testing' }
@@ -22,7 +22,7 @@
2222
}, "Same-site fetch with preflight");
2323

2424
promise_test(t => {
25-
return fetch("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py",
25+
return fetch("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py",
2626
{
2727
mode: "cors",
2828
headers: { 'x-test': 'testing' }

‎fetch/sec-metadata/fetch-via-serviceworker--fallback.tentative.https.sub.html renamed to ‎fetch/metadata/fetch-via-serviceworker--fallback.tentative.https.sub.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<link rel="author" href="[email protected]" title="Lukasz Anforowicz">
99
<script src=/resources/testharness.js></script>
1010
<script src=/resources/testharnessreport.js></script>
11-
<script src=/fetch/sec-metadata/resources/helper.js></script>
11+
<script src=/fetch/metadata/resources/helper.js></script>
1212
<script src=/service-workers/service-worker/resources/test-helpers.sub.js></script>
1313
<script src=/common/utils.js></script>
1414
<script>
@@ -18,8 +18,8 @@
1818
promise_test(async function(t) {
1919
const SCOPE = 'resources/fetch-via-serviceworker--fallback--frame.html';
2020
const SCRIPT = 'resources/fetch-via-serviceworker--fallback--sw.js';
21-
const URL = '/fetch/sec-metadata/resources/record-header.py?file=' + key;
22-
const RETRIEVAL_URL = "/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key;
21+
const URL = '/fetch/metadata/resources/record-header.py?file=' + key;
22+
const RETRIEVAL_URL = "/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key;
2323

2424
const reg = await service_worker_unregister_and_register(t, SCRIPT, SCOPE);
2525
t.add_cleanup(async () => {

‎fetch/sec-metadata/fetch-via-serviceworker--respondWith.tentative.https.sub.html renamed to ‎fetch/metadata/fetch-via-serviceworker--respondWith.tentative.https.sub.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="author" href="[email protected]" title="Lukasz Anforowicz">
1010
<script src=/resources/testharness.js></script>
1111
<script src=/resources/testharnessreport.js></script>
12-
<script src=/fetch/sec-metadata/resources/helper.js></script>
12+
<script src=/fetch/metadata/resources/helper.js></script>
1313
<script src=/service-workers/service-worker/resources/test-helpers.sub.js></script>
1414
<script src=/common/utils.js></script>
1515
<script>
@@ -19,8 +19,8 @@
1919
promise_test(async function(t) {
2020
const SCOPE = 'resources/fetch-via-serviceworker--respondWith--frame.html';
2121
const SCRIPT = 'resources/fetch-via-serviceworker--respondWith--sw.js';
22-
const URL = '/fetch/sec-metadata/resources/record-header.py?file=' + key;
23-
const RETRIEVAL_URL = "/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key;
22+
const URL = '/fetch/metadata/resources/record-header.py?file=' + key;
23+
const RETRIEVAL_URL = "/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key;
2424

2525
const reg = await service_worker_unregister_and_register(t, SCRIPT, SCOPE);
2626
t.add_cleanup(async () => {

‎fetch/sec-metadata/fetch.tentative.https.sub.html renamed to ‎fetch/metadata/fetch.tentative.https.sub.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!DOCTYPE html>
22
<script src=/resources/testharness.js></script>
33
<script src=/resources/testharnessreport.js></script>
4-
<script src=/fetch/sec-metadata/resources/helper.js></script>
4+
<script src=/fetch/metadata/resources/helper.js></script>
55
<script>
66
// Site
77
promise_test(t => {
8-
return fetch("https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py")
8+
return fetch("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
99
.then(r => r.json())
1010
.then(j => {
1111
assert_header_equals(j, {
@@ -18,7 +18,7 @@
1818
}, "Same-origin fetch");
1919

2020
promise_test(t => {
21-
return fetch("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py")
21+
return fetch("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
2222
.then(r => r.json())
2323
.then(j => {
2424
assert_header_equals(j, {
@@ -31,7 +31,7 @@
3131
}, "Same-site fetch");
3232

3333
promise_test(t => {
34-
return fetch("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py")
34+
return fetch("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
3535
.then(r => r.json())
3636
.then(j => {
3737
assert_header_equals(j, {
@@ -45,7 +45,7 @@
4545

4646
// Mode
4747
promise_test(t => {
48-
return fetch("https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py", {mode: "same-origin"})
48+
return fetch("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {mode: "same-origin"})
4949
.then(r => r.json())
5050
.then(j => {
5151
assert_header_equals(j, {
@@ -58,7 +58,7 @@
5858
}, "Same-origin mode");
5959

6060
promise_test(t => {
61-
return fetch("https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py", {mode: "cors"})
61+
return fetch("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {mode: "cors"})
6262
.then(r => r.json())
6363
.then(j => {
6464
assert_header_equals(j, {
@@ -71,7 +71,7 @@
7171
}, "CORS mode");
7272

7373
promise_test(t => {
74-
return fetch("https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py", {mode: "no-cors"})
74+
return fetch("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {mode: "no-cors"})
7575
.then(r => r.json())
7676
.then(j => {
7777
assert_header_equals(j, {

‎fetch/sec-metadata/fetch.tentative.sub.html renamed to ‎fetch/metadata/fetch.tentative.sub.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<!DOCTYPE html>
22
<script src=/resources/testharness.js></script>
33
<script src=/resources/testharnessreport.js></script>
4-
<script src=/fetch/sec-metadata/resources/helper.js></script>
4+
<script src=/fetch/metadata/resources/helper.js></script>
55
<script>
66
// http -> https should see `Sec-Fetch-Site: cross-site`.
77
// This is a regression test for
88
// https://github.com/w3c/webappsec-fetch-metadata/issues/34
99
promise_test(t => {
1010
assert_equals(location.protocol, "http:");
11-
return fetch("https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py")
11+
return fetch("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
1212
.then(r => r.json())
1313
.then(j => {
1414
assert_header_equals(j, {
@@ -33,5 +33,5 @@
3333
"mode": "",
3434
});
3535
});
36-
}, "http->http fetch (non-trustworthy destination => no sec-metadata)");
36+
}, "http->http fetch (non-trustworthy destination => no metadata)");
3737
</script>

‎fetch/sec-metadata/font.tentative.https.sub.html renamed to ‎fetch/metadata/font.tentative.https.sub.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<link rel="author" href="[email protected]" title="Maciek Trzos">
44
<script src=/resources/testharness.js></script>
55
<script src=/resources/testharnessreport.js></script>
6-
<script src=/fetch/sec-metadata/resources/helper.js></script>
6+
<script src=/fetch/metadata/resources/helper.js></script>
77
<body>
88
<div id="test1">1</div>
99
<div id="test2">2</div>
@@ -12,7 +12,7 @@
1212
<style>
1313
@font-face {
1414
font-family: myFirstFont;
15-
src: url(https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=font-same-origin);
15+
src: url(https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=font-same-origin);
1616
}
1717
#test1 {
1818
font-family: myFirstFont;
@@ -23,7 +23,7 @@
2323
<style>
2424
@font-face {
2525
font-family: mySecondFont;
26-
src: url(https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=font-same-site);
26+
src: url(https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=font-same-site);
2727
}
2828
#test2 {
2929
font-family: mySecondFont;
@@ -34,7 +34,7 @@
3434
<style>
3535
@font-face {
3636
font-family: myThirdFont;
37-
src: url(https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=font-cross-site);
37+
src: url(https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=font-cross-site);
3838
}
3939
#test3 {
4040
font-family: myThirdFont;
@@ -47,7 +47,7 @@
4747
return new Promise((resolve, reject) => {
4848
let key = "font-same-origin";
4949
let expected = {"dest":"font", "site":"same-origin", "user":"", "mode": "cors"};
50-
fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
50+
fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
5151
.then(response => response.text())
5252
.then(text => assert_header_equals(text, expected))
5353
.then(_ => resolve())
@@ -59,7 +59,7 @@
5959
return new Promise((resolve, reject) => {
6060
let key = "font-same-site";
6161
let expected = {"dest":"font", "site":"same-site", "user":"", "mode": "cors"};
62-
fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
62+
fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
6363
.then(response => response.text())
6464
.then(text => assert_header_equals(text, expected))
6565
.then(_ => resolve())
@@ -71,7 +71,7 @@
7171
return new Promise((resolve, reject) => {
7272
let key = "font-cross-site";
7373
let expected = {"dest":"font", "site":"cross-site", "user":"", "mode": "cors"};
74-
fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
74+
fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
7575
.then(response => response.text())
7676
.then(text => assert_header_equals(text, expected))
7777
.then(_ => resolve())

‎fetch/sec-metadata/history.tentative.https.sub.html renamed to ‎fetch/metadata/history.tentative.https.sub.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<html>
33
<script src=/resources/testharness.js></script>
44
<script src=/resources/testharnessreport.js></script>
5-
<script src=/fetch/sec-metadata/resources/helper.js></script>
5+
<script src=/fetch/metadata/resources/helper.js></script>
66
<script>
77

88
// Test that correct `Sec-Fetch-Site` (and other `Sec-Fetch-...` request
99
/// headers) are used in navigations triggered by |history.back()|.
1010
function add_test(description, report_host, go_back_host, expectations) {
1111
async_test(t => {
1212
// STEP1: Navigate a new window to report_host/post-to-owner.py
13-
const url_suffix = '/fetch/sec-metadata/resources/post-to-owner.py'
13+
const url_suffix = '/fetch/metadata/resources/post-to-owner.py'
1414
const url = `https://${report_host}${url_suffix}`;
1515
const w = window.open(url, '_blank');
1616

@@ -29,7 +29,7 @@
2929
// history entry - otherwise it might be treated as a client-side
3030
// redirect and we might end up with nowhere to go back to).
3131
t.step_timeout(() => {
32-
const url_suffix = '/fetch/sec-metadata/resources/go-back.html'
32+
const url_suffix = '/fetch/metadata/resources/go-back.html'
3333
const url = `https://${go_back_host}${url_suffix}`;
3434
w.location = url;
3535
});

0 commit comments

Comments
 (0)