summaryrefslogtreecommitdiff
path: root/test/parallel/test-url.js
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2015-01-12 11:13:49 +0100
committerBen Noordhuis <info@bnoordhuis.nl>2015-01-12 12:15:38 +0100
commit913addbff5481567262c387cef9594f809e4ef83 (patch)
treeb2c2b85e9deec2a2fd923488340e4701d59235ec /test/parallel/test-url.js
parenta1e54d6fb72ef0e0d3aab9ed2bf88d60a4a419d9 (diff)
downloadnode-new-913addbff5481567262c387cef9594f809e4ef83.tar.gz
Revert "url: support `path` for url.format"
This reverts commit d312b6d15c69cf4c438ed7d884e6396c481a57f6. Reverted for breaking `npm install` with git+ssh URLs. Conflicts: doc/api/url.markdown Fixes: https://github.com/iojs/io.js/issues/295 PR-URL: https://github.com/iojs/io.js/pull/303 Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'test/parallel/test-url.js')
-rw-r--r--test/parallel/test-url.js77
1 files changed, 4 insertions, 73 deletions
diff --git a/test/parallel/test-url.js b/test/parallel/test-url.js
index 9eaaf0353f..e81908a883 100644
--- a/test/parallel/test-url.js
+++ b/test/parallel/test-url.js
@@ -1113,7 +1113,7 @@ var formatTests = {
// `#`,`?` in path
'/path/to/%%23%3F+=&.txt?foo=theA1#bar' : {
- href: '/path/to/%%23%3F+=&.txt?foo=theA1#bar',
+ href : '/path/to/%%23%3F+=&.txt?foo=theA1#bar',
pathname: '/path/to/%#?+=&.txt',
query: {
foo: 'theA1'
@@ -1123,7 +1123,7 @@ var formatTests = {
// `#`,`?` in path + `#` in query
'/path/to/%%23%3F+=&.txt?foo=the%231#bar' : {
- href: '/path/to/%%23%3F+=&.txt?foo=the%231#bar',
+ href : '/path/to/%%23%3F+=&.txt?foo=the%231#bar',
pathname: '/path/to/%#?+=&.txt',
query: {
foo: 'the#1'
@@ -1138,7 +1138,7 @@ var formatTests = {
hostname: 'ex.com',
hash: '#frag',
search: '?abc=the#1?&foo=bar',
- pathname: '/foo?100%m#r'
+ pathname: '/foo?100%m#r',
},
// `?` and `#` in search only
@@ -1148,77 +1148,8 @@ var formatTests = {
hostname: 'ex.com',
hash: '#frag',
search: '?abc=the#1?&foo=bar',
- pathname: '/fooA100%mBr'
- },
-
- // path
- 'http://github.com/joyent/node#js1': {
- href: 'http://github.com/joyent/node#js1',
- protocol: 'http:',
- hostname: 'github.com',
- hash: '#js1',
- path: '/joyent/node'
- },
-
- // pathname vs. path, path wins
- 'http://github.com/joyent/node2#js1': {
- href: 'http://github.com/joyent/node2#js1',
- protocol: 'http:',
- hostname: 'github.com',
- hash: '#js1',
- path: '/joyent/node2',
- pathname: '/joyent/node'
- },
-
- // pathname with query/search
- 'http://github.com/joyent/node?foo=bar#js2': {
- href: 'http://github.com/joyent/node?foo=bar#js2',
- protocol: 'http:',
- hostname: 'github.com',
- hash: '#js2',
- path: '/joyent/node?foo=bar'
- },
-
- // path vs. query, path wins
- 'http://github.com/joyent/node?foo=bar2#js3': {
- href: 'http://github.com/joyent/node?foo=bar2#js3',
- protocol: 'http:',
- hostname: 'github.com',
- hash: '#js3',
- path: '/joyent/node?foo=bar2',
- query: {foo: 'bar'}
- },
-
- // path vs. search, path wins
- 'http://github.com/joyent/node?foo=bar3#js4': {
- href: 'http://github.com/joyent/node?foo=bar3#js4',
- protocol: 'http:',
- hostname: 'github.com',
- hash: '#js4',
- path: '/joyent/node?foo=bar3',
- search: '?foo=bar'
- },
-
- // path is present without ? vs. query given
- 'http://github.com/joyent/node#js5': {
- href: 'http://github.com/joyent/node#js5',
- protocol: 'http:',
- hostname: 'github.com',
- hash: '#js5',
- path: '/joyent/node',
- query: {foo: 'bar'}
- },
-
- // path is present without ? vs. search given
- 'http://github.com/joyent/node#js6': {
- href: 'http://github.com/joyent/node#js6',
- protocol: 'http:',
- hostname: 'github.com',
- hash: '#js6',
- path: '/joyent/node',
- search: '?foo=bar'
+ pathname: '/fooA100%mBr',
}
-
};
for (var u in formatTests) {
var expect = formatTests[u].href;