-
Notifications
You must be signed in to change notification settings - Fork 3.1k
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.
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
URL: ToASCII #5976
Merged
Merged
URL: ToASCII #5976
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
192384e
URL: ToASCII
annevk 530adbf
Add more tests, move 63 code point tests to the end for readability
annevk a302090
CheckJoiners should probably be true (leave testing emojis with joine…
annevk ded5d2f
add ASCII-only CheckJoiners/CheckBidi tests
annevk 762a7a6
Explicitly state output in all cases
domenic b544f3d
Add extra Node.js test cases
domenic File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,128 @@ | ||
[ | ||
"This resource is focused on highlighting issues with UTS #46 ToASCII", | ||
{ | ||
"comment": "Label with hyphens in 3rd and 4th position", | ||
"input": "aa--" | ||
}, | ||
{ | ||
"input": "a†--", | ||
"output": "xn--a---kp0a" | ||
}, | ||
{ | ||
"input": "ab--c" | ||
}, | ||
{ | ||
"comment": "Label with leading hyphen", | ||
"input": "-x" | ||
}, | ||
{ | ||
"input": "-†", | ||
"output": "xn----xhn" | ||
}, | ||
{ | ||
"input": "-x.xn--nxa", | ||
"output": "-x.xn--nxa" | ||
}, | ||
{ | ||
"input": "-x.β", | ||
"output": "-x.xn--nxa" | ||
}, | ||
{ | ||
"comment": "Label with trailing hyphen", | ||
"input": "x-.xn--nxa" | ||
}, | ||
{ | ||
"input": "x-.β", | ||
"output": "x-.xn--nxa" | ||
}, | ||
{ | ||
"comment": "Empty labels", | ||
"input": "x..xn--nxa" | ||
}, | ||
{ | ||
"input": "x..β", | ||
"output": "x..xn--nxa" | ||
}, | ||
{ | ||
"comment": "Invalid Punycode", | ||
"input": "xn--a", | ||
"output": null | ||
}, | ||
{ | ||
"input": "xn--a.xn--nxa", | ||
"output": null | ||
}, | ||
{ | ||
"input": "xn--a.β", | ||
"output": null | ||
}, | ||
{ | ||
"comment": "Valid Punycode", | ||
"input": "xn--nxa.xn--nxa" | ||
}, | ||
{ | ||
"comment": "Mixed", | ||
"input": "xn--nxa.β", | ||
"output": "xn--nxa.xn--nxa" | ||
}, | ||
{ | ||
"input": "ab--c.xn--nxa" | ||
}, | ||
{ | ||
"input": "ab--c.β", | ||
"output": "ab--c.xn--nxa" | ||
}, | ||
{ | ||
"comment": "CheckJoiners is true", | ||
"input": "\u200D.example", | ||
"output": null | ||
}, | ||
{ | ||
"input": "xn--1ug.example", | ||
"output": null | ||
}, | ||
{ | ||
"comment": "CheckBidi is true", | ||
"input": "يa", | ||
"output": null | ||
}, | ||
{ | ||
"input": "xn--a-yoc", | ||
"output": null | ||
}, | ||
{ | ||
"comment": "processing_option is Nontransitional_Processing", | ||
"input": "ශ්රී", | ||
"output": "xn--10cl1a0b660p" | ||
}, | ||
{ | ||
"input": "نامهای", | ||
"output": "xn--mgba3gch31f060k" | ||
}, | ||
{ | ||
"comment": "Label longer than 63 code points", | ||
"input": "x01234567890123456789012345678901234567890123456789012345678901x" | ||
}, | ||
{ | ||
"input": "x01234567890123456789012345678901234567890123456789012345678901†", | ||
"output": "xn--x01234567890123456789012345678901234567890123456789012345678901-6963b" | ||
}, | ||
{ | ||
"input": "x01234567890123456789012345678901234567890123456789012345678901x.xn--nxa" | ||
}, | ||
{ | ||
"input": "x01234567890123456789012345678901234567890123456789012345678901x.β", | ||
"output": "x01234567890123456789012345678901234567890123456789012345678901x.xn--nxa" | ||
}, | ||
{ | ||
"comment": "Domain excluding TLD longer than 253 code points", | ||
"input": "01234567890123456789012345678901234567890123456789.01234567890123456789012345678901234567890123456789.01234567890123456789012345678901234567890123456789.01234567890123456789012345678901234567890123456789.0123456789012345678901234567890123456789012345678.x" | ||
}, | ||
{ | ||
"input": "01234567890123456789012345678901234567890123456789.01234567890123456789012345678901234567890123456789.01234567890123456789012345678901234567890123456789.01234567890123456789012345678901234567890123456789.0123456789012345678901234567890123456789012345678.xn--nxa" | ||
}, | ||
{ | ||
"input": "01234567890123456789012345678901234567890123456789.01234567890123456789012345678901234567890123456789.01234567890123456789012345678901234567890123456789.01234567890123456789012345678901234567890123456789.0123456789012345678901234567890123456789012345678.β", | ||
"output": "01234567890123456789012345678901234567890123456789.01234567890123456789012345678901234567890123456789.01234567890123456789012345678901234567890123456789.01234567890123456789012345678901234567890123456789.0123456789012345678901234567890123456789012345678.xn--nxa" | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
async_test(t => { | ||
const request = new XMLHttpRequest() | ||
request.open("GET", "toascii.json") | ||
request.send() | ||
request.responseType = "json" | ||
request.onload = t.step_func_done(() => { | ||
runTests(request.response) | ||
}) | ||
}, "Loading data…") | ||
|
||
function makeURL(type, input) { | ||
input = "https://" + input + "/x" | ||
if(type === "url") { | ||
return new URL(input) | ||
} else { | ||
const url = document.createElement(type) | ||
url.href = input | ||
return url | ||
} | ||
} | ||
|
||
function runTests(tests) { | ||
for(var i = 0, l = tests.length; i < l; i++) { | ||
let hostTest = tests[i] | ||
if (typeof hostTest === "string") { | ||
continue // skip comments | ||
} | ||
if(hostTest.output === undefined) { | ||
hostTest.output = hostTest.input | ||
} | ||
const typeName = { "url": "URL", "a": "<a>", "area": "<area>" } | ||
;["url", "a", "area"].forEach((type) => { | ||
test(() => { | ||
if(hostTest.output !== null) { | ||
const url = makeURL("url", hostTest.input) | ||
assert_equals(url.host, hostTest.output) | ||
assert_equals(url.hostname, hostTest.output) | ||
assert_equals(url.pathname, "/x") | ||
assert_equals(url.href, "https://" + hostTest.output + "/x") | ||
} else { | ||
if(type === "url") { | ||
assert_throws(new TypeError, () => makeURL("url", hostTest.input)) | ||
} else { | ||
const url = makeURL(type, hostTest.input) | ||
assert_equals(url.host, "") | ||
assert_equals(url.hostname, "") | ||
assert_equals(url.pathname, "") | ||
assert_equals(url.href, "https://" + hostTest.input + "/x") | ||
} | ||
} | ||
}, hostTest.input + " (using " + typeName[type] + ")") | ||
;["host", "hostname"].forEach((val) => { | ||
test(() => { | ||
const url = makeURL(type, "x") | ||
url[val] = hostTest.input | ||
if(hostTest.output !== null) { | ||
assert_equals(url[val], hostTest.output) | ||
} else { | ||
assert_equals(url[val], "x") | ||
} | ||
}, hostTest.input + " (using " + typeName[type] + "." + val + ")") | ||
}) | ||
}) | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer that this kind of normalization be done ahead of time, so that there is less logic in the tests. I will push a commit to fix.