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

Commit e6ca5a0

Browse files
iVanlIshfoolip
authored andcommitted
Fetch Metadata: Split sec-fetch-dest out from other headers' tests.
Bug: 1012190 Change-Id: Id5029e303d1fc5e171f8efdd2946ffe5eeef52bf Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1844823 Reviewed-by: Mike West <[email protected]> Commit-Queue: Yifan Luo <[email protected]> Cr-Commit-Position: refs/heads/master@{#703642}
1 parent ae14a21 commit e6ca5a0

File tree

76 files changed

+1920
-118
lines changed

Some content is hidden

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

76 files changed

+1920
-118
lines changed

fetch/metadata/appcache.tentative.https.sub.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
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, {
15-
"dest": "",
1615
"site": "same-origin",
1716
"user": "",
1817
"mode": "no-cors"

fetch/metadata/embed.tentative.https.sub.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
let e = document.createElement('embed');
1717
e.src = "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
1818
e.onload = e => {
19-
let expected = {"dest":"embed", "site":"same-origin", "user":"", "mode":"no-cors"};
19+
let expected = {"site":"same-origin", "user":"", "mode":"no-cors"};
2020
fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
2121
.then(response => response.text())
2222
.then(text => assert_header_equals(text, expected))
@@ -35,7 +35,7 @@
3535
let e = document.createElement('embed');
3636
e.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
3737
e.onload = e => {
38-
let expected = {"dest":"embed", "site":"same-site", "user":"", "mode":"no-cors"};
38+
let expected = {"site":"same-site", "user":"", "mode":"no-cors"};
3939
fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
4040
.then(response => response.text())
4141
.then(text => assert_header_equals(text, expected))
@@ -54,7 +54,7 @@
5454
let e = document.createElement('embed');
5555
e.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
5656
e.onload = e => {
57-
let expected = {"dest":"embed", "site":"cross-site", "user":"", "mode":"no-cors"};
57+
let expected = {"site":"cross-site", "user":"", "mode":"no-cors"};
5858
fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
5959
.then(response => response.text())
6060
.then(text => assert_header_equals(text, expected))

fetch/metadata/fetch-preflight.tentative.https.sub.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
.then(r => r.json())
1414
.then(j => {
1515
assert_header_equals(j, {
16-
"dest": "empty",
1716
"site": "same-site",
1817
"user": "",
1918
"mode": "cors",
@@ -30,7 +29,6 @@
3029
.then(r => r.json())
3130
.then(j => {
3231
assert_header_equals(j, {
33-
"dest": "empty",
3432
"site": "cross-site",
3533
"user": "",
3634
"mode": "cors",

fetch/metadata/fetch-via-serviceworker--fallback.tentative.https.sub.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
const text = await response.text();
4545

4646
// Verify presence of the expected Sec-Fetch-... request headers.
47-
let expected = {"dest":"empty", "site":"same-origin", "user":"", "mode": "no-cors"};
47+
let expected = {"site":"same-origin", "user":"", "mode": "no-cors"};
4848
assert_header_equals(text, expected);
4949
}, 'Sec-Fetch headers after SW fallback');
5050
</script>

fetch/metadata/fetch-via-serviceworker--respondWith.tentative.https.sub.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
const text = await response.text();
4646

4747
// Verify presence of the expected Sec-Fetch-... request headers.
48-
let expected = {"dest":"empty", "site":"same-origin", "user":"", "mode": "no-cors"};
48+
let expected = {"site":"same-origin", "user":"", "mode": "no-cors"};
4949
assert_header_equals(text, expected);
5050
}, 'Sec-Fetch headers after SW fallback');
5151
</script>

fetch/metadata/fetch.tentative.https.sub.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
.then(r => r.json())
1010
.then(j => {
1111
assert_header_equals(j, {
12-
"dest": "empty",
1312
"site": "same-origin",
1413
"user": "",
1514
"mode": "cors",
@@ -22,7 +21,6 @@
2221
.then(r => r.json())
2322
.then(j => {
2423
assert_header_equals(j, {
25-
"dest": "empty",
2624
"site": "same-site",
2725
"user": "",
2826
"mode": "cors",
@@ -35,7 +33,6 @@
3533
.then(r => r.json())
3634
.then(j => {
3735
assert_header_equals(j, {
38-
"dest": "empty",
3936
"site": "cross-site",
4037
"user": "",
4138
"mode": "cors",
@@ -49,7 +46,6 @@
4946
.then(r => r.json())
5047
.then(j => {
5148
assert_header_equals(j, {
52-
"dest": "empty",
5349
"site": "same-origin",
5450
"user": "",
5551
"mode": "same-origin",
@@ -62,7 +58,6 @@
6258
.then(r => r.json())
6359
.then(j => {
6460
assert_header_equals(j, {
65-
"dest": "empty",
6661
"site": "same-origin",
6762
"user": "",
6863
"mode": "cors",
@@ -75,7 +70,6 @@
7570
.then(r => r.json())
7671
.then(j => {
7772
assert_header_equals(j, {
78-
"dest": "empty",
7973
"site": "same-origin",
8074
"user": "",
8175
"mode": "no-cors",

fetch/metadata/fetch.tentative.sub.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
.then(r => r.json())
1313
.then(j => {
1414
assert_header_equals(j, {
15-
"dest": "empty",
1615
"site": "cross-site",
1716
"user": "",
1817
"mode": "cors",
@@ -27,7 +26,6 @@
2726
.then(r => r.json())
2827
.then(j => {
2928
assert_header_equals(j, {
30-
"dest": "",
3129
"site": "",
3230
"user": "",
3331
"mode": "",

fetch/metadata/font.tentative.https.sub.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
promise_test(t => {
4747
return new Promise((resolve, reject) => {
4848
let key = "font-same-origin";
49-
let expected = {"dest":"font", "site":"same-origin", "user":"", "mode": "cors"};
49+
let expected = {"site":"same-origin", "user":"", "mode": "cors"};
5050
fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
5151
.then(response => response.text())
5252
.then(text => assert_header_equals(text, expected))
@@ -58,7 +58,7 @@
5858
promise_test(t => {
5959
return new Promise((resolve, reject) => {
6060
let key = "font-same-site";
61-
let expected = {"dest":"font", "site":"same-site", "user":"", "mode": "cors"};
61+
let expected = {"site":"same-site", "user":"", "mode": "cors"};
6262
fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
6363
.then(response => response.text())
6464
.then(text => assert_header_equals(text, expected))
@@ -70,7 +70,7 @@
7070
promise_test(t => {
7171
return new Promise((resolve, reject) => {
7272
let key = "font-cross-site";
73-
let expected = {"dest":"font", "site":"cross-site", "user":"", "mode": "cors"};
73+
let expected = {"site":"cross-site", "user":"", "mode": "cors"};
7474
fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
7575
.then(response => response.text())
7676
.then(text => assert_header_equals(text, expected))

fetch/metadata/history.tentative.https.sub.html

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,26 +55,23 @@
5555
"back to same-origin-initiated navigation",
5656
same_origin_host, // report_host
5757
cross_site_host, // go_back_host
58-
{ "dest": "document",
59-
"site": "same-origin",
58+
{ "site": "same-origin",
6059
"user": "",
6160
"mode": "navigate" });
6261

6362
add_test(
6463
"back to same-site-initiated navigation",
6564
same_site_host, // report_host
6665
cross_site_host, // go_back_host
67-
{ "dest": "document",
68-
"site": "same-site",
66+
{ "site": "same-site",
6967
"user": "",
7068
"mode": "navigate" });
7169

7270
add_test(
7371
"back to cross-site-initiated navigation",
7472
cross_site_host, // report_host
7573
cross_site_host, // go_back_host
76-
{ "dest": "document",
77-
"site": "cross-site",
74+
{ "site": "cross-site",
7875
"user": "",
7976
"mode": "navigate" });
8077

fetch/metadata/iframe.tentative.https.sub.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,42 +42,36 @@
4242
}
4343

4444
create_test("{{host}}:{{ports[https][0]}}", FORCED, {
45-
"dest": "nested-document",
4645
"site": "same-origin",
4746
"user": "",
4847
"mode": "nested-navigate"
4948
});
5049

5150
create_test("{{hosts[][www]}}:{{ports[https][0]}}", FORCED, {
52-
"dest": "nested-document",
5351
"site": "same-site",
5452
"user": "",
5553
"mode": "nested-navigate"
5654
});
5755

5856
create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", FORCED, {
59-
"dest": "nested-document",
6057
"site": "cross-site",
6158
"user": "",
6259
"mode": "nested-navigate"
6360
});
6461

6562
create_test("{{host}}:{{ports[https][0]}}", USER, {
66-
"dest": "nested-document",
6763
"site": "same-origin",
6864
"user": "?1",
6965
"mode": "nested-navigate"
7066
});
7167

7268
create_test("{{hosts[][www]}}:{{ports[https][0]}}", USER, {
73-
"dest": "nested-document",
7469
"site": "same-site",
7570
"user": "?1",
7671
"mode": "nested-navigate"
7772
});
7873

7974
create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", USER, {
80-
"dest": "nested-document",
8175
"site": "cross-site",
8276
"user": "?1",
8377
"mode": "nested-navigate"

0 commit comments

Comments
 (0)