test: cleanup WPT setup files, update WPT fixtures, update expectations

test/common/wpt.js

@@ -251,6 +251,9 @@ class StatusRuleSet {
 
 // A specification of WPT test
 class WPTTestSpec {
+
+  #content;
+
   /**
    * @param {string} mod name of the WPT module, e.g.
    *                     'html/webappapis/microtask-queuing'
@@ -298,7 +301,10 @@ class WPTTestSpec {
   }
 
   getContent() {
-    return fs.readFileSync(this.getAbsolutePath(), 'utf8');
+    if (!this.#content) {
+      this.#content = fs.readFileSync(this.getAbsolutePath(), 'utf8');
+    }
+    return this.#content;
   }
 }
 
@@ -374,6 +380,7 @@ class StatusLoader {
         result.push(filepath);
       }
     }
+    result = result.filter((filepath) => !filepath.endsWith('.helper.js'));
     return result;
   }
 
@@ -484,9 +491,7 @@ class WPTRunner {
   pretendGlobalThisAs(name) {
     switch (name) {
       case 'Window': {
-        this.globalThisInitScripts.push(
-          `global.Window = Object.getPrototypeOf(globalThis).constructor;
-          self.GLOBAL.isWorker = () => false;`);
+        this.globalThisInitScripts.push('globalThis.Window = Object.getPrototypeOf(globalThis).constructor;');
         this.loadLazyGlobals();
         break;
       }
@@ -526,39 +531,10 @@ class WPTRunner {
     this.globalThisInitScripts.push(script);
   }
 
-  brandCheckGlobalScopeAttribute(name) {
-    // TODO(legendecas): idlharness GlobalScope attribute receiver validation.
-    const script = `
-      const desc = Object.getOwnPropertyDescriptor(globalThis, '${name}');
-      function getter() {
-        // Mimic GlobalScope instance brand check.
-        if (this !== globalThis) {
-          throw new TypeError('Illegal invocation');
-        }
-        return desc.get();
-      }
-      Object.defineProperty(getter, 'name', { value: 'get ${name}' });
-
-      function setter(value) {
-        // Mimic GlobalScope instance brand check.
-        if (this !== globalThis) {
-          throw new TypeError('Illegal invocation');
-        }
-        desc.set(value);
-      }
-      Object.defineProperty(setter, 'name', { value: 'set ${name}' });
-
-      Object.defineProperty(globalThis, '${name}', {
-        get: getter,
-        set: setter,
-      });
-    `;
-    this.globalThisInitScripts.push(script);
-  }
-
   // TODO(joyeecheung): work with the upstream to port more tests in .html
   // to .js.
   async runJsTests() {
+    this.pretendGlobalThisAs('Window');
     let queue = [];
 
     // If the tests are run as `node test/wpt/test-something.js subset.any.js`,
@@ -914,6 +890,17 @@ class WPTRunner {
         continue;
       }
 
+      if (filename.includes('tentative')) {
+        this.skip(filename, [ 'test makes assertions not yet required by any specification' ]);
+        continue;
+      }
+
+      const isServiceWorker = spec.getContent().includes('importScripts(')
+      if (isServiceWorker) {
+        this.skip(filename, [ 'importScripts is not defined' ]);
+        continue;
+      }
+
       queue.push(spec);
     }
     return queue;