Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: move custom WHATWG URL tests into separate files #22442

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
'use strict';

// Tests below are not from WPT.

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

if (!common.hasIntl)
Expand All @@ -7,9 +10,8 @@ if (!common.hasIntl)
const assert = require('assert');
const { domainToASCII, domainToUnicode } = require('url');

// Tests below are not from WPT.
const tests = require('../fixtures/url-idna.js');
const wptToASCIITests = require('../fixtures/url-toascii.js');
const tests = require('../fixtures/url-idna');
const wptToASCIITests = require('../fixtures/url-toascii');

{
const expectedError = common.expectsError(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
'use strict';

// Tests below are not from WPT.

require('../common');
const assert = require('assert');
const { URL, URLSearchParams } = require('url');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
'use strict';

// Tests below are not from WPT.

const common = require('../common');
if (!common.hasIntl) {
// A handful of the tests fail when ICU is not included.
Expand All @@ -10,7 +12,6 @@ const util = require('util');
const URL = require('url').URL;
const assert = require('assert');

// Tests below are not from WPT.
const url = new URL('https://username:password@host.name:8080/path/name/?que=ry#hash');

assert.strictEqual(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
'use strict';

// Tests below are not from WPT.

const common = require('../common');
if (!common.hasIntl) {
// A handful of the tests fail when ICU is not included.
Expand All @@ -10,7 +12,6 @@ const URL = require('url').URL;
const assert = require('assert');
const fixtures = require('../common/fixtures');

// Tests below are not from WPT.
const tests = require(fixtures.path('url-tests'));

const originalFailures = tests.filter((test) => test.failure);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// Flags: --expose-internals
'use strict';

// Tests below are not from WPT.

require('../common');
const URL = require('url').URL;
const assert = require('assert');
const urlToOptions = require('internal/url').urlToOptions;

// Tests below are not from WPT.
const url = new URL('http://user:pass@foo.bar.com:21/aaa/zzz?l=24#test');
const oldParams = url.searchParams; // for test of [SameObject]

Expand Down
37 changes: 37 additions & 0 deletions test/parallel/test-whatwg-url-custom-searchparams-append.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
'use strict';

// Tests below are not from WPT.

const common = require('../common');
const assert = require('assert');
const URLSearchParams = require('url').URLSearchParams;

{
const params = new URLSearchParams();
common.expectsError(() => {
params.append.call(undefined);
}, {
code: 'ERR_INVALID_THIS',
type: TypeError,
message: 'Value of "this" must be of type URLSearchParams'
});
common.expectsError(() => {
params.append('a');
}, {
code: 'ERR_MISSING_ARGS',
type: TypeError,
message: 'The "name" and "value" arguments must be specified'
});

const obj = {
toString() { throw new Error('toString'); },
valueOf() { throw new Error('valueOf'); }
};
const sym = Symbol();
assert.throws(() => params.set(obj, 'b'), /^Error: toString$/);
assert.throws(() => params.set('a', obj), /^Error: toString$/);
assert.throws(() => params.set(sym, 'b'),
/^TypeError: Cannot convert a Symbol value to a string$/);
assert.throws(() => params.set('a', sym),
/^TypeError: Cannot convert a Symbol value to a string$/);
}
69 changes: 69 additions & 0 deletions test/parallel/test-whatwg-url-custom-searchparams-constructor.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
'use strict';

// Tests below are not from WPT.

const common = require('../common');
const assert = require('assert');
const URLSearchParams = require('url').URLSearchParams;

function makeIterableFunc(array) {
return Object.assign(() => {}, {
[Symbol.iterator]() {
return array[Symbol.iterator]();
}
});
}

{
const iterableError = common.expectsError({
code: 'ERR_ARG_NOT_ITERABLE',
type: TypeError,
message: 'Query pairs must be iterable'
});
const tupleError = common.expectsError({
code: 'ERR_INVALID_TUPLE',
type: TypeError,
message: 'Each query pair must be an iterable [name, value] tuple'
}, 6);

let params;
params = new URLSearchParams(undefined);
assert.strictEqual(params.toString(), '');
params = new URLSearchParams(null);
assert.strictEqual(params.toString(), '');
params = new URLSearchParams(
makeIterableFunc([['key', 'val'], ['key2', 'val2']])
);
assert.strictEqual(params.toString(), 'key=val&key2=val2');
params = new URLSearchParams(
makeIterableFunc([['key', 'val'], ['key2', 'val2']].map(makeIterableFunc))
);
assert.strictEqual(params.toString(), 'key=val&key2=val2');
assert.throws(() => new URLSearchParams([[1]]), tupleError);
assert.throws(() => new URLSearchParams([[1, 2, 3]]), tupleError);
assert.throws(() => new URLSearchParams({ [Symbol.iterator]: 42 }),
iterableError);
assert.throws(() => new URLSearchParams([{}]), tupleError);
assert.throws(() => new URLSearchParams(['a']), tupleError);
assert.throws(() => new URLSearchParams([null]), tupleError);
assert.throws(() => new URLSearchParams([{ [Symbol.iterator]: 42 }]),
tupleError);
}

{
const obj = {
toString() { throw new Error('toString'); },
valueOf() { throw new Error('valueOf'); }
};
const sym = Symbol();
const toStringError = /^Error: toString$/;
const symbolError = /^TypeError: Cannot convert a Symbol value to a string$/;

assert.throws(() => new URLSearchParams({ a: obj }), toStringError);
assert.throws(() => new URLSearchParams([['a', obj]]), toStringError);
assert.throws(() => new URLSearchParams(sym), symbolError);
assert.throws(() => new URLSearchParams({ [sym]: 'a' }), symbolError);
assert.throws(() => new URLSearchParams({ a: sym }), symbolError);
assert.throws(() => new URLSearchParams([[sym, 'a']]), symbolError);
assert.throws(() => new URLSearchParams([['a', sym]]), symbolError);
}
46 changes: 46 additions & 0 deletions test/parallel/test-whatwg-url-custom-searchparams-delete.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
'use strict';

// Tests below are not from WPT.

const common = require('../common');
const assert = require('assert');
const { URL, URLSearchParams } = require('url');

{
const params = new URLSearchParams();
common.expectsError(() => {
params.delete.call(undefined);
}, {
code: 'ERR_INVALID_THIS',
type: TypeError,
message: 'Value of "this" must be of type URLSearchParams'
});
common.expectsError(() => {
params.delete();
}, {
code: 'ERR_MISSING_ARGS',
type: TypeError,
message: 'The "name" argument must be specified'
});

const obj = {
toString() { throw new Error('toString'); },
valueOf() { throw new Error('valueOf'); }
};
const sym = Symbol();
assert.throws(() => params.delete(obj), /^Error: toString$/);
assert.throws(() => params.delete(sym),
/^TypeError: Cannot convert a Symbol value to a string$/);
}

// https://github.com/nodejs/node/issues/10480
// Emptying searchParams should correctly update url's query
{
const url = new URL('http://domain?var=1&var=2&var=3');
for (const param of url.searchParams.keys()) {
url.searchParams.delete(param);
}
assert.strictEqual(url.searchParams.toString(), '');
assert.strictEqual(url.search, '');
assert.strictEqual(url.href, 'http://domain/');
}
17 changes: 17 additions & 0 deletions test/parallel/test-whatwg-url-custom-searchparams-foreach.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
'use strict';

// Tests below are not from WPT.

const common = require('../common');
const { URLSearchParams } = require('url');

{
const params = new URLSearchParams();
common.expectsError(() => {
params.forEach.call(undefined);
}, {
code: 'ERR_INVALID_THIS',
type: TypeError,
message: 'Value of "this" must be of type URLSearchParams'
});
}
34 changes: 34 additions & 0 deletions test/parallel/test-whatwg-url-custom-searchparams-get.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
'use strict';

// Tests below are not from WPT.

const common = require('../common');
const assert = require('assert');
const URLSearchParams = require('url').URLSearchParams;

{
const params = new URLSearchParams();
common.expectsError(() => {
params.get.call(undefined);
}, {
code: 'ERR_INVALID_THIS',
type: TypeError,
message: 'Value of "this" must be of type URLSearchParams'
});
common.expectsError(() => {
params.get();
}, {
code: 'ERR_MISSING_ARGS',
type: TypeError,
message: 'The "name" argument must be specified'
});

const obj = {
toString() { throw new Error('toString'); },
valueOf() { throw new Error('valueOf'); }
};
const sym = Symbol();
assert.throws(() => params.get(obj), /^Error: toString$/);
assert.throws(() => params.get(sym),
/^TypeError: Cannot convert a Symbol value to a string$/);
}
34 changes: 34 additions & 0 deletions test/parallel/test-whatwg-url-custom-searchparams-getall.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
'use strict';

// Tests below are not from WPT.

const common = require('../common');
const assert = require('assert');
const URLSearchParams = require('url').URLSearchParams;

{
const params = new URLSearchParams();
common.expectsError(() => {
params.getAll.call(undefined);
}, {
code: 'ERR_INVALID_THIS',
type: TypeError,
message: 'Value of "this" must be of type URLSearchParams'
});
common.expectsError(() => {
params.getAll();
}, {
code: 'ERR_MISSING_ARGS',
type: TypeError,
message: 'The "name" argument must be specified'
});

const obj = {
toString() { throw new Error('toString'); },
valueOf() { throw new Error('valueOf'); }
};
const sym = Symbol();
assert.throws(() => params.getAll(obj), /^Error: toString$/);
assert.throws(() => params.getAll(sym),
/^TypeError: Cannot convert a Symbol value to a string$/);
}
34 changes: 34 additions & 0 deletions test/parallel/test-whatwg-url-custom-searchparams-has.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
'use strict';

// Tests below are not from WPT.

const common = require('../common');
const assert = require('assert');
const URLSearchParams = require('url').URLSearchParams;

{
const params = new URLSearchParams();
common.expectsError(() => {
params.has.call(undefined);
}, {
code: 'ERR_INVALID_THIS',
type: TypeError,
message: 'Value of "this" must be of type URLSearchParams'
});
common.expectsError(() => {
params.has();
}, {
code: 'ERR_MISSING_ARGS',
type: TypeError,
message: 'The "name" argument must be specified'
});

const obj = {
toString() { throw new Error('toString'); },
valueOf() { throw new Error('valueOf'); }
};
const sym = Symbol();
assert.throws(() => params.has(obj), /^Error: toString$/);
assert.throws(() => params.has(sym),
/^TypeError: Cannot convert a Symbol value to a string$/);
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
'use strict';

// Tests below are not from WPT.

require('../common');
const assert = require('assert');
const util = require('util');
const URLSearchParams = require('url').URLSearchParams;

// Tests below are not from WPT.
const sp = new URLSearchParams('?a=a&b=b&b=c');
assert.strictEqual(util.inspect(sp),
"URLSearchParams { 'a' => 'a', 'b' => 'b', 'b' => 'c' }");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
'use strict';

// Tests below are not from WPT.

const common = require('../common');
const assert = require('assert');
const URLSearchParams = require('url').URLSearchParams;

// Tests below are not from WPT.
const params = new URLSearchParams('a=b&c=d');
const keys = params.keys();

Expand Down
Loading