Skip to content

Commit

Permalink
url: fix handling of ? in URLSearchParams creation
Browse files Browse the repository at this point in the history
PR-URL: #11372
Fixes: #11093
Ref: whatwg/url#248
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
TimothyGu committed Feb 17, 2017
1 parent 70afe9d commit fa41dd1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 15 deletions.
9 changes: 4 additions & 5 deletions lib/internal/url.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,11 @@ function onParseComplete(flags, protocol, username, password,
ctx.query = query;
ctx.fragment = fragment;
ctx.host = host;
if (this[searchParams]) { // invoked from href setter
initSearchParams(this[searchParams], query);
} else {
this[searchParams] = new URLSearchParams(query);
if (!this[searchParams]) { // invoked from URL constructor
this[searchParams] = new URLSearchParams();
this[searchParams][context] = this;
}
this[searchParams][context] = this;
initSearchParams(this[searchParams], query);
}

// Reused by URL constructor and URL#href setter.
Expand Down
20 changes: 10 additions & 10 deletions test/parallel/test-whatwg-url-constructor.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,22 +119,22 @@ function runURLSearchParamTests() {

// And in the other direction, altering searchParams propagates
// back to 'search'.
// searchParams.append('i', ' j ')
searchParams.append('i', ' j ')
// assert_equals(url.search, '?e=f&g=h&i=+j+')
// assert_equals(url.searchParams.toString(), 'e=f&g=h&i=+j+')
// assert_equals(searchParams.get('i'), ' j ')
assert_equals(searchParams.get('i'), ' j ')

// searchParams.set('e', 'updated')
searchParams.set('e', 'updated')
// assert_equals(url.search, '?e=updated&g=h&i=+j+')
// assert_equals(searchParams.get('e'), 'updated')
assert_equals(searchParams.get('e'), 'updated')

// var url2 = bURL('http://example.org/file??a=b&c=d')
// assert_equals(url2.search, '??a=b&c=d')
// assert_equals(url2.searchParams.toString(), '%3Fa=b&c=d')
var url2 = bURL('http://example.org/file??a=b&c=d')
assert_equals(url2.search, '??a=b&c=d')
assert_equals(url2.searchParams.toString(), '%3Fa=b&c=d')

// url2.href = 'http://example.org/file??a=b'
// assert_equals(url2.search, '??a=b')
// assert_equals(url2.searchParams.toString(), '%3Fa=b')
url2.href = 'http://example.org/file??a=b'
assert_equals(url2.search, '??a=b')
assert_equals(url2.searchParams.toString(), '%3Fa=b')
}, 'URL.searchParams and URL.search setters, update propagation')
}
runURLSearchParamTests()
Expand Down

0 comments on commit fa41dd1

Please sign in to comment.