From 5e3217ab23039ae2f52df5737fbc5ed8dba21005 Mon Sep 17 00:00:00 2001 From: Philip Chimento Date: Thu, 21 Nov 2024 16:57:08 -0800 Subject: [PATCH] Enable URLPattern tests in ShadowRealm Requires using fetch_json to download the test data, and absolute paths in meta script tags. --- urlpattern/resources/urlpattern-compare-tests.tentative.js | 3 +-- urlpattern/resources/urlpatterntests.js | 3 +-- urlpattern/urlpattern-compare.tentative.any.js | 4 ++-- urlpattern/urlpattern-compare.tentative.https.any.js | 4 ++-- urlpattern/urlpattern-hasregexpgroups.any.js | 4 ++-- urlpattern/urlpattern.any.js | 4 ++-- urlpattern/urlpattern.https.any.js | 4 ++-- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/urlpattern/resources/urlpattern-compare-tests.tentative.js b/urlpattern/resources/urlpattern-compare-tests.tentative.js index b92b53ee45cd989..debd0df010b0ab8 100644 --- a/urlpattern/resources/urlpattern-compare-tests.tentative.js +++ b/urlpattern/resources/urlpattern-compare-tests.tentative.js @@ -20,7 +20,6 @@ function runTests(data) { } promise_test(async function() { - const response = await fetch('resources/urlpattern-compare-test-data.json'); - const data = await response.json(); + const data = await fetch_json('/urlpattern/resources/urlpattern-compare-test-data.json'); runTests(data); }, 'Loading data...'); diff --git a/urlpattern/resources/urlpatterntests.js b/urlpattern/resources/urlpatterntests.js index 761f96b6fd33920..eefb4d01067ef47 100644 --- a/urlpattern/resources/urlpatterntests.js +++ b/urlpattern/resources/urlpatterntests.js @@ -182,7 +182,6 @@ function runTests(data) { } promise_test(async function() { - const response = await fetch('resources/urlpatterntestdata.json'); - const data = await response.json(); + const data = await fetch_json('/urlpattern/resources/urlpatterntestdata.json'); runTests(data); }, 'Loading data...'); diff --git a/urlpattern/urlpattern-compare.tentative.any.js b/urlpattern/urlpattern-compare.tentative.any.js index 91e9f24f850b130..03a7ccf10573b0d 100644 --- a/urlpattern/urlpattern-compare.tentative.any.js +++ b/urlpattern/urlpattern-compare.tentative.any.js @@ -1,2 +1,2 @@ -// META: global=window,worker -// META: script=resources/urlpattern-compare-tests.tentative.js +// META: global=window,worker,shadowrealm +// META: script=/urlpattern/resources/urlpattern-compare-tests.tentative.js diff --git a/urlpattern/urlpattern-compare.tentative.https.any.js b/urlpattern/urlpattern-compare.tentative.https.any.js index 91e9f24f850b130..03a7ccf10573b0d 100644 --- a/urlpattern/urlpattern-compare.tentative.https.any.js +++ b/urlpattern/urlpattern-compare.tentative.https.any.js @@ -1,2 +1,2 @@ -// META: global=window,worker -// META: script=resources/urlpattern-compare-tests.tentative.js +// META: global=window,worker,shadowrealm +// META: script=/urlpattern/resources/urlpattern-compare-tests.tentative.js diff --git a/urlpattern/urlpattern-hasregexpgroups.any.js b/urlpattern/urlpattern-hasregexpgroups.any.js index 33133d2511b065c..98e0fb645f461f4 100644 --- a/urlpattern/urlpattern-hasregexpgroups.any.js +++ b/urlpattern/urlpattern-hasregexpgroups.any.js @@ -1,2 +1,2 @@ -// META: global=window,worker -// META: script=resources/urlpattern-hasregexpgroups-tests.js +// META: global=window,worker,shadowrealm +// META: script=/urlpattern/resources/urlpattern-hasregexpgroups-tests.js diff --git a/urlpattern/urlpattern.any.js b/urlpattern/urlpattern.any.js index 7d47d22609bf8eb..000383df21d9093 100644 --- a/urlpattern/urlpattern.any.js +++ b/urlpattern/urlpattern.any.js @@ -1,2 +1,2 @@ -// META: global=window,worker -// META: script=resources/urlpatterntests.js +// META: global=window,worker,shadowrealm-in-window,shadowrealm-in-shadowrealm,shadowrealm-in-dedicatedworker,shadowrealm-in-sharedworker +// META: script=/urlpattern/resources/urlpatterntests.js diff --git a/urlpattern/urlpattern.https.any.js b/urlpattern/urlpattern.https.any.js index 7d47d22609bf8eb..29c5e5672e18e2c 100644 --- a/urlpattern/urlpattern.https.any.js +++ b/urlpattern/urlpattern.https.any.js @@ -1,2 +1,2 @@ -// META: global=window,worker -// META: script=resources/urlpatterntests.js +// META: global=window,worker,shadowrealm +// META: script=/urlpattern/resources/urlpatterntests.js