diff --git a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html index 245df0439ea71..9cee968456549 100644 --- a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html +++ b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html @@ -28,10 +28,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin-allow-popups", - "navigationURI": /uuid=EXECUTOR_UUID$/, // next document URL - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -42,10 +41,9 @@ "report": { "body": { "disposition": "reporting", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin-plus-coep", - "navigationURI": /uuid=EXECUTOR_UUID$/, // next document URL - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -56,10 +54,10 @@ "report": { "body": { "disposition": "enforce", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin-allow-popups", - "navigationURI": `${location.origin}/`, // referrer - "type": "navigation-to-document" + "previousResponseURL": "", + "referrer": `${location.origin}/`, // referrer + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" @@ -70,10 +68,10 @@ "report": { "body": { "disposition": "reporting", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin-plus-coep", - "navigationURI": `${location.origin}/`, // referrer - "type": "navigation-to-document" + "previousResponseURL": "", + "referrer": `${location.origin}/`, // referrer + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" diff --git a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html index a9bd737c6dd72..33aa08e2b6ac2 100644 --- a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html +++ b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html @@ -28,10 +28,10 @@ "report": { "body": { "disposition": "reporting", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin", - "navigationURI": `${location.href}`, // previous documnent url - "type": "navigation-to-document" + "previousResponseURL": `${location.href}`, // previous documnent url + "referrer": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy) + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" @@ -53,10 +53,10 @@ "report": { "body": { "disposition": "reporting", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin", - "navigationURI": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy) - "type": "navigation-to-document" + "previousResponseURL": "", + "referrer": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy) + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" diff --git a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html index f66d19a239a9d..484152cfb1c55 100644 --- a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html +++ b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html @@ -29,10 +29,9 @@ "report": { "body": { "disposition": "reporting", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin", - "navigationURI": /uuid=EXECUTOR_UUID$/, // next document URL - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -55,10 +54,9 @@ "report": { "body": { "disposition": "reporting", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin", - "navigationURI": /uuid=EXECUTOR_UUID$/, // next document URL - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -69,10 +67,10 @@ "report": { "body": { "disposition": "reporting", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin", - "navigationURI": `${location.origin}/`, // referrer - "type": "navigation-to-document" + "previousResponseURL": "", + "referrer": `${location.origin}/`, // referrer + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" diff --git a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html index 25124ef3d5e4f..ff3649fd3953f 100644 --- a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html +++ b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html @@ -29,10 +29,10 @@ "report": { "body": { "disposition": "reporting", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin-plus-coep", - "navigationURI": `${location.href}`, - "type": "navigation-to-document" + "previousResponseURL": `${location.href}`, + "referrer": `${location.origin}/`, + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" @@ -55,10 +55,10 @@ "report": { "body": { "disposition": "reporting", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin-plus-coep", - "navigationURI": `${location.href}`, - "type": "navigation-to-document" + "previousResponseURL": `${location.href}`, + "referrer": `${location.origin}/`, + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" diff --git a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html index b2e28db349eff..dde4c40b38a1e 100644 --- a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html +++ b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html @@ -54,10 +54,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": RegExp(`uuid=${noCoopToken}$`), "effectivePolicy": "unsafe-none", - "navigationURI": RegExp(`uuid=${coopToken}$`), - "type": "navigation-from-document" + "nextResponseURL": RegExp(`uuid=${coopToken}$`), + "type": "navigation-from-response" }, "url": RegExp(`uuid=${noCoopToken}$`), "type": "coop" @@ -68,10 +67,10 @@ "report": { "body": { "disposition": "enforce", - "documentURI": RegExp(`uuid=${coopToken}$`), "effectivePolicy": "same-origin", - "navigationURI": RegExp(`uuid=${noCoopToken}$`), - "type": "navigation-to-document" + "previousResponseURL": RegExp(`uuid=${noCoopToken}$`), + "referrer": RegExp(`uuid=${noCoopToken}$`), + "type": "navigation-to-response" }, "url": RegExp(`uuid=${coopToken}$`), "type": "coop" diff --git a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html index a8730b00cc6af..576ab7d85beee 100644 --- a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html +++ b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html @@ -28,10 +28,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin-allow-popups", - "navigationURI": /uuid=EXECUTOR_UUID$/, // next document URL - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -42,10 +41,10 @@ "report": { "body": { "disposition": "enforce", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin", - "navigationURI": `${location.href}`, // previous documnent url - "type": "navigation-to-document" + "previousResponseURL": `${location.href}`, // previous documnent url + "referrer": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy) + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" @@ -69,10 +68,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin-allow-popups", - "navigationURI": /uuid=EXECUTOR_UUID$/, // initial navigation URL - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -83,10 +81,10 @@ "report": { "body": { "disposition": "enforce", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin-allow-popups", - "navigationURI": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy) - "type": "navigation-to-document" + "previousResponseURL": ``, + "referrer": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy) + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" @@ -110,10 +108,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin-allow-popups", - "navigationURI": /uuid=EXECUTOR_UUID$/, // initial navigation URL - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, // initial navigation URL + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" diff --git a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html index 51957b4ac19ed..590ab3ff3f285 100644 --- a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html +++ b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html @@ -38,10 +38,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin-plus-coep", - "navigationURI": /uuid=EXECUTOR_UUID$/, // next destination url - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next destination url + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -52,10 +51,10 @@ "report": { "body": { "disposition": "enforce", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin", - "navigationURI": `${location.href}`, // previous document url - "type": "navigation-to-document" + "previousResponseURL": `${location.href}`, // previous document url + "referrer": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy) + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" @@ -80,10 +79,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin-plus-coep", - "navigationURI": /uuid=EXECUTOR_UUID$/, // initial navigation url - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, // initial navigation url + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -94,10 +92,10 @@ "report": { "body": { "disposition": "enforce", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin-plus-coep", - "navigationURI": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy) - "type": "navigation-to-document" + "previousResponseURL": ``, + "referrer": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy) + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" @@ -119,10 +117,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin-plus-coep", - "navigationURI": /uuid=EXECUTOR_UUID$/, // next destination url - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, // initial navigation url + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -144,10 +141,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin-plus-coep", - "navigationURI": /uuid=EXECUTOR_UUID$/, // next destination url - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, // initial navigation url + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -158,10 +154,10 @@ "report": { "body": { "disposition": "reporting", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin-plus-coep", - "navigationURI": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy) - "type": "navigation-to-document" + "previousResponseURL": ``, + "referrer": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy) + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" diff --git a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html index 6d3c6b41df155..6c929b0f8c1ae 100644 --- a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html +++ b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html @@ -40,10 +40,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin", - "navigationURI": /uuid=EXECUTOR_UUID$/, // initial navigation URL (equal to the next document url in that case) - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -54,10 +53,10 @@ "report": { "body": { "disposition": "enforce", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin", - "navigationURI": '', // referrer (empty due to the Referrer Policy) - "type": "navigation-to-document" + "previousResponseURL": "", + "referrer": '', // referrer (empty due to the Referrer Policy) + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" @@ -80,10 +79,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin", - "navigationURI": /uuid=EXECUTOR_UUID$/, - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -94,10 +92,10 @@ "report": { "body": { "disposition": "enforce", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "unsafe-none", - "navigationURI": `${location.href}`, - "type": "navigation-to-document" + "previousResponseURL": `${location.href}`, + "referrer": '', // referrer (empty due to the Referrer Policy) + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" @@ -121,10 +119,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin", - "navigationURI": /uuid=EXECUTOR_UUID$/, // Next document URL - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -135,10 +132,10 @@ "report": { "body": { "disposition": "enforce", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin-plus-coep", - "navigationURI": `${location.href}`, // Previous document URL - "type": "navigation-to-document" + "previousResponseURL": `${location.href}`, + "referrer": '', // referrer (empty due to the Referrer Policy) + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" @@ -162,10 +159,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin", - "navigationURI": /uuid=EXECUTOR_UUID$/, // initial navigation URL - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -176,10 +172,10 @@ "report": { "body": { "disposition": "enforce", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "unsafe-none", - "navigationURI": '', // referrer, as per the no-referrer policy. - "type": "navigation-to-document" + "previousResponseURL": "", + "referrer": '', // referrer (empty due to the Referrer Policy) + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" @@ -203,10 +199,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "same-origin", - "navigationURI": /uuid=EXECUTOR_UUID$/, - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" diff --git a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html index ec39a568bbd19..2fa4e023893ce 100644 --- a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html +++ b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html @@ -29,10 +29,10 @@ "report": { "body": { "disposition": "enforce", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin", - "navigationURI": `${location.href}`, // referrer - "type": "navigation-to-document" + "previousResponseURL": "", + "referrer": `${location.href}`, // referrer + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" @@ -56,10 +56,10 @@ "report": { "body": { "disposition": "enforce", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "unsafe-none", - "navigationURI": `${location.href}`, - "type": "navigation-to-document" + "previousResponseURL": `${location.href}`, + "referrer": `${location.href}`, // referrer + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" @@ -83,10 +83,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": /uuid=EXECUTOR_UUID$/, - "effectivePolicy": "unsafe-none", - "navigationURI": `${location.href}`, // referrer - "type": "navigation-to-document" + "previousResponseURL": "", + "referrer": `${location.href}`, // referrer + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" diff --git a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html index a4eaec15bbe5c..05bb150d856ee 100644 --- a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html +++ b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html @@ -29,10 +29,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "unsafe-none", - "navigationURI": /uuid=EXECUTOR_UUID$/, // next document URL - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -43,10 +42,10 @@ "report": { "body": { "disposition": "enforce", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin", - "navigationURI": `${location.href}`, // previous document url - "type": "navigation-to-document" + "previousResponseURL": `${location.href}`, // previous document url + "referrer": `${location.href}`, // referrer + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" @@ -71,10 +70,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "unsafe-none", - "navigationURI": /uuid=EXECUTOR_UUID$/, // next document URL - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -96,10 +94,9 @@ "report": { "body": { "disposition": "enforce", - "documentURI": `${location.href}`, "effectivePolicy": "unsafe-none", - "navigationURI": /uuid=EXECUTOR_UUID$/, // initial navigation url - "type": "navigation-from-document" + "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL + "type": "navigation-from-response" }, "url": `${location.href}`, "type": "coop" @@ -110,10 +107,10 @@ "report": { "body": { "disposition": "enforce", - "documentURI": /uuid=EXECUTOR_UUID$/, "effectivePolicy": "same-origin", - "navigationURI": `${location.href}`, // referrer - "type": "navigation-to-document" + "previousResponseURL": ``, + "referrer": `${location.href}`, // referrer + "type": "navigation-to-response" }, "url": /uuid=EXECUTOR_UUID$/, "type": "coop" diff --git a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-redirect-with-same-origin-allow-popups.https.html b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-redirect-with-same-origin-allow-popups.https.html index f2f06efd62810..3b513371b0257 100644 --- a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-redirect-with-same-origin-allow-popups.https.html +++ b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-redirect-with-same-origin-allow-popups.https.html @@ -100,7 +100,7 @@ // 5. Check a report sent to the openee. let report = await receiveReport( opener_report_token, - "navigation-to-document"); + "navigation-to-response"); assert_not_equals(report, "timeout", "Report not received"); assert_equals(report.type, "coop"); assert_equals(report.body.disposition, "enforce"); diff --git a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/resources/reporting-common.js b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/resources/reporting-common.js index ece74ab269d05..3b1820cebb8f1 100644 --- a/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/resources/reporting-common.js +++ b/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/resources/reporting-common.js @@ -17,8 +17,8 @@ function isCoopOpenerBreakageReport(report) { if (report.type != "coop") return false; - if (report.body.type != "navigation-from-document" && - report.body.type != "navigation-to-document") { + if (report.body.type != "navigation-from-response" && + report.body.type != "navigation-to-response") { return false; } @@ -98,14 +98,19 @@ function replaceFromRegexOrString(str, match, value) { // EXECUTOR_UUID: the uuid generated with token(). function replaceValuesInExpectedReport(expectedReport, executorUuid) { if (expectedReport.report.body !== undefined) { - if (expectedReport.report.body.documentURI !== undefined) { - expectedReport.report.body.documentURI = replaceFromRegexOrString( - expectedReport.report.body.documentURI, "EXECUTOR_UUID", + if (expectedReport.report.body.nextResponseURL !== undefined) { + expectedReport.report.body.nextResponseURL = replaceFromRegexOrString( + expectedReport.report.body.nextResponseURL, "EXECUTOR_UUID", executorUuid); } - if (expectedReport.report.body.navigationURI !== undefined) { - expectedReport.report.body.navigationURI = replaceFromRegexOrString( - expectedReport.report.body.navigationURI, "EXECUTOR_UUID", + if (expectedReport.report.body.previousResponseURL !== undefined) { + expectedReport.report.body.previousResponseURL = replaceFromRegexOrString( + expectedReport.report.body.previousResponseURL, "EXECUTOR_UUID", + executorUuid); + } + if (expectedReport.report.body.referrer !== undefined) { + expectedReport.report.body.referrer = replaceFromRegexOrString( + expectedReport.report.body.referrer, "EXECUTOR_UUID", executorUuid); } }