Improve browser test

scripts/browserTest/index.mjs

@@ -1,3 +1,5 @@
+// @ts-check
+
 import crypto from 'crypto'
 import puppeteer from 'puppeteer'
 import { createServer } from 'http'
@@ -19,16 +21,46 @@ const ERROR_CODES = {
 let hasError = false
 
 const server = createServer(requestListener({ serve, collectCoverage }))
-server.closeAsync = () => new Promise(resolve => server.close(() => resolve()))
+server.closeAsync = () => /** @type {Promise<void>} */(new Promise(resolve => server.close(() => resolve())))
 
+/**
+ *  @param {{fileName:string, browser:puppeteer.Browser}} param0 
+ */
 const main = async ({ fileName, browser }) => {
   console.log(`> ${fileName}`)
 
   const page = await browser.newPage()
+  await page.setRequestInterception(true);
 
   // Enable both JavaScript and CSS coverage
   if (collectCoverage) await page.coverage.startJSCoverage()
 
+  /** @type {Array<puppeteer.HTTPRequest>} */
+  const requests = [];
+
+  // Blocks all window.location.href requests
+  page.on('request', async request => {
+    let isNavRequest = request.isNavigationRequest() && request.frame() === page.mainFrame();
+    if (!isNavRequest) {
+      request.continue();
+      return;
+    }
+
+    requests.push(request);
+    if (requests.length == 1) {
+      request.continue();
+      return;
+    }
+
+    request.abort('aborted');
+
+    const url = requests[requests.length - 1].url()
+    await page.evaluate((url) => {
+      window.__gotohref__ = url;
+    }, url);
+
+  });
+
   // Navigate to page
   let url = `http://localhost:8080/${fileName.replace(/^\+/, '')}`
   await page.goto(url, { waitUntil: 'networkidle2' })

scripts/browserTest/mime.mjs

@@ -1,3 +1,5 @@
+// @ts-check
+
 import { extname } from 'path'
 
 export const mime = fileName => {

scripts/browserTest/nyc.mjs

@@ -1,3 +1,5 @@
+// @ts-check
+
 import { spawn } from 'child_process'
 
 const isWin = process.platform === 'win32'

scripts/browserTest/requestListener.mjs

@@ -1,7 +1,8 @@
+// @ts-check
+
 import path from 'path'
 import { mime } from './mime.mjs'
 import { readFile } from 'fs/promises'
-import { spawn } from 'child_process'
 import { dirname, join } from 'path'
 import { fileURLToPath } from 'url'
 import { NYC } from './nyc.mjs'
@@ -13,12 +14,12 @@ const testerJS = await readFile(join(__dirname, './tester.js'), { encoding: 'utf
 
 export const totalPasses = [0, 0]
 
+/** @type {Array<{text:string, id: number, type?: string}>} */
 let _messages = []
+
 const sendMessages = () => {
   _messages
-    .sort((a, b) => {
-      a.id - b.id
-    })
+    .sort((a, b) => a.id - b.id)
     .forEach(m => {
       if (m.type === 'end') {
         const match = m.text.match(/(\d+)\/(\d+).passing/m)
@@ -39,6 +40,7 @@ const sendMessages = () => {
 
   _messages = []
 }
+
 const queueMessages = message => {
   _messages.push(message)