diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/reading-order/tentative/grid-order-with-popover.html b/tests/wpt/tests/shadow-dom/focus-navigation/reading-order/tentative/grid-order-with-popover.html
index 2e98c041570..c96a0c4fcf7 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/reading-order/tentative/grid-order-with-popover.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/reading-order/tentative/grid-order-with-popover.html
@@ -1,5 +1,6 @@
+
CSS Display: reading-order-items with value grid-order
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/reading-order/tentative/grid-order-with-slots.html b/tests/wpt/tests/shadow-dom/focus-navigation/reading-order/tentative/grid-order-with-slots.html
index 3045001e1d8..ed658b3510a 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/reading-order/tentative/grid-order-with-slots.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/reading-order/tentative/grid-order-with-slots.html
@@ -1,5 +1,6 @@
+
CSS Display: reading-order-items with value grid-order in Shadow DOM
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/reading-order/tentative/grid-order.html b/tests/wpt/tests/shadow-dom/focus-navigation/reading-order/tentative/grid-order.html
index 1b86ab0b25a..3ee91358fd6 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/reading-order/tentative/grid-order.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/reading-order/tentative/grid-order.html
@@ -1,5 +1,6 @@
+
CSS Display: reading-order-items with value grid-order
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/resources/focus-utils.js b/tests/wpt/tests/shadow-dom/focus-navigation/resources/focus-utils.js
index f4056dc1688..4aadfe24cbc 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/resources/focus-utils.js
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/resources/focus-utils.js
@@ -7,7 +7,7 @@ function waitForRender() {
async function navigateFocusForward() {
await waitForRender();
const kTab = '\uE004';
- await new test_driver.send_keys(document.documentElement,kTab);
+ await new test_driver.send_keys(document.body, kTab);
await waitForRender();
}
@@ -183,7 +183,7 @@ async function runFocusTestCases() {
for (let testCase of testCases) {
promise_test(async () => {
const expected = testCase.dataset.expect.split(',');
- await assert_focus_navigation_forward(expected);
+ await assert_focus_navigation_bidirectional(expected);
}, testCase.dataset.description);
}
}
diff --git a/tests/wpt/tests/shared-storage/cross-origin-create-worklet-unrevealed-failure-false-shared-storage-cross-origin-worklet-allowed.tentative.https.sub.html b/tests/wpt/tests/shared-storage/cross-origin-create-worklet-failure-false-shared-storage-cross-origin-worklet-allowed.tentative.https.sub.html
similarity index 86%
rename from tests/wpt/tests/shared-storage/cross-origin-create-worklet-unrevealed-failure-false-shared-storage-cross-origin-worklet-allowed.tentative.https.sub.html
rename to tests/wpt/tests/shared-storage/cross-origin-create-worklet-failure-false-shared-storage-cross-origin-worklet-allowed.tentative.https.sub.html
index f1f37b0affd..db361776f63 100644
--- a/tests/wpt/tests/shared-storage/cross-origin-create-worklet-unrevealed-failure-false-shared-storage-cross-origin-worklet-allowed.tentative.https.sub.html
+++ b/tests/wpt/tests/shared-storage/cross-origin-create-worklet-failure-false-shared-storage-cross-origin-worklet-allowed.tentative.https.sub.html
@@ -19,11 +19,10 @@ promise_test(async t => {
`&shared_storage_cross_origin_worklet_allowed_header=?0` +
`&token=${ancestor_key}`;
- // The network error for `createWorklet()` won't be revealed to the
- // cross-origin caller.
- await sharedStorage.createWorklet(
+ return promise_rejects_dom(t, "OperationError",
+ sharedStorage.createWorklet(
helper_url + `&action=store-cookie`,
- { credentials: "include" });
+ { credentials: "include" }));
}, 'createWorklet() with cross-origin module script and credentials ' +
'"include", and with the Shared-Storage-Cross-Origin-Worklet-Allowed ' +
'response header value set to false (?0)');
diff --git a/tests/wpt/tests/shared-storage/cross-origin-create-worklet-unrevealed-failure-missing-access-control-allow-credentials.tentative.https.sub.html b/tests/wpt/tests/shared-storage/cross-origin-create-worklet-failure-missing-access-control-allow-credentials.tentative.https.sub.html
similarity index 85%
rename from tests/wpt/tests/shared-storage/cross-origin-create-worklet-unrevealed-failure-missing-access-control-allow-credentials.tentative.https.sub.html
rename to tests/wpt/tests/shared-storage/cross-origin-create-worklet-failure-missing-access-control-allow-credentials.tentative.https.sub.html
index dd6347e4631..8887aad64dc 100644
--- a/tests/wpt/tests/shared-storage/cross-origin-create-worklet-unrevealed-failure-missing-access-control-allow-credentials.tentative.https.sub.html
+++ b/tests/wpt/tests/shared-storage/cross-origin-create-worklet-failure-missing-access-control-allow-credentials.tentative.https.sub.html
@@ -18,11 +18,10 @@ promise_test(async t => {
`&shared_storage_cross_origin_worklet_allowed_header=?1` +
`&token=${ancestor_key}`;
- // The network error for `createWorklet()` won't be revealed to the
- // cross-origin caller.
- await sharedStorage.createWorklet(
+ return promise_rejects_dom(t, "OperationError",
+ sharedStorage.createWorklet(
helper_url + `&action=store-cookie`,
- { credentials: "include" });
+ { credentials: "include" }));
}, 'createWorklet() with cross-origin module script and credentials ' +
'"include", and without the Access-Control-Allow-Credentials response ' +
'header');
diff --git a/tests/wpt/tests/shared-storage/cross-origin-create-worklet-unrevealed-failure-missing-access-control-allow-origin.tentative.https.sub.html b/tests/wpt/tests/shared-storage/cross-origin-create-worklet-failure-missing-access-control-allow-origin.tentative.https.sub.html
similarity index 85%
rename from tests/wpt/tests/shared-storage/cross-origin-create-worklet-unrevealed-failure-missing-access-control-allow-origin.tentative.https.sub.html
rename to tests/wpt/tests/shared-storage/cross-origin-create-worklet-failure-missing-access-control-allow-origin.tentative.https.sub.html
index 1f3223a5644..58a2f3a77bb 100644
--- a/tests/wpt/tests/shared-storage/cross-origin-create-worklet-unrevealed-failure-missing-access-control-allow-origin.tentative.https.sub.html
+++ b/tests/wpt/tests/shared-storage/cross-origin-create-worklet-failure-missing-access-control-allow-origin.tentative.https.sub.html
@@ -18,11 +18,10 @@ promise_test(async t => {
`&shared_storage_cross_origin_worklet_allowed_header=?1` +
`&token=${ancestor_key}`;
- // The network error for `createWorklet()` won't be revealed to the
- // cross-origin caller.
- await sharedStorage.createWorklet(
+ return promise_rejects_dom(t, "OperationError",
+ sharedStorage.createWorklet(
helper_url + `&action=store-cookie`,
- { credentials: "include" });
+ { credentials: "include" }));
}, 'createWorklet() with cross-origin module script and credentials ' +
'"include", and without the Access-Control-Allow-Origin response header');
diff --git a/tests/wpt/tests/shared-storage/cross-origin-create-worklet-unrevealed-failure-missing-shared-storage-cross-origin-worklet-allowed.tentative.https.sub.html b/tests/wpt/tests/shared-storage/cross-origin-create-worklet-failure-missing-shared-storage-cross-origin-worklet-allowed.tentative.https.sub.html
similarity index 85%
rename from tests/wpt/tests/shared-storage/cross-origin-create-worklet-unrevealed-failure-missing-shared-storage-cross-origin-worklet-allowed.tentative.https.sub.html
rename to tests/wpt/tests/shared-storage/cross-origin-create-worklet-failure-missing-shared-storage-cross-origin-worklet-allowed.tentative.https.sub.html
index f96e4d596e8..5b140a8141c 100644
--- a/tests/wpt/tests/shared-storage/cross-origin-create-worklet-unrevealed-failure-missing-shared-storage-cross-origin-worklet-allowed.tentative.https.sub.html
+++ b/tests/wpt/tests/shared-storage/cross-origin-create-worklet-failure-missing-shared-storage-cross-origin-worklet-allowed.tentative.https.sub.html
@@ -18,11 +18,10 @@ promise_test(async t => {
`&access_control_allow_credentials_header=true` +
`&token=${ancestor_key}`;
- // The network error for `createWorklet()`` won't be revealed to the
- // cross-origin caller.
- await sharedStorage.createWorklet(
+ return promise_rejects_dom(t, "OperationError",
+ sharedStorage.createWorklet(
helper_url + `&action=store-cookie`,
- { credentials: "include" });
+ { credentials: "include" }));
}, 'createWorklet() with cross-origin module script and credentials ' +
'"include", and without the Shared-Storage-Cross-Origin-Worklet-Allowed ' +
'response header');
diff --git a/tests/wpt/tests/shared-storage/resources/shared-storage-writable-fetch-request-in-sandboxed-iframe-inner.https.sub.html b/tests/wpt/tests/shared-storage/resources/shared-storage-writable-fetch-request-in-sandboxed-iframe-inner.https.sub.html
new file mode 100644
index 00000000000..ef8b2459f3c
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/resources/shared-storage-writable-fetch-request-in-sandboxed-iframe-inner.https.sub.html
@@ -0,0 +1,54 @@
+
+
+
+
+
+
diff --git a/tests/wpt/tests/shared-storage/resources/shared-storage-writable-iframe-request-in-sandboxed-iframe-inner.https.sub.html b/tests/wpt/tests/shared-storage/resources/shared-storage-writable-iframe-request-in-sandboxed-iframe-inner.https.sub.html
new file mode 100644
index 00000000000..4d1b7ab198d
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/resources/shared-storage-writable-iframe-request-in-sandboxed-iframe-inner.https.sub.html
@@ -0,0 +1,47 @@
+
+
+
+
+
+
diff --git a/tests/wpt/tests/shared-storage/resources/shared-storage-writable-img-request-in-sandboxed-iframe-inner.https.sub.html b/tests/wpt/tests/shared-storage/resources/shared-storage-writable-img-request-in-sandboxed-iframe-inner.https.sub.html
new file mode 100644
index 00000000000..8842a4689d8
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/resources/shared-storage-writable-img-request-in-sandboxed-iframe-inner.https.sub.html
@@ -0,0 +1,37 @@
+
+
+
+
+
+
diff --git a/tests/wpt/tests/shared-storage/shared-storage-writable-fetch-request-in-sandboxed-frame.tentative.https.html b/tests/wpt/tests/shared-storage/shared-storage-writable-fetch-request-in-sandboxed-frame.tentative.https.html
new file mode 100644
index 00000000000..de935b22fe0
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/shared-storage-writable-fetch-request-in-sandboxed-frame.tentative.https.html
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/wpt/tests/shared-storage/shared-storage-writable-iframe-request-in-sandboxed-frame.tentative.https.html b/tests/wpt/tests/shared-storage/shared-storage-writable-iframe-request-in-sandboxed-frame.tentative.https.html
new file mode 100644
index 00000000000..d2d07fcc330
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/shared-storage-writable-iframe-request-in-sandboxed-frame.tentative.https.html
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/wpt/tests/shared-storage/shared-storage-writable-img-request-in-sandboxed-frame.tentative.https.html b/tests/wpt/tests/shared-storage/shared-storage-writable-img-request-in-sandboxed-frame.tentative.https.html
new file mode 100644
index 00000000000..a901500d66a
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/shared-storage-writable-img-request-in-sandboxed-frame.tentative.https.html
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/wpt/tests/speculation-rules/prefetch/navigation-timing-requestStart-responseStart.https.html b/tests/wpt/tests/speculation-rules/prefetch/navigation-timing-requestStart-responseStart.https.html
index 9c9371c4c31..2687b5bf2c2 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/navigation-timing-requestStart-responseStart.https.html
+++ b/tests/wpt/tests/speculation-rules/prefetch/navigation-timing-requestStart-responseStart.https.html
@@ -5,48 +5,92 @@
+
-
-
+
+
+
+
diff --git a/tests/wpt/tests/speculation-rules/prefetch/resources/slow-executor.py b/tests/wpt/tests/speculation-rules/prefetch/resources/slow-executor.py
new file mode 100644
index 00000000000..379ab552b94
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/prefetch/resources/slow-executor.py
@@ -0,0 +1,13 @@
+import os.path
+import time
+
+from wptserve.pipes import template
+
+def main(request, response):
+ time.sleep(float(request.GET.first(b"delay")))
+ response.headers.set(b"Content-Type", b"text/html")
+ response.headers.set(b"Cache-Control", b"no-store")
+ response.content = template(
+ request,
+ open(os.path.join(os.path.dirname(__file__), "executor.sub.html"), "rb").read())
+
diff --git a/tests/wpt/tests/storage-access-api/WEB_FEATURES.yml b/tests/wpt/tests/storage-access-api/WEB_FEATURES.yml
new file mode 100644
index 00000000000..a24e831c4aa
--- /dev/null
+++ b/tests/wpt/tests/storage-access-api/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: storage-access
+ files: "**"
diff --git a/tests/wpt/tests/storage-access-api/requestStorageAccess-dedicated-worker.tentative.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-dedicated-worker.tentative.sub.https.window.js
index 6c3d616e26a..5c3089bf347 100644
--- a/tests/wpt/tests/storage-access-api/requestStorageAccess-dedicated-worker.tentative.sub.https.window.js
+++ b/tests/wpt/tests/storage-access-api/requestStorageAccess-dedicated-worker.tentative.sub.https.window.js
@@ -40,10 +40,10 @@
assert_true(cookieStringHasCookie("cookie", "unpartitioned",
await MessageWorker(frame, {command: "load"})),
"Worker's load was credentialed.");
- assert_true(cookieStringHasCookie("cookie", "unpartitioned",
+ assert_false(cookieStringHasCookie("cookie", "unpartitioned",
await MessageWorker(frame, {command: "fetch", url: altRootEchoCookies})),
- "Worker's fetch is credentialed.");
- }, "Workers inherit storage access");
+ "Worker's fetch is uncredentialed.");
+ }, "Workers don't inherit storage access");
promise_test(async (t) => {
await MaybeSetStorageAccess("*", "*", "blocked");
diff --git a/tests/wpt/tests/svg/painting/reftests/paint-context-005-ref.svg b/tests/wpt/tests/svg/painting/reftests/paint-context-005-ref.svg
deleted file mode 100644
index fa30a5361cb..00000000000
--- a/tests/wpt/tests/svg/painting/reftests/paint-context-005-ref.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- Paint: 'paint-order'
-
-
-
-
-
-
-
-
-
diff --git a/tests/wpt/tests/svg/painting/reftests/paint-context-005.svg b/tests/wpt/tests/svg/painting/reftests/paint-context-005.svg
index 8bbfff8d474..a76c7af88ff 100644
--- a/tests/wpt/tests/svg/painting/reftests/paint-context-005.svg
+++ b/tests/wpt/tests/svg/painting/reftests/paint-context-005.svg
@@ -10,7 +10,6 @@
href="mailto:szager@chromium.org"/>
-
diff --git a/tests/wpt/tests/svg/types/scripted/SVGLength-rlh.html b/tests/wpt/tests/svg/types/scripted/SVGLength-rlh.html
new file mode 100644
index 00000000000..411013b65b5
--- /dev/null
+++ b/tests/wpt/tests/svg/types/scripted/SVGLength-rlh.html
@@ -0,0 +1,31 @@
+
+
SVGLength with 'rlh' unit
+
+
+
+
+
+
diff --git a/tests/wpt/tests/tools/ci/requirements_build.txt b/tests/wpt/tests/tools/ci/requirements_build.txt
index 7b4f8619b2e..e74e4e5302d 100644
--- a/tests/wpt/tests/tools/ci/requirements_build.txt
+++ b/tests/wpt/tests/tools/ci/requirements_build.txt
@@ -1,5 +1,5 @@
cairocffi==1.7.0
fonttools==4.51.0
genshi==0.7.7
-jinja2==3.1.3
+jinja2==3.1.4
pyyaml==6.0.1
diff --git a/tests/wpt/tests/tools/ci/requirements_tc.txt b/tests/wpt/tests/tools/ci/requirements_tc.txt
index aa57643b9b5..b3c1c51f129 100644
--- a/tests/wpt/tests/tools/ci/requirements_tc.txt
+++ b/tests/wpt/tests/tools/ci/requirements_tc.txt
@@ -1,4 +1,4 @@
pygithub==2.3.0
pyyaml==6.0.1
requests==2.31.0
-taskcluster==64.2.7
+taskcluster==64.2.8
diff --git a/tests/wpt/tests/tools/lint/lint.py b/tests/wpt/tests/tools/lint/lint.py
index e3a555413b8..32bc7ece7b1 100644
--- a/tests/wpt/tests/tools/lint/lint.py
+++ b/tests/wpt/tests/tools/lint/lint.py
@@ -394,10 +394,12 @@ def check_parsed(repo_root: Text, path: Text, f: IO[bytes]) -> List[rules.Error]
if source_file.root is None:
return [rules.ParseFailed.error(path)]
- if source_file.type == "manual" and not source_file.name_is_manual:
+ test_type = source_file.type
+
+ if test_type == "manual" and not source_file.name_is_manual:
errors.append(rules.ContentManual.error(path))
- if source_file.type == "visual" and not source_file.name_is_visual:
+ if test_type == "visual" and not source_file.name_is_visual:
errors.append(rules.ContentVisual.error(path))
about_blank_parts = urlsplit("about:blank")
@@ -428,6 +430,10 @@ def check_parsed(repo_root: Text, path: Text, f: IO[bytes]) -> List[rules.Error]
errors.append(rules.NonexistentRef.error(path,
(reference_rel, href)))
+ if source_file.reftest_nodes:
+ if test_type not in ("print-reftest", "reftest"):
+ errors.append(rules.ReferenceInOtherType.error(path, (test_type,)))
+
if len(source_file.timeout_nodes) > 1:
errors.append(rules.MultipleTimeout.error(path))
@@ -450,7 +456,6 @@ def check_parsed(repo_root: Text, path: Text, f: IO[bytes]) -> List[rules.Error]
testharnessreport_nodes: List[ElementTree.Element] = []
if source_file.testharness_nodes:
- test_type = source_file.manifest_items()[0]
if test_type not in ("testharness", "manual"):
errors.append(rules.TestharnessInOtherType.error(path, (test_type,)))
if len(source_file.testharness_nodes) > 1:
@@ -470,6 +475,9 @@ def check_parsed(repo_root: Text, path: Text, f: IO[bytes]) -> List[rules.Error]
testdriver_vendor_nodes: List[ElementTree.Element] = []
if source_file.testdriver_nodes:
+ if test_type != "testharness":
+ errors.append(rules.TestdriverInUnsupportedType.error(path, (test_type,)))
+
if len(source_file.testdriver_nodes) > 1:
errors.append(rules.MultipleTestdriver.error(path))
diff --git a/tests/wpt/tests/tools/lint/rules.py b/tests/wpt/tests/tools/lint/rules.py
index c7b3a59b19e..8dba7817a9e 100644
--- a/tests/wpt/tests/tools/lint/rules.py
+++ b/tests/wpt/tests/tools/lint/rules.py
@@ -279,6 +279,11 @@ class TestdriverVendorPath(Rule):
description = "testdriver-vendor.js script seen with incorrect path"
+class TestdriverInUnsupportedType(Rule):
+ name = "TESTDRIVER-IN-UNSUPPORTED-TYPE"
+ description = "testdriver.js included in a %s test, which doesn't support testdriver.js"
+
+
class OpenNoMode(Rule):
name = "OPEN-NO-MODE"
description = "File opened without providing an explicit mode (note: binary files must be read with 'b' in the mode flags)"
@@ -324,6 +329,11 @@ class TestharnessInOtherType(Rule):
description = "testharness.js included in a %s test"
+class ReferenceInOtherType(Rule):
+ name = "REFERENCE-IN-OTHER-TYPE"
+ description = "Reference link included in a %s test"
+
+
class DuplicateBasenamePath(Rule):
name = "DUPLICATE-BASENAME-PATH"
description = collapse("""
diff --git a/tests/wpt/tests/tools/lint/tests/test_file_lints.py b/tests/wpt/tests/tools/lint/tests/test_file_lints.py
index f2ebcd9080a..e77048b3156 100644
--- a/tests/wpt/tests/tools/lint/tests/test_file_lints.py
+++ b/tests/wpt/tests/tools/lint/tests/test_file_lints.py
@@ -347,9 +347,47 @@ def test_multiple_testharnessreport():
]
+def test_testdriver_in_unsupported():
+ code = b"""
+
+
+
+
+
+"""
+ error_map = check_with_files(code)
+
+ for (filename, (errors, kind)) in error_map.items():
+ check_errors(errors)
+
+ if kind in ["web-lax", "web-strict"]:
+ assert errors == [
+ (
+ "NON-EXISTENT-REF",
+ "Reference test with a non-existent 'match' relationship reference: "
+ "'test-ref.html'",
+ filename,
+ None,
+ ),
+ (
+ "TESTDRIVER-IN-UNSUPPORTED-TYPE",
+ "testdriver.js included in a reftest test, which doesn't support "
+ "testdriver.js",
+ filename,
+ None,
+ ),
+ ]
+ elif kind == "python":
+ assert errors == [
+ ("PARSE-FAILED", "Unable to parse file", filename, 2),
+ ]
+
+
def test_early_testdriver_vendor():
code = b"""
+
+
@@ -669,6 +707,41 @@ def test_late_timeout():
]
+def test_reference_in_non_reference():
+ code = b"""
+
+
+
+
+
+"""
+ error_map = check_with_files(code)
+
+ for (filename, (errors, kind)) in error_map.items():
+ check_errors(errors)
+
+ if kind in ["web-lax", "web-strict"]:
+ assert errors == [
+ (
+ "NON-EXISTENT-REF",
+ "Reference test with a non-existent 'match' relationship reference: "
+ "'test-ref.html'",
+ filename,
+ None,
+ ),
+ (
+ "REFERENCE-IN-OTHER-TYPE",
+ "Reference link included in a testharness test",
+ filename,
+ None,
+ ),
+ ]
+ elif kind == "python":
+ assert errors == [
+ ("PARSE-FAILED", "Unable to parse file", filename, 2),
+ ]
+
+
def test_print_function():
error_map = check_with_files(b"def foo():\n print('function')\n")
diff --git a/tests/wpt/tests/tools/requirements_tests.txt b/tests/wpt/tests/tools/requirements_tests.txt
index 24785f35313..74792e61314 100644
--- a/tests/wpt/tests/tools/requirements_tests.txt
+++ b/tests/wpt/tests/tools/requirements_tests.txt
@@ -2,5 +2,5 @@ httpx[http2]==0.27.0
json-e==4.7.0
jsonschema==4.17.3
pyyaml==6.0.1
-taskcluster==64.2.7
+taskcluster==64.2.8
mozterm==1.0.0
diff --git a/tests/wpt/tests/tools/webdriver/webdriver/bidi/transport.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/transport.py
index d61ebaddea7..14b990f971d 100644
--- a/tests/wpt/tests/tools/webdriver/webdriver/bidi/transport.py
+++ b/tests/wpt/tests/tools/webdriver/webdriver/bidi/transport.py
@@ -6,6 +6,8 @@ from typing import Any, Callable, Coroutine, List, Optional, Mapping
import websockets
+from websockets.exceptions import ConnectionClosed
+
logger = logging.getLogger("webdriver.bidi")
@@ -70,10 +72,13 @@ class Transport:
async def read_messages(self) -> None:
assert self.connection is not None
- async for msg in self.connection:
- if not isinstance(msg, str):
- raise ValueError("Got a binary message")
- await self.handle(msg)
+ try:
+ async for msg in self.connection:
+ if not isinstance(msg, str):
+ raise ValueError("Got a binary message")
+ await self.handle(msg)
+ except ConnectionClosed:
+ logger.debug("connection closed while reading messages")
async def wait_closed(self) -> None:
if self.connection and not self.connection.closed:
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/base.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/base.py
index 6b1465cde8a..dd4fc314fc0 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/base.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/base.py
@@ -3,8 +3,6 @@ import errno
import os
import platform
import socket
-import time
-import traceback
from abc import ABCMeta, abstractmethod
from typing import cast, Any, List, Mapping, Optional, Tuple, Type
@@ -12,7 +10,6 @@ import mozprocess
from mozdebug import DebuggerInfo
from mozlog.structuredlog import StructuredLogger
-from ..environment import wait_for_service
from ..testloader import GroupMetadata
from ..wptcommandline import require_arg # noqa: F401
from ..wpttest import Test
@@ -319,7 +316,6 @@ class WebDriverBrowser(Browser):
self.env = os.environ.copy() if env is None else env
self.webdriver_args = webdriver_args if webdriver_args is not None else []
- self.init_deadline: Optional[float] = None
self._output_handler: Optional[OutputHandler] = None
self._cmd = None
self._proc: Optional[mozprocess.ProcessHandler] = None
@@ -330,7 +326,6 @@ class WebDriverBrowser(Browser):
return [self.webdriver_binary] + self.webdriver_args
def start(self, group_metadata: GroupMetadata, **kwargs: Any) -> None:
- self.init_deadline = time.time() + self.init_timeout
try:
self._run_server(group_metadata, **kwargs)
except KeyboardInterrupt:
@@ -345,7 +340,6 @@ class WebDriverBrowser(Browser):
return OutputHandler(self.logger, cmd)
def _run_server(self, group_metadata: GroupMetadata, **kwargs: Any) -> None:
- assert self.init_deadline is not None
cmd = self.make_command()
self._output_handler = self.create_output_handler(cmd)
@@ -365,21 +359,7 @@ class WebDriverBrowser(Browser):
raise
self._output_handler.after_process_start(self._proc.pid)
- try:
- wait_for_service(
- self.logger,
- self.host,
- self.port,
- timeout=self.init_deadline - time.time(),
- server_process=self._proc,
- )
- except Exception:
- self.logger.error(
- "WebDriver was not accessible "
- f"within the timeout:\n{traceback.format_exc()}")
- raise
- finally:
- self._output_handler.start(group_metadata=group_metadata, **kwargs)
+ self._output_handler.start(group_metadata=group_metadata, **kwargs)
self.logger.debug("_run complete")
def stop(self, force: bool = False) -> bool:
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py
index d977930a289..d22da8568ad 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -910,6 +910,7 @@ class FirefoxWdSpecBrowser(WebDriverBrowser):
self.binary = binary
self.package_name = package_name
self.webdriver_binary = webdriver_binary
+ self.init_deadline = None
self.stackfix_dir = stackfix_dir
self.symbols_path = symbols_path
@@ -958,6 +959,7 @@ class FirefoxWdSpecBrowser(WebDriverBrowser):
def start(self, group_metadata, **kwargs):
self.leak_report_file = setup_leak_report(self.leak_check, self.profile, self.env)
+ self.init_deadline = time.time() + self.init_timeout
super().start(group_metadata, **kwargs)
def stop(self, force=False):
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py
index f5641471562..46d38f14c55 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py
@@ -22,7 +22,7 @@ from .executorwebdriver import (
WebDriverTestharnessExecutor,
WebDriverTestharnessProtocolPart,
)
-from .protocol import PrintProtocolPart
+from .protocol import PrintProtocolPart, ProtocolPart
here = os.path.dirname(__file__)
@@ -80,8 +80,6 @@ class ChromeDriverTestharnessProtocolPart(WebDriverTestharnessProtocolPart):
# exposed to the base WebDriver testharness executor.
self.test_window = None
self.reuse_window = self.parent.reuse_window
- # Company prefix to apply to vendor-specific WebDriver extension commands.
- self.cdp_company_prefix = "goog"
def close_test_window(self):
if self.test_window:
@@ -106,13 +104,7 @@ class ChromeDriverTestharnessProtocolPart(WebDriverTestharnessProtocolPart):
self.webdriver.window_handle = self.test_window
# Reset navigation history with Chrome DevTools Protocol:
# https://chromedevtools.github.io/devtools-protocol/tot/Page/#method-resetNavigationHistory
- body = {
- "cmd": "Page.resetNavigationHistory",
- "params": {},
- }
- self.webdriver.send_session_command("POST",
- self.cdp_company_prefix + "/cdp/execute",
- body=body)
+ self.parent.cdp.execute_cdp_command("Page.resetNavigationHistory")
self.webdriver.url = "about:blank"
return
except error.NoSuchWindowException:
@@ -139,8 +131,6 @@ class ChromeDriverPrintProtocolPart(PrintProtocolPart):
def setup(self):
self.webdriver = self.parent.webdriver
self.runner_handle = None
- # Company prefix to apply to vendor-specific WebDriver extension commands.
- self.cdp_company_prefix = "goog"
def load_runner(self):
url = urljoin(self.parent.executor.server_url("http"), "/print_pdf_runner.html")
@@ -158,23 +148,18 @@ class ChromeDriverPrintProtocolPart(PrintProtocolPart):
def render_as_pdf(self, width, height):
margin = 0.5
- body = {
- "cmd": "Page.printToPDF",
- "params": {
- # Chrome accepts dimensions in inches; we are using cm
- "paperWidth": width / 2.54,
- "paperHeight": height / 2.54,
- "marginLeft": margin,
- "marginRight": margin,
- "marginTop": margin,
- "marginBottom": margin,
- "shrinkToFit": False,
- "printBackground": True,
- }
+ params = {
+ # Chrome accepts dimensions in inches; we are using cm
+ "paperWidth": width / 2.54,
+ "paperHeight": height / 2.54,
+ "marginLeft": margin,
+ "marginRight": margin,
+ "marginTop": margin,
+ "marginBottom": margin,
+ "shrinkToFit": False,
+ "printBackground": True,
}
- return self.webdriver.send_session_command("POST",
- self.cdp_company_prefix + "/cdp/execute",
- body=body)["data"]
+ return self.parent.cdp.execute_cdp_command("Page.printToPDF", params)["data"]
def pdf_to_png(self, pdf_base64, ranges):
handle = self.webdriver.window_handle
@@ -191,19 +176,33 @@ render('%s').then(result => callback(result))""" % pdf_base64)
class ChromeDriverFedCMProtocolPart(WebDriverFedCMProtocolPart):
- def setup(self):
- self.webdriver = self.parent.webdriver
- # Company prefix to apply to vendor-specific WebDriver extension commands.
- self.fedcm_company_prefix = "goog"
-
-
def confirm_idp_login(self):
return self.webdriver.send_session_command("POST",
- self.fedcm_company_prefix + "/fedcm/confirmidplogin")
+ f"{self.parent.vendor_prefix}/fedcm/confirmidplogin")
+
+
+class ChromeDriverDevToolsProtocolPart(ProtocolPart):
+ """A low-level API for sending Chrome DevTools Protocol [0] commands directly to the browser.
+
+ Prefer using standard APIs where possible.
+
+ [0]: https://chromedevtools.github.io/devtools-protocol/
+ """
+ name = "cdp"
+
+ def setup(self):
+ self.webdriver = self.parent.webdriver
+
+ def execute_cdp_command(self, command, params=None):
+ body = {"cmd": command, "params": params or {}}
+ return self.webdriver.send_session_command("POST",
+ f"{self.parent.vendor_prefix}/cdp/execute",
+ body=body)
class ChromeDriverProtocol(WebDriverProtocol):
implements = [
+ ChromeDriverDevToolsProtocolPart,
ChromeDriverFedCMProtocolPart,
ChromeDriverPrintProtocolPart,
ChromeDriverTestharnessProtocolPart,
@@ -212,6 +211,8 @@ class ChromeDriverProtocol(WebDriverProtocol):
part.name != ChromeDriverFedCMProtocolPart.name)
]
reuse_window = False
+ # Prefix to apply to vendor-specific WebDriver extension commands.
+ vendor_prefix = "goog"
class ChromeDriverRefTestExecutor(WebDriverRefTestExecutor, _SanitizerMixin): # type: ignore
@@ -225,6 +226,24 @@ class ChromeDriverTestharnessExecutor(WebDriverTestharnessExecutor, _SanitizerMi
super().__init__(*args, **kwargs)
self.protocol.reuse_window = reuse_window
+ def setup(self, runner):
+ super().setup(runner)
+ # Chromium requires the `background-sync` permission for reporting APIs
+ # to work. Not all embedders (notably, `chrome --headless=old`) grant
+ # `background-sync` by default, so this CDP call ensures the permission
+ # is granted for all origins, in line with the background sync spec's
+ # recommendation [0].
+ #
+ # WebDriver's "Set Permission" command can only act on the test's
+ # origin, which may be too limited.
+ #
+ # [0]: https://wicg.github.io/background-sync/spec/#permission
+ params = {
+ "permission": {"name": "background-sync"},
+ "setting": "granted",
+ }
+ self.protocol.cdp.execute_cdp_command("Browser.setPermission", params)
+
class ChromeDriverPrintRefTestExecutor(ChromeDriverRefTestExecutor):
protocol_cls = ChromeDriverProtocol
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executoredge.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executoredge.py
index 3b62cb7477b..ad546b7e840 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executoredge.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executoredge.py
@@ -1,101 +1,82 @@
-# mypy: allow-untyped-defs
-
-import os
-
-from .executorwebdriver import (
- WebDriverCrashtestExecutor,
- WebDriverProtocol,
- WebDriverRefTestExecutor,
- WebDriverRun,
- WebDriverTestharnessExecutor,
-)
-
-from .executorchrome import (
- ChromeDriverPrintProtocolPart,
- ChromeDriverTestharnessProtocolPart,
- make_sanitizer_mixin,
-)
-
-here = os.path.dirname(__file__)
-
-_SanitizerMixin = make_sanitizer_mixin(WebDriverCrashtestExecutor)
-
-class EdgeDriverTestharnessProtocolPart(ChromeDriverTestharnessProtocolPart):
- def setup(self):
- super().setup()
- self.cdp_company_prefix = "ms"
-
-
-class EdgeDriverPrintProtocolPart(ChromeDriverPrintProtocolPart):
- def setup(self):
- super().setup()
- self.cdp_company_prefix = "ms"
-
-
-class EdgeDriverProtocol(WebDriverProtocol):
- implements = [
- EdgeDriverPrintProtocolPart,
- EdgeDriverTestharnessProtocolPart,
- *(part for part in WebDriverProtocol.implements
- if part.name != EdgeDriverTestharnessProtocolPart.name)
- ]
- reuse_window = False
-
-
-class EdgeDriverRefTestExecutor(WebDriverRefTestExecutor, _SanitizerMixin): # type: ignore
- protocol_cls = EdgeDriverProtocol
-
-
-class EdgeDriverTestharnessExecutor(WebDriverTestharnessExecutor, _SanitizerMixin): # type: ignore
- protocol_cls = EdgeDriverProtocol
-
- def __init__(self, *args, reuse_window=False, **kwargs):
- super().__init__(*args, **kwargs)
- self.protocol.reuse_window = reuse_window
-
-
-class EdgeDriverPrintRefTestExecutor(EdgeDriverRefTestExecutor):
- protocol_cls = EdgeDriverProtocol
-
- def setup(self, runner):
- super().setup(runner)
- self.protocol.pdf_print.load_runner()
- self.has_window = False
- with open(os.path.join(here, "reftest.js")) as f:
- self.script = f.read()
-
- def screenshot(self, test, viewport_size, dpi, page_ranges):
- # https://github.com/web-platform-tests/wpt/issues/7140
- assert dpi is None
-
- if not self.has_window:
- self.protocol.base.execute_script(self.script)
- self.protocol.base.set_window(self.protocol.webdriver.handles[-1])
- self.has_window = True
-
- self.viewport_size = viewport_size
- self.page_ranges = page_ranges.get(test.url)
- timeout = self.timeout_multiplier * test.timeout if self.debug_info is None else None
-
- test_url = self.test_url(test)
-
- return WebDriverRun(self.logger,
- self._render,
- self.protocol,
- test_url,
- timeout,
- self.extra_timeout).run()
-
- def _render(self, protocol, url, timeout):
- protocol.webdriver.url = url
-
- protocol.base.execute_script(self.wait_script, asynchronous=True)
-
- pdf = protocol.pdf_print.render_as_pdf(*self.viewport_size)
- screenshots = protocol.pdf_print.pdf_to_png(pdf, self.page_ranges)
- for i, screenshot in enumerate(screenshots):
- # strip off the data:img/png, part of the url
- if screenshot.startswith("data:image/png;base64,"):
- screenshots[i] = screenshot.split(",", 1)[1]
-
- return screenshots
+# mypy: allow-untyped-defs
+
+import os
+
+from .executorwebdriver import (
+ WebDriverCrashtestExecutor,
+ WebDriverRefTestExecutor,
+ WebDriverRun,
+ WebDriverTestharnessExecutor,
+)
+
+from .executorchrome import (
+ ChromeDriverProtocol,
+ make_sanitizer_mixin,
+)
+
+here = os.path.dirname(__file__)
+
+_SanitizerMixin = make_sanitizer_mixin(WebDriverCrashtestExecutor)
+
+
+class EdgeDriverProtocol(ChromeDriverProtocol):
+ vendor_prefix = "ms"
+
+
+class EdgeDriverRefTestExecutor(WebDriverRefTestExecutor, _SanitizerMixin): # type: ignore
+ protocol_cls = EdgeDriverProtocol
+
+
+class EdgeDriverTestharnessExecutor(WebDriverTestharnessExecutor, _SanitizerMixin): # type: ignore
+ protocol_cls = EdgeDriverProtocol
+
+ def __init__(self, *args, reuse_window=False, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.protocol.reuse_window = reuse_window
+
+
+class EdgeDriverPrintRefTestExecutor(EdgeDriverRefTestExecutor):
+ protocol_cls = EdgeDriverProtocol
+
+ def setup(self, runner):
+ super().setup(runner)
+ self.protocol.pdf_print.load_runner()
+ self.has_window = False
+ with open(os.path.join(here, "reftest.js")) as f:
+ self.script = f.read()
+
+ def screenshot(self, test, viewport_size, dpi, page_ranges):
+ # https://github.com/web-platform-tests/wpt/issues/7140
+ assert dpi is None
+
+ if not self.has_window:
+ self.protocol.base.execute_script(self.script)
+ self.protocol.base.set_window(self.protocol.webdriver.handles[-1])
+ self.has_window = True
+
+ self.viewport_size = viewport_size
+ self.page_ranges = page_ranges.get(test.url)
+ timeout = self.timeout_multiplier * test.timeout if self.debug_info is None else None
+
+ test_url = self.test_url(test)
+
+ return WebDriverRun(self.logger,
+ self._render,
+ self.protocol,
+ test_url,
+ timeout,
+ self.extra_timeout).run()
+
+ def _render(self, protocol, url, timeout):
+ protocol.webdriver.url = url
+
+ protocol.base.execute_script(self.wait_script, asynchronous=True)
+
+ pdf = protocol.pdf_print.render_as_pdf(*self.viewport_size)
+ screenshots = protocol.pdf_print.pdf_to_png(pdf, self.page_ranges)
+ for i, screenshot in enumerate(screenshots):
+ # strip off the data:img/png, part of the url
+ if screenshot.startswith("data:image/png;base64,"):
+ screenshots[i] = screenshot.split(",", 1)[1]
+
+ return screenshots
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_base.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_base.py
index a3d804336e1..b5e40e3f8df 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_base.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_base.py
@@ -2,7 +2,6 @@
import sys
from os.path import dirname, join
-from unittest import mock
import pytest
@@ -30,19 +29,14 @@ def test_logging_immediate_exit():
handler = MozLogTestHandler()
logger.add_handler(handler)
- class CustomException(Exception):
- pass
-
- with mock.patch.object(base, "wait_for_service", side_effect=CustomException):
- browser = base.WebDriverBrowser(
- logger, webdriver_binary="echo", webdriver_args=["sample output"]
- )
- try:
- with pytest.raises(CustomException):
- browser.start(group_metadata={})
- finally:
- # Ensure the `echo` process actually exits
- browser._proc.wait()
+ browser = base.WebDriverBrowser(
+ logger, webdriver_binary="echo", webdriver_args=["sample output"]
+ )
+ try:
+ browser.start(group_metadata={})
+ finally:
+ # Ensure the `echo` process actually exits
+ browser._proc.wait()
process_output_actions = [
data for data in handler.items if data["action"] == "process_output"
diff --git a/tests/wpt/tests/tools/wptserve/wptserve/sslutils/openssl.py b/tests/wpt/tests/tools/wptserve/wptserve/sslutils/openssl.py
index 25f86e019ec..2a388671b62 100644
--- a/tests/wpt/tests/tools/wptserve/wptserve/sslutils/openssl.py
+++ b/tests/wpt/tests/tools/wptserve/wptserve/sslutils/openssl.py
@@ -7,6 +7,7 @@ import shutil
import subprocess
import tempfile
from datetime import datetime, timedelta, timezone
+from email.utils import parsedate_to_datetime
# Amount of time beyond the present to consider certificates "expired." This
# allows certificates to be proactively re-generated in the "buffer" period
@@ -310,12 +311,9 @@ class OpenSSLEnvironment:
"-noout",
"-enddate",
"-in", cert_path).decode("utf8").split("=", 1)[1].strip()
- # Not sure if this works in other locales
- end_date = datetime.strptime(end_date_str, "%b %d %H:%M:%S %Y %Z")
+ # openssl outputs an RFC 822 date
+ end_date = parsedate_to_datetime(end_date_str)
time_buffer = timedelta(**CERT_EXPIRY_BUFFER)
- # Because `strptime` does not account for time zone offsets, it is
- # always in terms of UTC, so the current time should be calculated
- # accordingly.
if end_date < datetime.now(timezone.utc) + time_buffer:
return False
diff --git a/tests/wpt/tests/trusted-types/Document-write.html b/tests/wpt/tests/trusted-types/Document-write.html
index 87e9e724699..7902733f67c 100644
--- a/tests/wpt/tests/trusted-types/Document-write.html
+++ b/tests/wpt/tests/trusted-types/Document-write.html
@@ -11,4 +11,64 @@
document.write(html);
assert_true(document.body.innerText.indexOf(RESULTS.HTML) !== -1);
}, "document.write with html assigned via policy (successful transformation).");
+
+ test(t => {
+ document.body.innerText = '';
+ let p = createHTML_policy(window, 1);
+ let html = p.createHTML(INPUTS.HTML);
+ document.writeln(html);
+ assert_true(document.body.innerText.indexOf(RESULTS.HTML) !== -1);
+ }, "document.writeln with html assigned via policy (successful transformation).");
+
+ test(t => {
+ document.body.innerText = '';
+ let p = createHTML_policy(window, 1);
+ let a = p.createHTML("abcdef");
+ let b = p.createHTML("ghijkl");
+ document.write(a, b);
+ assert_equals(document.body.innerText, "abcdefghijkl");
+ }, "document.write(TrustedHTML, TrustedHTML)");
+
+ test(t => {
+ document.body.innerText = '';
+ let p = createHTML_policy(window, 1);
+ let a = p.createHTML("abcdef");
+ let b = p.createHTML("ghijkl");
+ document.writeln(a, b);
+ assert_equals(document.body.innerText, "abcdefghijkl");
+ }, "document.writeln(TrustedHTML, TrustedHTML)");
+
+ test(t => {
+ document.body.innerText = '';
+ let p = createHTML_policy(window, 1);
+ let a = p.createHTML("abcdef");
+ let b = "ghijkl";
+ document.write(a, b);
+ assert_equals(document.body.innerText, "abcdefghijkl");
+ }, "document.write(TrustedHTML, String)");
+
+ test(t => {
+ document.body.innerText = '';
+ let p = createHTML_policy(window, 1);
+ let a = p.createHTML("abcdef");
+ let b = "ghijkl";
+ document.writeln(a, b);
+ assert_equals(document.body.innerText, "abcdefghijkl");
+ }, "document.writeln(TrustedHTML, String)");
+
+ test(t => {
+ document.body.innerText = '';
+ let a = "abcdef";
+ let b = "ghijkl";
+ document.write(a, b);
+ assert_equals(document.body.innerText, "abcdefghijkl");
+ }, "document.write(String, String)");
+
+ test(t => {
+ document.body.innerText = '';
+ let a = "abcdef";
+ let b = "ghijkl";
+ document.writeln(a, b);
+ assert_equals(document.body.innerText, "abcdefghijkl");
+ }, "document.writeln(String, String)");
diff --git a/tests/wpt/tests/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP.html b/tests/wpt/tests/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP.html
index c0f72bb36ac..aafe3c70313 100644
--- a/tests/wpt/tests/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP.html
+++ b/tests/wpt/tests/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP.html
@@ -16,10 +16,7 @@
-
diff --git a/tests/wpt/tests/trusted-types/block-string-assignment-to-Document-write.html b/tests/wpt/tests/trusted-types/block-string-assignment-to-Document-write.html
index 974203c1133..d22be1118ce 100644
--- a/tests/wpt/tests/trusted-types/block-string-assignment-to-Document-write.html
+++ b/tests/wpt/tests/trusted-types/block-string-assignment-to-Document-write.html
@@ -18,6 +18,14 @@
assert_equals(document.body.innerText, RESULTS.HTML);
}, "document.write with html assigned via policy (successful URL transformation).");
+ test(t => {
+ document.body.innerText = '';
+ let a = p.createHTML("abcdef");
+ let b = p.createHTML("ghijkl");
+ document.write(a,b);
+ assert_equals(document.body.innerText, "abcdefghijkl");
+ }, "document.write with multiple trusted arguments.");
+
// TrustedURL assignments do not throw. (Now for writeln.)
test(t => {
document.body.innerText = '';
@@ -26,6 +34,14 @@
assert_equals(document.body.innerText, RESULTS.HTML);
}, "document.writeln with html assigned via policy (successful URL transformation).");
+ test(t => {
+ document.body.innerText = '';
+ let a = p.createHTML("abcdef");
+ let b = p.createHTML("ghijkl");
+ document.writeln(a,b);
+ assert_equals(document.body.innerText, "abcdefghijkl");
+ }, "document.writeln with multiple trusted arguments.");
+
// String assignments throw.
test(t => {
const old = document.body.innerText;
@@ -35,6 +51,26 @@
assert_equals(document.body.innerText, old);
}, "`document.write(string)` throws");
+ test(t => {
+ const old = document.body.innerText;
+ assert_throws_js(TypeError, _ => {
+ let a = "abcdef";
+ let b = "ghijkl";
+ document.write(a, b);
+ });
+ assert_equals(document.body.innerText, old);
+ }, "`document.write(string, string)` throws");
+
+ test(t => {
+ const old = document.body.innerText;
+ assert_throws_js(TypeError, _ => {
+ let a = "abcdef";
+ let b = p.createHTML("ghijkl");
+ document.write(a, b);
+ });
+ assert_equals(document.body.innerText, old);
+ }, "`document.write(string, TrustedHTML)` throws");
+
// String assignments throw. (Now for writeln.)
test(t => {
const old = document.body.innerText;
@@ -44,6 +80,26 @@
assert_equals(document.body.innerText, old);
}, "`document.writeln(string)` throws");
+ test(t => {
+ const old = document.body.innerText;
+ assert_throws_js(TypeError, _ => {
+ let a = "abcdef";
+ let b = "ghijkl";
+ document.writeln(a, b);
+ });
+ assert_equals(document.body.innerText, old);
+ }, "`document.writeln(string, string)` throws");
+
+ test(t => {
+ const old = document.body.innerText;
+ assert_throws_js(TypeError, _ => {
+ let a = "abcdef";
+ let b = p.createHTML("ghijkl");
+ document.writeln(a, b);
+ });
+ assert_equals(document.body.innerText, old);
+ }, "`document.writeln(string, TrustedHTML)` throws");
+
// Null assignment throws.
test(t => {
const old = document.body.innerText;
@@ -63,7 +119,11 @@
}, "`document.writeln(null)` throws");
let default_policy = trustedTypes.createPolicy('default',
- { createHTML: createHTMLJS }, true );
+ { createHTML: (html) => {
+ return html.replace("Hi", "Quack")
+ .replace("transformed", "a duck")
+ .replace("defghi", "zxcvbn")
+ } }, true );
// Default policy works.
test(t => {
@@ -72,10 +132,42 @@
assert_equals(document.body.innerText, RESULTS.HTML);
}, "`document.write(string)` observes default policy");
+ test(t => {
+ document.body.innerText = '';
+ let a = "abcdef";
+ let b = "ghijkl";
+ document.write(a, b);
+ assert_equals(document.body.innerText, "abczxcvbnjkl");
+ }, "`document.write(string, string)` observes default policy");
+
+ test(t => {
+ document.body.innerText = '';
+ let a = "abcdef";
+ let b = p.createHTML("ghijkl");
+ document.write(a, b);
+ assert_equals(document.body.innerText, "abczxcvbnjkl");
+ }, "`document.write(string, TrustedHTML)` observes default policy");
+
// Default policy works. (Now for writeln.)
test(t => {
document.body.innerText = '';
document.writeln(INPUTS.HTML);
assert_equals(document.body.innerText, RESULTS.HTML);
}, "`document.writeln(string)` observes default policy");
+
+ test(t => {
+ document.body.innerText = '';
+ let a = "abcdef";
+ let b = "ghijkl";
+ document.writeln(a, b);
+ assert_equals(document.body.innerText, "abczxcvbnjkl");
+ }, "`document.writeln(string, string)` observes default policy");
+
+ test(t => {
+ document.body.innerText = '';
+ let a = "abcdef";
+ let b = p.createHTML("ghijkl");
+ document.writeln(a, b);
+ assert_equals(document.body.innerText, "abczxcvbnjkl");
+ }, "`document.writeln(string, TrustedHTML)` observes default policy");
diff --git a/tests/wpt/tests/video-rvfc/WEB_FEATURES.yml b/tests/wpt/tests/video-rvfc/WEB_FEATURES.yml
new file mode 100644
index 00000000000..f206d0be0b4
--- /dev/null
+++ b/tests/wpt/tests/video-rvfc/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: request-video-frame-callback
+ files: "**"
diff --git a/tests/wpt/tests/webauthn/createcredential-passing.https.html b/tests/wpt/tests/webauthn/createcredential-passing.https.html
index f64a4ff0397..4124c2247ea 100644
--- a/tests/wpt/tests/webauthn/createcredential-passing.https.html
+++ b/tests/wpt/tests/webauthn/createcredential-passing.https.html
@@ -58,6 +58,10 @@ standardSetup(function() {
new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [pkParamEC512, pkParamEC256])
.runTest("SelectEC256 pubKeyCredParams from a list");
+ // pubKeyCredParams with unknown value
+ new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [{ "type": "unknown", alg: -7, }, { "type": "public-key", alg: -7, }])
+ .runTest("pubKeyCredParams with unknown value");
+
// timeout
new CreateCredentialsTest({path: "options.publicKey.timeout", value: undefined}).runTest("passing credentials.create() with no timeout");
diff --git a/tests/wpt/tests/webauthn/createcredential-pubkeycredparams.https.html b/tests/wpt/tests/webauthn/createcredential-pubkeycredparams.https.html
index d1df7952d67..cb830bfe92a 100644
--- a/tests/wpt/tests/webauthn/createcredential-pubkeycredparams.https.html
+++ b/tests/wpt/tests/webauthn/createcredential-pubkeycredparams.https.html
@@ -36,10 +36,10 @@ standardSetup(function() {
new CreateCredentialsTest({path: "options.publicKey.pubKeyCredParams", value: undefined}).runTest("Bad pubKeyCredParams: pubKeyCredParams is undefined", TypeError);
new CreateCredentialsTest("options.publicKey.pubKeyCredParams", "hi mom").runTest("Bad pubKeyCredParams: pubKeyCredParams is string", TypeError);
new CreateCredentialsTest("options.publicKey.pubKeyCredParams", null).runTest("Bad pubKeyCredParams: pubKeyCredParams is null", TypeError);
- new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badType]).runTest("Bad pubKeyCredParams: first param has bad type (\"something-else\")", TypeError);
- new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badTypeEmptyString]).runTest("Bad pubKeyCredParams: first param has bad type (\"\")", TypeError);
- new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badTypeNull]).runTest("Bad pubKeyCredParams: first param has bad type (null)", TypeError);
- new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badTypeEmptyObj]).runTest("Bad pubKeyCredParams: first param has bad type (empty object)", TypeError);
+ new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badType]).runTest("Bad pubKeyCredParams: first param has bad type (\"something-else\")", "NotSupportedError");
+ new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badTypeEmptyString]).runTest("Bad pubKeyCredParams: first param has bad type (\"\")", "NotSupportedError");
+ new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badTypeNull]).runTest("Bad pubKeyCredParams: first param has bad type (null)", "NotSupportedError");
+ new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badTypeEmptyObj]).runTest("Bad pubKeyCredParams: first param has bad type (empty object)", "NotSupportedError");
new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badAlg])
.modify("options.publicKey.timeout", 300)
.runTest("Bad pubKeyCredParams: first param has bad alg (42)", "NotAllowedError");
diff --git a/tests/wpt/tests/webauthn/getcredential-allowcredentials.https.html b/tests/wpt/tests/webauthn/getcredential-allowcredentials.https.html
new file mode 100644
index 00000000000..0263774142c
--- /dev/null
+++ b/tests/wpt/tests/webauthn/getcredential-allowcredentials.https.html
@@ -0,0 +1,77 @@
+
+navigator.credentials.get() tests with allowCredentials
+foo
+ """)
+ await bidi_session.browsing_context.navigate(
+ context=top_context["context"], url=url, wait="complete"
+ )
+
+ context_node = await bidi_session.script.evaluate(
+ expression="document",
+ target=ContextTarget(top_context["context"]),
+ await_promise=True,
+ )
+
+ result = await bidi_session.browsing_context.locate_nodes(
+ context=top_context["context"],
+ locator={ "type": type, "value": value },
+ start_nodes=[context_node]
+ )
+
+ expected = [
+ {
+ "type": "node",
+ "sharedId": any_string,
+ "value": {
+ "attributes": {"data-class":"one"},
+ "childNodeCount": 1,
+ "localName": "p",
+ "namespaceURI": "http://www.w3.org/1999/xhtml",
+ "nodeType": 1,
+ }
+ }
+ ]
+
+ recursive_compare(expected, result["nodes"])
diff --git a/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/invalid.py
index 5397dc7b62e..d7172160721 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/invalid.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/invalid.py
@@ -4,6 +4,7 @@ from webdriver.bidi.undefined import UNDEFINED
pytestmark = pytest.mark.asyncio
+
@pytest.mark.parametrize("descriptor", [False, "SOME_STRING", 42, {}, [], {"name": 23}, None, UNDEFINED])
async def test_params_descriptor_invalid_type(bidi_session, descriptor):
with pytest.raises(error.InvalidArgumentException):
@@ -54,8 +55,8 @@ async def test_params_origin_invalid_type(bidi_session, origin):
)
-@pytest.mark.parametrize("user_context", [False, 42, {}, [], None])
-async def test_params_origin_invalid_type(bidi_session, user_context):
+@pytest.mark.parametrize("user_context", [False, 42, {}, []])
+async def test_params_user_context_invalid_type(bidi_session, user_context):
with pytest.raises(error.InvalidArgumentException):
await bidi_session.permissions.set_permission(
descriptor={"name": "geolocation"},
diff --git a/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/set_permission.py b/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/set_permission.py
index 45c50dbf883..18f8e6fed00 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/set_permission.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/external/permissions/set_permission/set_permission.py
@@ -1,10 +1,10 @@
import pytest
-import webdriver.bidi.error as error
from . import get_context_origin, get_permission_state
pytestmark = pytest.mark.asyncio
+
@pytest.mark.asyncio
async def test_set_permission(bidi_session, new_tab, url):
test_url = url("/common/blank.html", protocol="https")
@@ -43,24 +43,6 @@ async def test_set_permission(bidi_session, new_tab, url):
assert await get_permission_state(bidi_session, new_tab, "geolocation") == "prompt"
-@pytest.mark.asyncio
-async def test_set_permission_insecure_context(bidi_session, new_tab, url):
- test_url = url("/common/blank.html", protocol="http")
- await bidi_session.browsing_context.navigate(
- context=new_tab["context"],
- url=test_url,
- wait="complete",
- )
-
- origin = await get_context_origin(bidi_session, new_tab)
-
- with pytest.raises(error.InvalidArgumentException):
- await bidi_session.permissions.set_permission(
- descriptor={"name": "push"},
- state="granted",
- origin=origin,
- )
-
@pytest.mark.asyncio
async def test_set_permission_new_context(bidi_session, new_tab, url):
test_url = url("/common/blank.html", protocol="https")
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/wheel.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/wheel.py
index 4f897479e23..ee0d4d4600d 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/wheel.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/wheel.py
@@ -4,6 +4,7 @@ from webdriver.bidi.error import NoSuchFrameException
from webdriver.bidi.modules.input import Actions, get_element_origin
from webdriver.bidi.modules.script import ContextTarget
+from tests.support.keys import Keys
from .. import get_events, get_object_from_context
from . import get_shadow_root_from_test_page
@@ -159,3 +160,28 @@ async def test_scroll_shadow_tree(
assert events[0]["deltaX"] >= 5
assert events[0]["deltaY"] >= 10
assert events[0]["target"] == "scrollableShadowTreeContent"
+
+
+async def test_scroll_with_key_pressed(
+ bidi_session, setup_wheel_test, top_context, get_element
+):
+ scrollable = await get_element("#scrollable")
+
+ actions = Actions()
+ actions.add_key().key_down(Keys.R_SHIFT)
+ actions.add_wheel().scroll(
+ x=0,
+ y=0,
+ delta_x=5,
+ delta_y=10,
+ origin=get_element_origin(scrollable),
+ )
+ actions.add_key().key_up(Keys.R_SHIFT)
+
+ await bidi_session.input.perform_actions(
+ actions=actions, context=top_context["context"]
+ )
+ events = await get_events(bidi_session, top_context["context"])
+ assert len(events) == 1
+ assert events[0]["type"] == "wheel"
+ assert events[0]["shiftKey"] == True
diff --git a/tests/wpt/tests/webdriver/tests/classic/get_element_text/get.py b/tests/wpt/tests/webdriver/tests/classic/get_element_text/get.py
index 924a4e8d797..8f832077e10 100644
--- a/tests/wpt/tests/webdriver/tests/classic/get_element_text/get.py
+++ b/tests/wpt/tests/webdriver/tests/classic/get_element_text/get.py
@@ -87,13 +87,6 @@ def test_stale_element_reference(session, stale_element, as_frame):
assert_error(response, "stale element reference")
-def test_getting_text_of_a_non_existant_element_is_an_error(session, inline):
- session.url = inline("""Hello world""")
-
- result = get_element_text(session, "foo")
- assert_error(result, "no such element")
-
-
def test_read_element_text(session, inline):
session.url = inline("Before foo after")
element = session.find.css("#id", all=False)
@@ -102,6 +95,20 @@ def test_read_element_text(session, inline):
assert_success(result, "oo")
+@pytest.mark.parametrize("text, expected", [
+ ("foo bar", "Foo Bar"),
+ ("foo-bar", "Foo-Bar"),
+ ("foo_bar", "Foo_bar"),
+], ids=["space", "dash", "underscore"])
+def test_transform_capitalize(session, inline, text, expected):
+ session.url = inline(
+ f"""{text}""")
+ element = session.find.css("div", all=False)
+
+ result = get_element_text(session, element.id)
+ assert_success(result, expected)
+
+
@pytest.mark.parametrize("text, inner_html, expected", [
("cheese", "foo barfoo
+
+
+
+
diff --git a/tests/wpt/tests/import-maps/no-referencing-script-integrity.html b/tests/wpt/tests/import-maps/no-referencing-script-integrity.html
new file mode 100644
index 00000000000..8025ba3b899
--- /dev/null
+++ b/tests/wpt/tests/import-maps/no-referencing-script-integrity.html
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/wpt/tests/import-maps/nonimport-integrity.html b/tests/wpt/tests/import-maps/nonimport-integrity.html
new file mode 100644
index 00000000000..1157ee64ee7
--- /dev/null
+++ b/tests/wpt/tests/import-maps/nonimport-integrity.html
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/wpt/tests/import-maps/static-integrity.html b/tests/wpt/tests/import-maps/static-integrity.html
new file mode 100644
index 00000000000..d1d3649339e
--- /dev/null
+++ b/tests/wpt/tests/import-maps/static-integrity.html
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/fuzzy-ref-2.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/fuzzy-ref-2.html.ini
index cdfd9736c54..e78d0b4315d 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/fuzzy-ref-2.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/fuzzy-ref-2.html.ini
@@ -1,4 +1,3 @@
[fuzzy-ref-2.html]
fuzzy:
- if os == "mac" and product == "chrome": maxDifference=254-255;100-100
maxDifference=255;100-100
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html.ini
index d3776e243e4..6c8e46ceafd 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html.ini
@@ -1,4 +1,3 @@
[reftest_fuzzy_chain_ini.html]
fuzzy:
- if os == "mac" and product == "chrome": maxDifference=254-255;100-100
maxDifference=255;100-100
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_1.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_1.html.ini
deleted file mode 100644
index 44f185357bc..00000000000
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_1.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[reftest_fuzzy_1.html]
- fuzzy:
- if os == "mac" and product == "chrome": fuzzy-ref-1.html:254-255;100
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_full.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_full.html.ini
index d682550d53e..0ea76527da4 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_full.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_full.html.ini
@@ -1,6 +1,4 @@
[reftest_fuzzy_ini_full.html]
fuzzy:
- if os == "mac" and product == "chrome": [maxDifference=1;100-100,
- reftest_fuzzy_ini_full.html==fuzzy-ref-1.html:254-255;100]
if 1 == 1: [maxDifference=1;100-100, # 'if 1 == 1:' is a workaround for a parser bug
reftest_fuzzy_ini_full.html==fuzzy-ref-1.html:255;100]
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html.ini
index 4437fceff89..8e321bdb902 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html.ini
@@ -1,8 +1,5 @@
[reftest_fuzzy_ini_ref_only.html]
fuzzy:
- if os == "mac" and product == "chrome": [maxDifference=1;100-100,
- fuzzy-ref-1.html:maxDifference=254-255;100-100,
- reftest_fuzzy==fuzzy-ref-2.html:maxDifference=1;100-100]
if 1 == 1: [maxDifference=1;100-100, # 1 == 1 is a workaround for a parser bug.
fuzzy-ref-1.html:maxDifference=255;100-100,
reftest_fuzzy==fuzzy-ref-2.html:maxDifference=1;100-100]
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_short.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_short.html.ini
index 27e3290e6fb..4a3cb610fac 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_short.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_short.html.ini
@@ -1,4 +1,3 @@
[reftest_fuzzy_ini_short.html]
fuzzy:
- if os == "mac" and product == "chrome": maxDifference=254-255;100-100
maxDifference=255;100-100
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/click_iframe_crossorigin.sub.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/click_iframe_crossorigin.sub.html.ini
index c0ca25ab657..aa94652ad76 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/click_iframe_crossorigin.sub.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/click_iframe_crossorigin.sub.html.ini
@@ -2,4 +2,3 @@
[TestDriver click on a document in an iframe]
expected:
if product == "chrome": [PASS, FAIL] # https://github.com/web-platform-tests/wpt/issues/26295
- if os == "mac" and product == "firefox": [PASS, FAIL] # https://github.com/web-platform-tests/wpt/issues/45987
diff --git a/tests/wpt/tests/largest-contentful-paint/transparent-text-with-shadow.html b/tests/wpt/tests/largest-contentful-paint/transparent-text-with-shadow.html
new file mode 100644
index 00000000000..8231ed9ff11
--- /dev/null
+++ b/tests/wpt/tests/largest-contentful-paint/transparent-text-with-shadow.html
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+ 
+