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

lib,url: correct URL's argument to pass idlharness #39848

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/internal/url.js
Expand Up @@ -621,7 +621,7 @@ function isURLThis(self) {
}

class URL {
constructor(input, base) {
constructor(input, base = undefined) {
targos marked this conversation as resolved.
Show resolved Hide resolved
// toUSVString is not needed.
input = `${input}`;
let base_context;
Expand Down
40 changes: 39 additions & 1 deletion test/common/wpt.js
Expand Up @@ -288,6 +288,7 @@ class WPTRunner {
this.resource = new ResourceLoader(path);

this.flags = [];
this.dummyGlobalThisScript = null;
this.initScript = null;

this.status = new StatusLoader(path);
Expand Down Expand Up @@ -318,6 +319,43 @@ class WPTRunner {
this.initScript = script;
}

get fullInitScript() {
if (this.initScript === null && this.dummyGlobalThisScript === null) {
return null;
}

if (this.initScript === null) {
return this.dummyGlobalThisScript;
} else if (this.dummyGlobalThisScript === null) {
return this.initScript;
}

return `${this.fullInitScript}\n\n//===\n${this.initScript}`;
}

/**
* Pretend the runner is run in `name`'s environment (globalThis).
* @param {'Window'} name
* @see {@link https://github.com/nodejs/node/blob/24673ace8ae196bd1c6d4676507d6e8c94cf0b90/test/fixtures/wpt/resources/idlharness.js#L654-L671}
*/
pretendGlobalThisAs(name) {
switch (name) {
case 'Window': {
this.dummyGlobalThisScript =
'global.Window = Object.getPrototypeOf(globalThis).constructor;';
break;
}

// TODO(XadillaX): implement `ServiceWorkerGlobalScope`,
// `DedicateWorkerGlobalScope`, etc.
//
// e.g. `ServiceWorkerGlobalScope` should implement dummy
// `addEventListener` and so on.

default: throw new Error(`Invalid globalThis type ${name}.`);
}
}

// TODO(joyeecheung): work with the upstream to port more tests in .html
// to .js.
runJsTests() {
Expand Down Expand Up @@ -368,7 +406,7 @@ class WPTRunner {
testRelativePath: relativePath,
wptRunner: __filename,
wptPath: this.path,
initScript: this.initScript,
initScript: this.fullInitScript,
harness: {
code: fs.readFileSync(harnessPath, 'utf8'),
filename: harnessPath,
Expand Down
3 changes: 0 additions & 3 deletions test/wpt/status/url.json
Expand Up @@ -13,9 +13,6 @@
"urlencoded-parser.any.js": {
"fail": "missing Request and Response"
},
"idlharness.any.js": {
"fail": "getter/setter names are wrong, etc."
},
"urlsearchparams-constructor.any.js": {
"fail": "FormData is not defined"
},
Expand Down
1 change: 1 addition & 0 deletions test/wpt/test-url.js
Expand Up @@ -5,4 +5,5 @@ const { WPTRunner } = require('../common/wpt');

const runner = new WPTRunner('url');

runner.pretendGlobalThisAs('Window');
runner.runJsTests();