Skip to content

Commit dba6fdc

Browse files
test: update WPT for urlpattern to 3b6b19853a
PR-URL: nodejs#57377 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Daniel Lemire <daniel@lemire.me>
1 parent 34975b3 commit dba6fdc

File tree

4 files changed

+45
-22
lines changed

4 files changed

+45
-22
lines changed

test/fixtures/wpt/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Last update:
2929
- resources: https://github.com/web-platform-tests/wpt/tree/1e140d63ec/resources
3030
- streams: https://github.com/web-platform-tests/wpt/tree/bc9dcbbf1a/streams
3131
- url: https://github.com/web-platform-tests/wpt/tree/a23788b77a/url
32-
- urlpattern: https://github.com/web-platform-tests/wpt/tree/ef6d83d789/urlpattern
32+
- urlpattern: https://github.com/web-platform-tests/wpt/tree/3b6b19853a/urlpattern
3333
- user-timing: https://github.com/web-platform-tests/wpt/tree/5ae85bf826/user-timing
3434
- wasm/jsapi: https://github.com/web-platform-tests/wpt/tree/cde25e7e3c/wasm/jsapi
3535
- wasm/webapi: https://github.com/web-platform-tests/wpt/tree/fd1b23eeaa/wasm/webapi

test/fixtures/wpt/urlpattern/resources/urlpatterntestdata.json

+31-6
Original file line numberDiff line numberDiff line change
@@ -1202,6 +1202,14 @@
12021202
{
12031203
"pattern": [{ "protocol": "http", "port": "80 " }],
12041204
"inputs": [{ "protocol": "http", "port": "80" }],
1205+
"exactly_empty_components": ["port"],
1206+
"expected_match": {
1207+
"protocol": { "input": "http", "groups": {} }
1208+
}
1209+
},
1210+
{
1211+
"pattern": [{ "protocol": "http", "port": "100000" }],
1212+
"inputs": [{ "protocol": "http", "port": "100000" }],
12051213
"expected_obj": "error"
12061214
},
12071215
{
@@ -2424,15 +2432,22 @@
24242432
},
24252433
{
24262434
"pattern": [{ "hostname": "bad#hostname" }],
2427-
"expected_obj": "error"
2435+
"inputs": [{ "hostname": "bad" }],
2436+
"exactly_empty_components": ["port"],
2437+
"expected_match": {
2438+
"hostname": { "input": "bad", "groups": {} }
2439+
}
24282440
},
24292441
{
24302442
"pattern": [{ "hostname": "bad%hostname" }],
24312443
"expected_obj": "error"
24322444
},
24332445
{
24342446
"pattern": [{ "hostname": "bad/hostname" }],
2435-
"expected_obj": "error"
2447+
"inputs": [{ "hostname": "bad" }],
2448+
"expected_match": {
2449+
"hostname": { "input": "bad", "groups": {} }
2450+
}
24362451
},
24372452
{
24382453
"pattern": [{ "hostname": "bad\\:hostname" }],
@@ -2464,7 +2479,8 @@
24642479
},
24652480
{
24662481
"pattern": [{ "hostname": "bad\\\\hostname" }],
2467-
"expected_obj": "error"
2482+
"inputs": [{ "hostname": "badhostname" }],
2483+
"expected_match": null
24682484
},
24692485
{
24702486
"pattern": [{ "hostname": "bad^hostname" }],
@@ -2476,15 +2492,24 @@
24762492
},
24772493
{
24782494
"pattern": [{ "hostname": "bad\nhostname" }],
2479-
"expected_obj": "error"
2495+
"inputs": [{ "hostname": "badhostname" }],
2496+
"expected_match": {
2497+
"hostname": { "input": "badhostname", "groups": {} }
2498+
}
24802499
},
24812500
{
24822501
"pattern": [{ "hostname": "bad\rhostname" }],
2483-
"expected_obj": "error"
2502+
"inputs": [{ "hostname": "badhostname" }],
2503+
"expected_match": {
2504+
"hostname": { "input": "badhostname", "groups": {} }
2505+
}
24842506
},
24852507
{
24862508
"pattern": [{ "hostname": "bad\thostname" }],
2487-
"expected_obj": "error"
2509+
"inputs": [{ "hostname": "badhostname" }],
2510+
"expected_match": {
2511+
"hostname": { "input": "badhostname", "groups": {} }
2512+
}
24882513
},
24892514
{
24902515
"pattern": [{}],

test/fixtures/wpt/versions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"path": "url"
7777
},
7878
"urlpattern": {
79-
"commit": "ef6d83d789483763207af8cedcbf1f3c1317b981",
79+
"commit": "3b6b19853a928ec9bfa28e9046c3cf601f160e42",
8080
"path": "urlpattern"
8181
},
8282
"user-timing": {

test/wpt/status/urlpattern.json

+12-14
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,26 @@
1111
"urlpattern.any.js": {
1212
"fail": {
1313
"expected": [
14-
"Pattern: [{\"protocol\":\"http\",\"port\":\"80 \"}] Inputs: [{\"protocol\":\"http\",\"port\":\"80\"}]",
1514
"Pattern: [\"https://{sub.}?example{.com/}foo\"] Inputs: [\"https://example.com/foo\"]",
16-
"Pattern: [{\"hostname\":\"bad#hostname\"}] Inputs: undefined",
17-
"Pattern: [{\"hostname\":\"bad/hostname\"}] Inputs: undefined",
18-
"Pattern: [{\"hostname\":\"bad\\\\\\\\hostname\"}] Inputs: undefined",
19-
"Pattern: [{\"hostname\":\"bad\\nhostname\"}] Inputs: undefined",
20-
"Pattern: [{\"hostname\":\"bad\\rhostname\"}] Inputs: undefined",
21-
"Pattern: [{\"hostname\":\"bad\\thostname\"}] Inputs: undefined"
15+
"Pattern: [{\"hostname\":\"bad#hostname\"}] Inputs: [{\"hostname\":\"bad\"}]",
16+
"Pattern: [{\"hostname\":\"bad/hostname\"}] Inputs: [{\"hostname\":\"bad\"}]",
17+
"Pattern: [{\"hostname\":\"bad\\\\\\\\hostname\"}] Inputs: [{\"hostname\":\"badhostname\"}]",
18+
"Pattern: [{\"hostname\":\"bad\\nhostname\"}] Inputs: [{\"hostname\":\"badhostname\"}]",
19+
"Pattern: [{\"hostname\":\"bad\\rhostname\"}] Inputs: [{\"hostname\":\"badhostname\"}]",
20+
"Pattern: [{\"hostname\":\"bad\\thostname\"}] Inputs: [{\"hostname\":\"badhostname\"}]"
2221
]
2322
}
2423
},
2524
"urlpattern.https.any.js": {
2625
"fail": {
2726
"expected": [
28-
"Pattern: [{\"protocol\":\"http\",\"port\":\"80 \"}] Inputs: [{\"protocol\":\"http\",\"port\":\"80\"}]",
2927
"Pattern: [\"https://{sub.}?example{.com/}foo\"] Inputs: [\"https://example.com/foo\"]",
30-
"Pattern: [{\"hostname\":\"bad#hostname\"}] Inputs: undefined",
31-
"Pattern: [{\"hostname\":\"bad/hostname\"}] Inputs: undefined",
32-
"Pattern: [{\"hostname\":\"bad\\\\\\\\hostname\"}] Inputs: undefined",
33-
"Pattern: [{\"hostname\":\"bad\\nhostname\"}] Inputs: undefined",
34-
"Pattern: [{\"hostname\":\"bad\\rhostname\"}] Inputs: undefined",
35-
"Pattern: [{\"hostname\":\"bad\\thostname\"}] Inputs: undefined"
28+
"Pattern: [{\"hostname\":\"bad#hostname\"}] Inputs: [{\"hostname\":\"bad\"}]",
29+
"Pattern: [{\"hostname\":\"bad/hostname\"}] Inputs: [{\"hostname\":\"bad\"}]",
30+
"Pattern: [{\"hostname\":\"bad\\\\\\\\hostname\"}] Inputs: [{\"hostname\":\"badhostname\"}]",
31+
"Pattern: [{\"hostname\":\"bad\\nhostname\"}] Inputs: [{\"hostname\":\"badhostname\"}]",
32+
"Pattern: [{\"hostname\":\"bad\\rhostname\"}] Inputs: [{\"hostname\":\"badhostname\"}]",
33+
"Pattern: [{\"hostname\":\"bad\\thostname\"}] Inputs: [{\"hostname\":\"badhostname\"}]"
3634
]
3735
}
3836
}

0 commit comments

Comments
 (0)