Merge 4bc60b1 into 2c545b6

web-platform-tests · Jan 21, 2017 · e1384f4 · e1384f4
2 parents 2c545b6 + 4bc60b1
commit e1384f4
Show file tree

Hide file tree

Showing 2 changed files with 187 additions and 14 deletions.
diff --git a/url/setters_tests.json b/url/setters_tests.json
@@ -27,15 +27,15 @@
  "href": "a://example.net",
  "new_value": "",
  "expected": {
- "href": "a://example.net/",
+ "href": "a://example.net",
  "protocol": "a:"
  }
  },
  {
  "href": "a://example.net",
  "new_value": "b",
  "expected": {
- "href": "b://example.net/",
+ "href": "b://example.net",
  "protocol": "b:"
  }
  },
@@ -44,7 +44,7 @@
  "href": "a://example.net",
  "new_value": "B",
  "expected": {
- "href": "b://example.net/",
+ "href": "b://example.net",
  "protocol": "b:"
  }
  },
@@ -53,7 +53,7 @@
  "href": "a://example.net",
  "new_value": "é",
  "expected": {
- "href": "a://example.net/",
+ "href": "a://example.net",
  "protocol": "a:"
  }
  },
@@ -62,7 +62,7 @@
  "href": "a://example.net",
  "new_value": "0b",
  "expected": {
- "href": "a://example.net/",
+ "href": "a://example.net",
  "protocol": "a:"
  }
  },
@@ -71,15 +71,15 @@
  "href": "a://example.net",
  "new_value": "+b",
  "expected": {
- "href": "a://example.net/",
+ "href": "a://example.net",
  "protocol": "a:"
  }
  },
  {
  "href": "a://example.net",
  "new_value": "bC0+-.",
  "expected": {
- "href": "bc0+-.://example.net/",
+ "href": "bc0+-.://example.net",
  "protocol": "bc0+-.:"
  }
  },
@@ -88,7 +88,7 @@
  "href": "a://example.net",
  "new_value": "b,c",
  "expected": {
- "href": "a://example.net/",
+ "href": "a://example.net",
  "protocol": "a:"
  }
  },
@@ -97,7 +97,7 @@
  "href": "a://example.net",
  "new_value": "bé",
  "expected": {
- "href": "a://example.net/",
+ "href": "a://example.net",
  "protocol": "a:"
  }
  },
@@ -140,23 +140,23 @@
  "href": "ssh://me@example.net",
  "new_value": "http",
  "expected": {
- "href": "ssh://me@example.net/",
+ "href": "ssh://me@example.net",
  "protocol": "ssh:"
  }
  },
  {
  "href": "ssh://me@example.net",
  "new_value": "gopher",
  "expected": {
- "href": "ssh://me@example.net/",
+ "href": "ssh://me@example.net",
  "protocol": "ssh:"
  }
  },
  {
  "href": "ssh://me@example.net",
  "new_value": "file",
  "expected": {
- "href": "ssh://me@example.net/",
+ "href": "ssh://me@example.net",
  "protocol": "ssh:"
  }
  },
@@ -1114,6 +1114,33 @@
  "href": "http://example.net/%3F",
  "pathname": "/%3F"
  }
+ },
+ {
+ "comment": "# needs to be encoded",
+ "href": "http://example.net",
+ "new_value": "#",
+ "expected": {
+ "href": "http://example.net/%23",
+ "pathname": "/%23"
+ }
+ },
+ {
+ "comment": "? needs to be encoded, non-special scheme",
+ "href": "sc://example.net",
+ "new_value": "?",
+ "expected": {
+ "href": "sc://example.net/%3F",
+ "pathname": "/%3F"
+ }
+ },
+ {
+ "comment": "# needs to be encoded, non-special scheme",
+ "href": "sc://example.net",
+ "new_value": "#",
+ "expected": {
+ "href": "sc://example.net/%23",
+ "pathname": "/%23"
+ }
  }
  ],
  "search": [

diff --git a/url/urltestdata.json b/url/urltestdata.json
@@ -553,15 +553,15 @@
  {
  "input": "foo://",
  "base": "http://example.org/foo/bar",
- "href": "foo:///",
+ "href": "foo://",
  "origin": "null",
  "protocol": "foo:",
  "username": "",
  "password": "",
  "host": "",
  "hostname": "",
  "port": "",
- "pathname": "/",
+ "pathname": "",
  "search": "",
  "hash": ""
  },
@@ -4754,5 +4754,151 @@
  "pathname": "/",
  "search": "",
  "hash": ""
+ },
+ "# Non-special-URL path tests",
+ {
+ "input": "sc://ñ",
+ "base": "about:blank",
+ "href": "sc://%C3%B1",
+ "origin": "null",
+ "protocol": "sc:",
+ "username": "",
+ "password": "",
+ "host": "%C3%B1",
+ "hostname": "%C3%B1",
+ "port": "",
+ "pathname": "",
+ "search": "",
+ "hash": ""
+ },
+ {
+ "input": "sc://ñ?x",
+ "base": "about:blank",
+ "href": "sc://%C3%B1?x",
+ "origin": "null",
+ "protocol": "sc:",
+ "username": "",
+ "password": "",
+ "host": "%C3%B1",
+ "hostname": "%C3%B1",
+ "port": "",
+ "pathname": "",
+ "search": "?x",
+ "hash": ""
+ },
+ {
+ "input": "sc://ñ#x",
+ "base": "about:blank",
+ "href": "sc://%C3%B1#x",
+ "origin": "null",
+ "protocol": "sc:",
+ "username": "",
+ "password": "",
+ "host": "%C3%B1",
+ "hostname": "%C3%B1",
+ "port": "",
+ "pathname": "",
+ "search": "",
+ "hash": "#x"
+ },
+ {
+ "input": "#x",
+ "base": "sc://ñ",
+ "href": "sc://%C3%B1#x",
+ "origin": "null",
+ "protocol": "sc:",
+ "username": "",
+ "password": "",
+ "host": "%C3%B1",
+ "hostname": "%C3%B1",
+ "port": "",
+ "pathname": "",
+ "search": "",
+ "hash": "#x"
+ },
+ {
+ "input": "?x",
+ "base": "sc://ñ",
+ "href": "sc://%C3%B1?x",
+ "origin": "null",
+ "protocol": "sc:",
+ "username": "",
+ "password": "",
+ "host": "%C3%B1",
+ "hostname": "%C3%B1",
+ "port": "",
+ "pathname": "",
+ "search": "?x",
+ "hash": ""
+ },
+ {
+ "input": "sc://?",
+ "base": "about:blank",
+ "href": "sc://?",
+ "protocol": "sc:",
+ "username": "",
+ "password": "",
+ "host": "",
+ "hostname": "",
+ "port": "",
+ "pathname": "",
+ "search": "",
+ "hash": ""
+ },
+ {
+ "input": "sc://#",
+ "base": "about:blank",
+ "href": "sc://#",
+ "protocol": "sc:",
+ "username": "",
+ "password": "",
+ "host": "",
+ "hostname": "",
+ "port": "",
+ "pathname": "",
+ "search": "",
+ "hash": ""
+ },
+ {
+ "input": "///",
+ "base": "sc://x/",
+ "href": "sc:///",
+ "protocol": "sc:",
+ "username": "",
+ "password": "",
+ "host": "",
+ "hostname": "",
+ "port": "",
+ "pathname": "/",
+ "search": "",
+ "hash": ""
+ },
+ {
+ "input": "////",
+ "base": "sc://x/",
+ "href": "sc:////",
+ "protocol": "sc:",
+ "username": "",
+ "password": "",
+ "host": "",
+ "hostname": "",
+ "port": "",
+ "pathname": "//",
+ "search": "",
+ "hash": ""
+ },
+ {
+ "input": "////x/",
+ "base": "sc://x/",
+ "href": "sc:////x/",
+ "protocol": "sc:",
+ "username": "",
+ "password": "",
+ "host": "",
+ "hostname": "",
+ "port": "",
+ "pathname": "//x/",
+ "search": "",
+ "hash": ""
  }
 ]