fetchpriority: verify basic invariants for adjustments

From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- .../fetchpriority/fetchpriority-adjustments.html | 53 ++++++++++ .../fetchpriority/support/fetch-tests-data.js | 90 ++++++++++++++-- .../support/fetch-tests/fetch-init.h2.html | 59 +++++++---- .../support/image-tests/image-initial-load.h2.html | 4 +- .../fetch/fetchpriority/support/link-tests-data.js | 32 +++--- .../fetchpriority/support/script-tests-data.js | 114 +++++++++++++++++++-- .../async-module-script-initial-load.h2.html | 4 + .../script-tests/async-script-initial-load.h2.html | 4 + .../deferred-script-initial-load.h2.html | 4 + .../module-script-dynamic-insertion.h2.html | 29 ++++-- .../module-script-initial-load.h2.html | 4 + .../script-tests/script-dynamic-insertion.h2.html | 33 ++++-- .../script-tests/script-initial-load-body.h2.html | 16 ++- .../script-tests/script-initial-load-head.h2.html | 3 + 14 files changed, 374 insertions(+), 75 deletions(-) create mode 100644 testing/web-platform/mozilla/tests/fetch/fetchpriority/fetchpriority-adjustments.html (limited to 'testing/web-platform/mozilla/tests/fetch') diff --git a/testing/web-platform/mozilla/tests/fetch/fetchpriority/fetchpriority-adjustments.html b/testing/web-platform/mozilla/tests/fetch/fetchpriority/fetchpriority-adjustments.html new file mode 100644 index 0000000000..71bfbcc0b5 --- /dev/null +++ b/testing/web-platform/mozilla/tests/fetch/fetchpriority/fetchpriority-adjustments.html @@ -0,0 +1,53 @@ + + +fetchpriority: verify basic invariants for adjustments + + + + diff --git a/testing/web-platform/mozilla/tests/fetch/fetchpriority/support/fetch-tests-data.js b/testing/web-platform/mozilla/tests/fetch/fetchpriority/support/fetch-tests-data.js index 4edb3ae171..7f5f77628c 100644 --- a/testing/web-platform/mozilla/tests/fetch/fetchpriority/support/fetch-tests-data.js +++ b/testing/web-platform/mozilla/tests/fetch/fetchpriority/support/fetch-tests-data.js @@ -1,36 +1,106 @@ export const kTestFolderName = "fetch-tests"; +// Use RequestInit's priority if specified, or RequestionInfo's priority otherwise. const kExpectedRequestsOfFetchAPI = [ { fileNameAndSuffix: "dummy.css?1", - internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_HIGH + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_LOW }, { fileNameAndSuffix: "dummy.css?2", internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_HIGH }, { fileNameAndSuffix: "dummy.css?3", - internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_HIGH + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL }, { fileNameAndSuffix: "dummy.css?4", internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_LOW }, { fileNameAndSuffix: "dummy.css?5", - internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_HIGH + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_LOW }, { fileNameAndSuffix: "dummy.css?6", - internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_LOW + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_HIGH }, { fileNameAndSuffix: "dummy.css?7", - internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_HIGH + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL }, { fileNameAndSuffix: "dummy.css?8", internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_HIGH }, { fileNameAndSuffix: "dummy.css?9", - internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_HIGH + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_LOW }, { fileNameAndSuffix: "dummy.css?10", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_HIGH + }, + { fileNameAndSuffix: "dummy.css?11", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?12", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?13", internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_LOW - } + }, + { fileNameAndSuffix: "dummy.css?14", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_HIGH + }, + { fileNameAndSuffix: "dummy.css?15", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?16", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, +]; + +const kExpectedRequestsOfFetchAPIDisabled = [ + { fileNameAndSuffix: "dummy.css?1", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?2", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?3", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?4", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?5", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?6", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?7", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?8", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?9", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?10", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?11", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?12", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?13", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?14", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?15", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, + { fileNameAndSuffix: "dummy.css?16", + internalPriority: SpecialPowers.Ci.nsISupportsPriority.PRIORITY_NORMAL + }, ]; export const kTestData = [ @@ -38,3 +108,9 @@ export const kTestData = [ expectedRequests: kExpectedRequestsOfFetchAPI } ]; + +export const kTestDataDisabled = [ + { testFileName: "fetch-init.h2.html", + expectedRequests: kExpectedRequestsOfFetchAPIDisabled + } +]; diff --git a/testing/web-platform/mozilla/tests/fetch/fetchpriority/support/fetch-tests/fetch-init.h2.html b/testing/web-platform/mozilla/tests/fetch/fetchpriority/support/fetch-tests/fetch-init.h2.html index 0e267b0a3a..d91dd5450f 100644 --- a/testing/web-platform/mozilla/tests/fetch/fetchpriority/support/fetch-tests/fetch-init.h2.html +++ b/testing/web-platform/mozilla/tests/fetch/fetchpriority/support/fetch-tests/fetch-init.h2.html @@ -10,51 +10,66 @@ onload = function() { const kData = [ { - description: 'fetch() with URL and request_init whose priority is "high" must be fetched with high load priority', - request_info: `${resource_url}?1`, + request_info: new Request(`${resource_url}?1`, {priority: 'low'}), + request_init: {priority: 'low'} + }, + { + request_info: new Request(`${resource_url}?2`, {priority: 'low'}), request_init: {priority: 'high'} }, { - description: 'fetch() with URL and request_init whose priority is "auto" must have no effect on resource load priority', - request_info: `${resource_url}?2`, + request_info: new Request(`${resource_url}?3`, {priority: 'low'}), request_init: {priority: 'auto'} }, { - description: 'fetch() with URL and request_init whose priority is missing must have no effect on resource load priority', - request_info: `${resource_url}?3`, - request_init: {} + request_info: new Request(`${resource_url}?4`, {priority: 'low'}) }, { - description: 'fetch() with URL and request_init whose priority is "low" must be fetched with low resource load priority', - request_info: `${resource_url}?4`, + request_info: new Request(`${resource_url}?5`, {priority: 'high'}), request_init: {priority: 'low'} }, { - description: 'fetch() with Request whose priority is "low" and request_init whose priority is "high" must have no effect on resource load priority', - request_info: new Request(`${resource_url}?5`, {priority: 'low'}), + request_info: new Request(`${resource_url}?6`, {priority: 'high'}), request_init: {priority: 'high'} }, { - description: 'fetch() with Request whose priority is "high" and request_init whose priority is "low" must be fetched with low resource load priority', - request_info: new Request(`${resource_url}?6`, {priority: 'high'}), + request_info: new Request(`${resource_url}?7`, {priority: 'high'}), + request_init: {priority: 'auto'} + }, + { + request_info: new Request(`${resource_url}?8`, {priority: 'high'}) + }, + { + request_info: new Request(`${resource_url}?9`, {priority: 'auto'}), request_init: {priority: 'low'} }, { - description: 'fetch() with Request whose priority is "high" and no request_init must be fetched with high resource load priority', - request_info: new Request(`${resource_url}?7`, {priority: 'high'}) + request_info: new Request(`${resource_url}?10`, {priority: 'auto'}), + request_init: {priority: 'high'} + }, + { + request_info: new Request(`${resource_url}?11`, {priority: 'auto'}), + request_init: {priority: 'auto'} + }, + { + request_info: new Request(`${resource_url}?12`, {priority: 'auto'}), + }, + { + request_info: `${resource_url}?13`, + request_init: {priority: 'low'} }, { - description: 'fetch() with Request whose priority is "auto" and no request_init must have no effect on resource load priority', - request_info: new Request(`${resource_url}?8`, {priority: 'auto'}) + request_info: `${resource_url}?14`, + request_init: {priority: 'high'} }, { - description: 'fetch() with Request whose priority is missing and no request_init must have no effect on resource load priority', - request_info: new Request(`${resource_url}?9`) + request_info: `${resource_url}?15`, + request_init: {priority: 'auto'} }, { - description: 'fetch() with Request whose priority is "low" and no request_init must be fetched with low resource load priority', - request_info: new Request(`${resource_url}?10`, {priority: 'low'}) - } + request_info: `${resource_url}?16`, + request_init: {} + }, ]; for (const data of kData) { const response = fetch(data.request_info, data.request_init); diff --git a/testing/web-platform/mozilla/tests/fetch/fetchpriority/support/image-tests/image-initial-load.h2.html b/testing/web-platform/mozilla/tests/fetch/fetchpriority/support/image-tests/image-initial-load.h2.html index c3ee532d9e..9cc171b5dd 100644 --- a/testing/web-platform/mozilla/tests/fetch/fetchpriority/support/image-tests/image-initial-load.h2.html +++ b/testing/web-platform/mozilla/tests/fetch/fetchpriority/support/image-tests/image-initial-load.h2.html @@ -5,8 +5,8 @@ fetchpriority -

+ + + + + + + + + + + + + + + + + + + +

- - - - + + + + + + + + +