Skip to content

chore: update urlpattern tests #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+110 −47
Open

chore: update urlpattern tests #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/canonicalize_and_process.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ pub fn canonicalize_port(
let mut url =
url::Url::parse(&format!("{}://dummy.test", protocol.unwrap_or("dummy")))
.unwrap();
url.set_port(Some(port)).unwrap(); // TODO: dont unwrap, instead ParseError
url
.set_port(Some(port))
.map_err(|_| Error::Url(url::ParseError::InvalidPort))?;
Ok(url::quirks::port(&url).to_string())
}

Expand Down
153 changes: 107 additions & 46 deletions src/testdata/urlpatterntestdata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,26 +60,26 @@
{
"pattern": [{ "pathname": "/foo/bar" }],
"inputs": [{ "pathname": "/foo/bar/baz",
"baseURL": "https://example.com" }],
"baseURL": "https://example.com" }],
"expected_match": null
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"inputs": [{ "pathname": "/foo/bar" }],
"expected_match": null
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"inputs": [{ "hostname": "example.com", "pathname": "/foo/bar" }],
"expected_match": null
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"inputs": [{ "protocol": "https", "hostname": "example.com",
"pathname": "/foo/bar" }],
"pathname": "/foo/bar" }],
"exactly_empty_components": [ "port" ],
"expected_match": {
"hostname": { "input": "example.com", "groups": {} },
Expand All @@ -89,9 +89,9 @@
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com" }],
"baseURL": "https://example.com" }],
"inputs": [{ "protocol": "https", "hostname": "example.com",
"pathname": "/foo/bar" }],
"pathname": "/foo/bar" }],
"exactly_empty_components": [ "port" ],
"expected_match": {
"hostname": { "input": "example.com", "groups": {} },
Expand All @@ -101,17 +101,17 @@
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com" }],
"baseURL": "https://example.com" }],
"inputs": [{ "protocol": "https", "hostname": "example.com",
"pathname": "/foo/bar/baz" }],
"pathname": "/foo/bar/baz" }],
"expected_match": null
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"inputs": [{ "protocol": "https", "hostname": "example.com",
"pathname": "/foo/bar", "search": "otherquery",
"hash": "otherhash" }],
"pathname": "/foo/bar", "search": "otherquery",
"hash": "otherhash" }],
"exactly_empty_components": [ "port" ],
"expected_match": {
"hash": { "input": "otherhash", "groups": { "0": "otherhash" } },
Expand All @@ -123,10 +123,10 @@
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com" }],
"baseURL": "https://example.com" }],
"inputs": [{ "protocol": "https", "hostname": "example.com",
"pathname": "/foo/bar", "search": "otherquery",
"hash": "otherhash" }],
"pathname": "/foo/bar", "search": "otherquery",
"hash": "otherhash" }],
"exactly_empty_components": [ "port" ],
"expected_match": {
"hash": { "input": "otherhash", "groups": { "0": "otherhash" } },
Expand All @@ -138,10 +138,10 @@
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?otherquery#otherhash" }],
"baseURL": "https://example.com?otherquery#otherhash" }],
"inputs": [{ "protocol": "https", "hostname": "example.com",
"pathname": "/foo/bar", "search": "otherquery",
"hash": "otherhash" }],
"pathname": "/foo/bar", "search": "otherquery",
"hash": "otherhash" }],
"exactly_empty_components": [ "port" ],
"expected_match": {
"hash": { "input": "otherhash", "groups": { "0": "otherhash" } },
Expand All @@ -153,7 +153,7 @@
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"inputs": [ "https://example.com/foo/bar" ],
"exactly_empty_components": [ "port" ],
"expected_match": {
Expand All @@ -164,7 +164,7 @@
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"inputs": [ "https://example.com/foo/bar?otherquery#otherhash" ],
"exactly_empty_components": [ "port" ],
"expected_match": {
Expand All @@ -177,7 +177,7 @@
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"inputs": [ "https://example.com/foo/bar?query#hash" ],
"exactly_empty_components": [ "port" ],
"expected_match": {
Expand All @@ -190,25 +190,25 @@
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"inputs": [ "https://example.com/foo/bar/baz" ],
"expected_match": null
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"inputs": [ "https://other.com/foo/bar" ],
"expected_match": null
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"inputs": [ "http://other.com/foo/bar" ],
"expected_match": null
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"inputs": [{ "pathname": "/foo/bar", "baseURL": "https://example.com" }],
"exactly_empty_components": [ "port" ],
"expected_match": {
Expand All @@ -219,9 +219,9 @@
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"inputs": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"exactly_empty_components": [ "port" ],
"expected_match": {
"hostname": { "input": "example.com", "groups": {} },
Expand All @@ -231,20 +231,20 @@
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"inputs": [{ "pathname": "/foo/bar/baz",
"baseURL": "https://example.com" }],
"baseURL": "https://example.com" }],
"expected_match": null
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"inputs": [{ "pathname": "/foo/bar", "baseURL": "https://other.com" }],
"expected_match": null
},
{
"pattern": [{ "pathname": "/foo/bar",
"baseURL": "https://example.com?query#hash" }],
"baseURL": "https://example.com?query#hash" }],
"inputs": [{ "pathname": "/foo/bar", "baseURL": "http://example.com" }],
"expected_match": null
},
Expand Down Expand Up @@ -1122,6 +1122,43 @@
"hostname": { "input": "xn--caf-dma.com", "groups": {}}
}
},
{
"pattern": ["http://\uD83D\uDEB2.com/"],
"inputs": ["http://\uD83D\uDEB2.com/"],
"exactly_empty_components": [ "port" ],
"expected_obj": {
"protocol": "http",
"hostname": "xn--h78h.com",
"pathname": "/"
},
"expected_match": {
"protocol": { "input": "http", "groups": {}},
"hostname": { "input": "xn--h78h.com", "groups": {}},
"pathname": { "input": "/", "groups": {}}
}
},
{
"pattern": [{"pathname":":a\uDB40\uDD00b"}],
"inputs": [],
"expected_obj": {
"pathname": ":a\uDB40\uDD00b"
},
"expected_match": null
},
{
"pattern": [{"pathname":"test/:a\uD801\uDC50b"}],
"inputs": [{"pathname":"test/foo"}],
"expected_obj": {
"pathname": "test/:a\uD801\uDC50b"
},
"expected_match": {
"pathname": { "input": "test/foo", "groups": { "a\uD801\uDC50b": "foo" }}
}
},
{
"pattern": [{"pathname":":\uD83D\uDEB2"}],
"expected_obj": "error"
},
{
"pattern": [{ "port": "" }],
"inputs": [{ "protocol": "http", "port": "80" }],
Expand Down Expand Up @@ -1483,7 +1520,7 @@
{
"pattern": [ "https://example.com:8080/foo?bar#baz" ],
"inputs": [{ "pathname": "/foo", "search": "bar", "hash": "baz",
"baseURL": "https://example.com:8080" }],
"baseURL": "https://example.com:8080" }],
"expected_obj": {
"protocol": "https",
"username": "*",
Expand All @@ -1506,7 +1543,7 @@
{
"pattern": [ "/foo?bar#baz", "https://example.com:8080" ],
"inputs": [{ "pathname": "/foo", "search": "bar", "hash": "baz",
"baseURL": "https://example.com:8080" }],
"baseURL": "https://example.com:8080" }],
"expected_obj": {
"pathname": "/foo",
"search": "bar",
Expand Down Expand Up @@ -1542,7 +1579,7 @@
"protocol": { "input": "https", "groups": {} },
"hostname": { "input": "sub.example.com", "groups": { "0": "sub" } },
"pathname": { "input": "/foo/bar", "groups": { "product": "foo",
"endpoint": "bar" } }
"endpoint": "bar" } }
}
},
{
Expand Down Expand Up @@ -1911,9 +1948,9 @@
{
"pattern": [ "https://example.com/foo?bar#baz" ],
"inputs": [{ "protocol": "https:",
"search": "?bar",
"hash": "#baz",
"baseURL": "http://example.com/foo" }],
"search": "?bar",
"hash": "#baz",
"baseURL": "http://example.com/foo" }],
"exactly_empty_components": [ "port" ],
"expected_obj": {
"protocol": "https",
Expand All @@ -1926,8 +1963,8 @@
},
{
"pattern": [{ "protocol": "http{s}?:",
"search": "?bar",
"hash": "#baz" }],
"search": "?bar",
"hash": "#baz" }],
"inputs": [ "http://example.com/foo?bar#baz" ],
"expected_obj": {
"protocol": "http{s}?",
Expand Down Expand Up @@ -2739,9 +2776,9 @@
},
{
"pattern": [ "https://example.com:8080/foo?bar#baz",
{ "ignoreCase": true }],
{ "ignoreCase": true }],
"inputs": [{ "pathname": "/FOO", "search": "BAR", "hash": "BAZ",
"baseURL": "https://example.com:8080" }],
"baseURL": "https://example.com:8080" }],
"expected_obj": {
"protocol": "https",
"hostname": "example.com",
Expand All @@ -2761,9 +2798,9 @@
},
{
"pattern": [ "/foo?bar#baz", "https://example.com:8080",
{ "ignoreCase": true }],
{ "ignoreCase": true }],
"inputs": [{ "pathname": "/FOO", "search": "BAR", "hash": "BAZ",
"baseURL": "https://example.com:8080" }],
"baseURL": "https://example.com:8080" }],
"expected_obj": {
"protocol": "https",
"hostname": "example.com",
Expand All @@ -2783,9 +2820,9 @@
},
{
"pattern": [ "/foo?bar#baz", { "ignoreCase": true },
"https://example.com:8080" ],
"https://example.com:8080" ],
"inputs": [{ "pathname": "/FOO", "search": "BAR", "hash": "BAZ",
"baseURL": "https://example.com:8080" }],
"baseURL": "https://example.com:8080" }],
"expected_obj": "error"
},
{
Expand Down Expand Up @@ -2832,5 +2869,29 @@
"search": { "input": "q=*&v=?&hmm={}&umm=()", "groups": {} },
"hash": { "input": "foo", "groups": {} }
}
},
{
"pattern": [{ "pathname": "/([[a-z]--a])" }],
"inputs": [{ "pathname": "/a" }],
"expected_match": null
},
{
"pattern": [{ "pathname": "/([[a-z]--a])" }],
"inputs": [{ "pathname": "/z" }],
"expected_match": {
"pathname": { "input": "/z", "groups": { "0": "z" } }
}
},
{
"pattern": [{ "pathname": "/([\\d&&[0-1]])" }],
"inputs": [{ "pathname": "/0" }],
"expected_match": {
"pathname": { "input": "/0", "groups": { "0": "0" } }
}
},
{
"pattern": [{ "pathname": "/([\\d&&[0-1]])" }],
"inputs": [{ "pathname": "/3" }],
"expected_match": null
}
]
]
Loading