Setup Window prototype in vm context

This includes a revert of commit 98c38d3. The new version works on both the latest Node versions and the older ones. This also introduces the intermediate WindowProperties object, although we don't properly put the named properties there yet.
jsdom · Aug 24, 2024 · 439a43e · 439a43e
1 parent 98c38d3
commit 439a43e
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 31 deletions.
diff --git a/lib/jsdom/browser/Window.js b/lib/jsdom/browser/Window.js
@@ -133,7 +133,15 @@ function setupWindow(windowInstance, { runScripts }) {
     value: windowConstructor
   });
 
-  const windowPrototype = Object.create(EventTargetConstructor.prototype);
+  const windowProperties = Object.create(EventTargetConstructor.prototype);
+  Object.defineProperties(windowProperties, {
+    [Symbol.toStringTag]: {
+      value: "WindowProperties",
+      configurable: true
+    }
+  });
+
+  const windowPrototype = Object.create(windowProperties);
   Object.defineProperties(windowPrototype, {
     constructor: {
       value: windowConstructor,
@@ -148,6 +156,10 @@ function setupWindow(windowInstance, { runScripts }) {
 
   windowConstructor.prototype = windowPrototype;
   Object.setPrototypeOf(windowInstance, windowPrototype);
+  if (runScripts === "outside-only" || runScripts === "dangerously") {
+    const global = vm.runInContext("this", windowInstance);
+    Object.setPrototypeOf(global, windowPrototype);
+  }
 
   EventTarget.setup(windowInstance, windowInstance);
   mixin(windowInstance, WindowEventHandlersImpl.prototype);

diff --git a/test/web-platform-tests/run-wpts.js b/test/web-platform-tests/run-wpts.js
@@ -10,7 +10,8 @@ const { resolveReason, killSubprocess } = require("./utils.js");
 
 const validInnerReasons = new Set([
   "fail",
-  "fail-with-canvas"
+  "fail-with-canvas",
+  "fail-lt-node22"
 ]);
 
 const validReasons = new Set([

diff --git a/test/web-platform-tests/to-run.yaml b/test/web-platform-tests/to-run.yaml
@@ -750,40 +750,38 @@ window-open-noreferrer.html: [fail, Depends on BroadcastChannel]
 window-open-popup-behavior.html: [fail, Depends on BroadcastChannel]
 window-open-windowfeatures-values.html: [fail, Depends on BroadcastChannel]
 window-opener-unconfigurable.window.html: [fail, Not implemented]
-window-properties.https.html: [fail, Incorrectly implemented or not implemented]
-  #"Window attribute: name": [fail, Incorrectly implemented as a data property]
-  #"Window attribute: onmousewheel": [fail, Not implemented]
-  #"Window attribute: onmove": [fail, Unknown]
-  #"Window attribute: opener": [fail, Not implemented]
-  #"Window attribute: status": [fail, Incorrectly implemented as a data property]
-  #"Window method: createImageBitmap": [fail, Not implemented]
-  #"Window method: matchMedia": [fail, Not implemented]
-  #"Window readonly attribute: applicationCache": [fail, Not implemented]
-  #"Window replaceable attribute: devicePixelRatio": [fail, Incorrectly implemented as a data property]
-  #"Window replaceable attribute: innerHeight": [fail, Incorrectly implemented as a data property]
-  #"Window replaceable attribute: innerWidth": [fail, Incorrectly implemented as a data property]
-  #"Window replaceable attribute: outerHeight": [fail, Incorrectly implemented as a data property]
-  #"Window replaceable attribute: outerWidth": [fail, Incorrectly implemented as a data property]
-  #"Window replaceable attribute: pageXOffset": [fail, Incorrectly implemented as a data property]
-  #"Window replaceable attribute: pageYOffset": [fail, Incorrectly implemented as a data property]
-  #"Window replaceable attribute: screenLeft": [fail, Incorrectly implemented as a data property]
-  #"Window replaceable attribute: screenTop": [fail, Incorrectly implemented as a data property]
-  #"Window replaceable attribute: screenX": [fail, Incorrectly implemented as a data property]
-  #"Window replaceable attribute: screenY": [fail, Incorrectly implemented as a data property]
-  #"Window replaceable attribute: scrollX": [fail, Incorrectly implemented as a data property]
-  #"Window replaceable attribute: scrollY": [fail, Incorrectly implemented as a data property]
-  #"constructor": [fail, Unknown]
+window-properties.https.html:
+  "Window attribute: name": [fail, Incorrectly implemented as a data property]
+  "Window attribute: onmousewheel": [fail, Not implemented]
+  "Window attribute: onmove": [fail, Unknown]
+  "Window attribute: opener": [fail, Not implemented]
+  "Window attribute: status": [fail, Incorrectly implemented as a data property]
+  "Window method: createImageBitmap": [fail, Not implemented]
+  "Window method: matchMedia": [fail, Not implemented]
+  "Window readonly attribute: applicationCache": [fail, Not implemented]
+  "Window replaceable attribute: devicePixelRatio": [fail, Incorrectly implemented as a data property]
+  "Window replaceable attribute: innerHeight": [fail, Incorrectly implemented as a data property]
+  "Window replaceable attribute: innerWidth": [fail, Incorrectly implemented as a data property]
+  "Window replaceable attribute: outerHeight": [fail, Incorrectly implemented as a data property]
+  "Window replaceable attribute: outerWidth": [fail, Incorrectly implemented as a data property]
+  "Window replaceable attribute: pageXOffset": [fail, Incorrectly implemented as a data property]
+  "Window replaceable attribute: pageYOffset": [fail, Incorrectly implemented as a data property]
+  "Window replaceable attribute: screenLeft": [fail, Incorrectly implemented as a data property]
+  "Window replaceable attribute: screenTop": [fail, Incorrectly implemented as a data property]
+  "Window replaceable attribute: screenX": [fail, Incorrectly implemented as a data property]
+  "Window replaceable attribute: screenY": [fail, Incorrectly implemented as a data property]
+  "Window replaceable attribute: scrollX": [fail, Incorrectly implemented as a data property]
+  "Window replaceable attribute: scrollY": [fail, Incorrectly implemented as a data property]
+  "constructor": [fail-lt-node22, Incorrectly implemented VM global prototype properties]
 window-prototype-chain.html:
-  "Window.prototype": [fail, Unknown]
-  "Global scope polluter": [fail, Depends on the named properties object]
-  "EventTarget.prototype": [fail, Depends on the named properties object]
-  "Object.prototype": [fail, Depends on the named properties object]
+  "Object.prototype": [fail, Tests Object.prototype which jsdom has trouble with due to VM globals]
 window-reuse-in-nested-browsing-contexts.tentative.html:
   "synchronously navigate iframe with no initial src.": [fail, Unknown]
   "after the first iframe load event, navigate iframe with no initial src.": [fail, Unknown]
   'synchronously navigate iframe with initial src == "".': [fail, Unknown]
   'synchronously navigate iframe with initial src == "about:blank".': [fail, Unknown]
 
+
 ---
 
 DIR: html/browsers/the-windowproxy-exotic-object

diff --git a/test/web-platform-tests/utils.js b/test/web-platform-tests/utils.js
@@ -7,7 +7,7 @@ const { Canvas } = require("../../lib/jsdom/utils.js");
 
 const hasCanvas = Boolean(Canvas);
 
-const nodeMajorVersion = process.versions.node.split(".")[0];
+const nodeMajorVersion = Number.parseInt(process.versions.node.split(".")[0]);
 
 exports.resolveReason = reason => {
   if (["fail-slow", "timeout", "flaky"].includes(reason)) {
@@ -18,10 +18,14 @@ exports.resolveReason = reason => {
     return "skip";
   }
 
-  if (reason === "fail-node18" && nodeMajorVersion === "18") {
+  if (reason === "fail-node18" && nodeMajorVersion === 18) {
     return "skip";
   }
 
+  if (reason === "fail-lt-node22" && nodeMajorVersion < 22) {
+    return "expect-fail";
+  }
+
   if (reason === "fail" ||
     (reason === "fail-with-canvas" && hasCanvas)) {
     return "expect-fail";