Skip to content

Commit

Permalink
url, test: including base argument in originFor
Browse files Browse the repository at this point in the history
- Add tests to check if the `originFor` implementation
  for WHATWG url parsing is correnct.
- Fix `originFor` by including a base as argument

PR-URL: #10021
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
joyeecheung authored and Fishrock123 committed Dec 13, 2016
1 parent 1f11deb commit 80cccce
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/internal/url.js
Original file line number Diff line number Diff line change
Expand Up @@ -781,9 +781,9 @@ Object.defineProperty(URLSearchParamsIteratorPrototype, Symbol.toStringTag, {
configurable: true
});

URL.originFor = function(url) {
URL.originFor = function(url, base) {
if (!(url instanceof URL))
url = new URL(url);
url = new URL(url, base);
var origin;
const protocol = url.protocol;
switch (protocol) {
Expand Down
19 changes: 19 additions & 0 deletions test/parallel/test-whatwg-url-origin-for.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
'use strict';

const common = require('../common');

const URL = require('url').URL;
const path = require('path');
const assert = require('assert');
const tests = require(path.join(common.fixturesDir, 'url-tests.json'));

for (const test of tests) {
if (typeof test === 'string')
continue;

if (test.origin) {
const origin = URL.originFor(test.input, test.base);
// Pass true to origin.toString() to enable unicode serialization.
assert.strictEqual(origin.toString(true), test.origin);
}
}

0 comments on commit 80cccce

Please sign in to comment.