aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-11-08 02:39:05 -0600
committerGitHub <noreply@github.com>2016-11-08 02:39:05 -0600
commit8cd5216eefd7c8f52f6393835b0dede27e288a66 (patch)
tree866c7fb90a1df8c51b4e878a9a64bbec8d00e816
parent56b4065ee83b3afb420fd6119685ba975f143885 (diff)
parentebe5f85ac59ba6de62bef850a159a121c1e9e90d (diff)
downloadservo-8cd5216eefd7c8f52f6393835b0dede27e288a66.tar.gz
servo-8cd5216eefd7c8f52f6393835b0dede27e288a66.zip
Auto merge of #14126 - nox:url-port-setter, r=SimonSapin
Fix the URL port setter tests <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14126) <!-- Reviewable:end -->
-rw-r--r--tests/wpt/metadata/url/url-setters.html.ini6
-rw-r--r--tests/wpt/web-platform-tests/url/setters_tests.json16
2 files changed, 8 insertions, 14 deletions
diff --git a/tests/wpt/metadata/url/url-setters.html.ini b/tests/wpt/metadata/url/url-setters.html.ini
index 1f6563a640f..8831fae8677 100644
--- a/tests/wpt/metadata/url/url-setters.html.ini
+++ b/tests/wpt/metadata/url/url-setters.html.ini
@@ -6,12 +6,6 @@
[Setting <ssh://me@example.net>.protocol = 'http' Can’t switch from non-special scheme to special. Note: this may change, see https://github.com/whatwg/url/issues/104]
expected: FAIL
- [Setting <http://example.net:8080>.host = 'example.com:' Port number is unchanges if empty in the new value. Note: this may change, see https://github.com/whatwg/url/pull/113]
- expected: FAIL
-
- [Setting <http://example.net:8080>.port = '' Port number is unchanged if empty in the new value. Note: this may change, see https://github.com/whatwg/url/pull/113]
- expected: FAIL
-
[Setting <a:/>.pathname = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' UTF-8 percent encoding with the default encode set. Tabs and newlines are removed.]
expected: FAIL
diff --git a/tests/wpt/web-platform-tests/url/setters_tests.json b/tests/wpt/web-platform-tests/url/setters_tests.json
index 9512d2547e3..a62210ec6b3 100644
--- a/tests/wpt/web-platform-tests/url/setters_tests.json
+++ b/tests/wpt/web-platform-tests/url/setters_tests.json
@@ -346,14 +346,14 @@
}
},
{
- "comment": "Port number is unchanges if empty in the new value. Note: this may change, see https://github.com/whatwg/url/pull/113",
+ "comment": "Port number is removed if empty in the new value",
"href": "http://example.net:8080",
"new_value": "example.com:",
"expected": {
- "href": "http://example.com:8080/",
- "host": "example.com:8080",
+ "href": "http://example.com/",
+ "host": "example.com",
"hostname": "example.com",
- "port": "8080"
+ "port": ""
}
},
{
@@ -761,14 +761,14 @@
}
},
{
- "comment": "Port number is unchanged if empty in the new value. Note: this may change, see https://github.com/whatwg/url/pull/113",
+ "comment": "Port number is removed if empty in the new value",
"href": "http://example.net:8080",
"new_value": "",
"expected": {
- "href": "http://example.net:8080/",
- "host": "example.net:8080",
+ "href": "http://example.net/",
+ "host": "example.net",
"hostname": "example.net",
- "port": "8080"
+ "port": ""
}
},
{