Convert 'Sec-Metadata' dictionary values to identifiers.
Spec changes:
* https://github.com/mikewest/sec-metadata/commit/4e80053af5a7494bc0f34afd30f990e5a79ae2ee
* https://github.com/mikewest/sec-metadata/commit/279d75c9dc1117fb75581970e9fd1335e329b63c
Bug: 861678
Change-Id: I7f272ba2e923a0d219e7a8ba62072860ba3d8319
Reviewed-on: https://chromium-review.googlesource.com/c/1282603
Reviewed-by: Andy Paicu <andypaicu@chromium.org>
Reviewed-by: Camille Lamy <clamy@chromium.org>
Commit-Queue: Mike West <mkwst@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600304}
diff --git a/fetch/sec-metadata/fetch.tentative.https.sub.html b/fetch/sec-metadata/fetch.tentative.https.sub.html
index 1207247..d18042c 100644
--- a/fetch/sec-metadata/fetch.tentative.https.sub.html
+++ b/fetch/sec-metadata/fetch.tentative.https.sub.html
@@ -9,7 +9,7 @@
.then(j => {
assert_header_equals(j.header, {
"cause": undefined,
- "destination": "",
+ "destination": "empty",
"site": "same-origin"
});
});
@@ -21,7 +21,7 @@
.then(j => {
assert_header_equals(j.header, {
"cause": undefined,
- "destination": "",
+ "destination": "empty",
"site": "same-site"
});
});
@@ -33,7 +33,7 @@
.then(j => {
assert_header_equals(j.header, {
"cause": undefined,
- "destination": "",
+ "destination": "empty",
"site": "cross-site"
});
});
diff --git a/fetch/sec-metadata/report.tentative.https.sub.html b/fetch/sec-metadata/report.tentative.https.sub.html
index 2798364..a74da6a 100644
--- a/fetch/sec-metadata/report.tentative.https.sub.html
+++ b/fetch/sec-metadata/report.tentative.https.sub.html
@@ -6,30 +6,26 @@
<link id="style" href="https://foo.bar" rel="stylesheet">
<body></body>
<script>
- let counter = 0;
- document.addEventListener("securitypolicyviolation", (e) => {
- counter++;
- if (counter == 3) {
- promise_test(t => {
- expected = {"destination":"report", "site":"same-origin"};
- return fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=report-same-origin")
+ function generate_test(expected, name) {
+ async_test(t => {
+ t.step_timeout(_ => {
+ return fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=report-" + name)
.then(response => response.text())
- .then(text => assert_header_equals(text, expected));
- }, "Same-Origin report");
+ .then(text => assert_header_equals(text, expected))
+ .then(_ => t.done());
+ }, 1000);
+ }, name + " report");
+ }
- promise_test(t => {
- expected = {"destination":"report", "site":"same-site"};
- return fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=report-same-site")
- .then(response => response.text())
- .then(text => assert_header_equals(text, expected));
- }, "Same-site report");
-
- promise_test(t => {
- expected = {"destination":"report", "site":"cross-site"};
- return fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=report-cross-site")
- .then(response => response.text())
- .then(text => assert_header_equals(text, expected));
- }, "Cross-site report");
- }
- });
+ test(_ => {
+ let counter = 0;
+ document.addEventListener("securitypolicyviolation", (e) => {
+ counter++;
+ if (counter == 3) {
+ generate_test({"destination":"report", "site":"same-origin"}, "same-origin");
+ generate_test({"destination":"report", "site":"same-site"}, "same-site");
+ generate_test({"destination":"report", "site":"cross-site"}, "cross-site");
+ }
+ });
+ }, "Initialization.");
</script>
diff --git a/fetch/sec-metadata/resources/helper.js b/fetch/sec-metadata/resources/helper.js
index 55e36d4..037f7e1 100644
--- a/fetch/sec-metadata/resources/helper.js
+++ b/fetch/sec-metadata/resources/helper.js
@@ -2,7 +2,6 @@
let result = {};
value.split(',').forEach(item => {
let parsed = item.trim().split('=');
- parsed[1] = parsed[1].trim().replace(/^"|"$/g, '');
result[parsed[0]] = parsed[1];
});
return result;
