From a2cbb78dbd89f3c005632d0e16b006a16f20ddc7 Mon Sep 17 00:00:00 2001
From: trickypr <23250792+trickypr@users.noreply.github.com>
Date: Sat, 13 Apr 2024 20:00:31 +1000
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Extension=20test=20support=20(#56)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ports over the changes from #55. Primarily for integration testing.

## Added
- Window arguments (used for specifying browser urls)
- Infra for creating tests extensions

## Changed
- Use our own tap reporter with a less buggy parser
---
 apps/content/src/browser/browser.js           |  18 ++
 .../src/browser/components/PageAction.svelte  |  18 +-
 .../src/browser/components/UrlBox.svelte      |   4 +-
 .../browser/components/UrlBoxButton.svelte    |   4 +-
 .../src/browser/components/pageAction.js      |   3 +-
 .../src/browser/windowApi/WindowTabs.js       |  28 +-
 apps/content/static/gtests.html               |   7 +-
 apps/extensions/lib/parent/ext-pageAction.js  |   1 +
 apps/modules/lib/EPageActions.sys.mjs         |   3 +-
 apps/modules/lib/ExtensionTestUtils.sys.mjs   | 264 ++++++++++++++++++
 apps/modules/lib/TestManager.sys.mjs          |  88 +++---
 apps/tests/integrations/_index.sys.mjs        |  11 +-
 .../integrations/extensions/pageAction.mjs    |  89 ++++++
 libs/link/types/globals/Elements.d.ts         |   4 +
 libs/link/types/modules/EPageActions.d.ts     |   2 +
 .../types/modules/ExtensionTestUtils.d.ts     |  75 ++---
 libs/link/types/modules/TestManager.d.ts      |  22 +-
 package.json                                  |   5 +-
 pnpm-lock.yaml                                | 196 +++----------
 scripts/lib/tapReporter.ts                    |  59 ++++
 scripts/scripts.d.ts                          |  14 -
 scripts/setup.ts                              |   2 +-
 scripts/unit-test.ts                          |   6 +-
 23 files changed, 610 insertions(+), 313 deletions(-)
 create mode 100644 apps/modules/lib/ExtensionTestUtils.sys.mjs
 create mode 100644 apps/tests/integrations/extensions/pageAction.mjs
 create mode 100644 scripts/lib/tapReporter.ts
 delete mode 100644 scripts/scripts.d.ts

diff --git a/apps/content/src/browser/browser.js b/apps/content/src/browser/browser.js
index a42b5bd..98aff99 100644
--- a/apps/content/src/browser/browser.js
+++ b/apps/content/src/browser/browser.js
@@ -4,8 +4,26 @@
 // @ts-check
 import BrowserWindow from './BrowserWindow.svelte'
 import './browser.css'
+import * as WindowTabs from './windowApi/WindowTabs.js'
 import { registerEventBus } from './windowApi/eventBus.js'
 
+// Handle window arguments
+let rawArgs = window.arguments && window.arguments[0]
+/** @type {Record<string, string>} */
+let args = {}
+
+if (rawArgs && rawArgs instanceof Ci.nsISupports) {
+  args = rawArgs.wrappedJSObject || {}
+} else if (rawArgs) {
+  args = rawArgs
+}
+
+const initialUrls = args.initialUrl
+  ? [args.initialUrl]
+  : ['https://google.com/', 'https://svelte.dev/']
+
+WindowTabs.initialize(initialUrls)
+
 registerEventBus()
 
 new BrowserWindow({ target: document.body })
diff --git a/apps/content/src/browser/components/PageAction.svelte b/apps/content/src/browser/components/PageAction.svelte
index 1cc455e..e943f67 100644
--- a/apps/content/src/browser/components/PageAction.svelte
+++ b/apps/content/src/browser/components/PageAction.svelte
@@ -12,9 +12,15 @@
 
   /** @type {import('resource://app/modules/EPageActions.sys.mjs').PageActionImpl} */
   export let pageAction
+  /** @type {number} */
+  export let browserViewId
 
   const view = PageActionApi.setup(pageAction)
   const icons = PageActionApi.getIcons(view)
+  const extensionId = pageAction.extensionId
+    .replace('@', '')
+    .replace('}', '')
+    .replace('{', '')
   const trigger = view.trigger
   const panel = view.panel
 
@@ -45,7 +51,11 @@
   })
 </script>
 
-<UrlBoxButton bind:button={$trigger} on:click={PageActionApi.handleClick(view)}>
+<UrlBoxButton
+  bind:button={$trigger}
+  on:click={PageActionApi.handleClick(view)}
+  id={`page-action-icon__${extensionId}--${browserViewId}`}
+>
   {#if $icons}
     <img src={getIconUrlForPreferredSize($icons, 16)} />
   {:else}
@@ -54,7 +64,11 @@
 </UrlBoxButton>
 
 {#if pageAction.popupUrl}
-  <xul:panel bind:this={$panel} class="popup"></xul:panel>
+  <xul:panel
+    bind:this={$panel}
+    class="popup"
+    id={`page-action-panel__${extensionId}--${browserViewId}`}
+  ></xul:panel>
 {/if}
 
 <style>
diff --git a/apps/content/src/browser/components/UrlBox.svelte b/apps/content/src/browser/components/UrlBox.svelte
index ff95e3a..c475dd7 100644
--- a/apps/content/src/browser/components/UrlBox.svelte
+++ b/apps/content/src/browser/components/UrlBox.svelte
@@ -162,7 +162,9 @@
   />
 
   {#each $pageActions as [_, pageAction]}
-    <PageAction {pageAction} />
+    {#if $uri && pageAction.shouldShow($uri.asciiSpec, view.browserId || 0)}
+      <PageAction {pageAction} browserViewId={view.windowBrowserId} />
+    {/if}
   {/each}
 
   <div
diff --git a/apps/content/src/browser/components/UrlBoxButton.svelte b/apps/content/src/browser/components/UrlBoxButton.svelte
index 4836a8d..ad8fe1c 100644
--- a/apps/content/src/browser/components/UrlBoxButton.svelte
+++ b/apps/content/src/browser/components/UrlBoxButton.svelte
@@ -4,11 +4,13 @@
 
 <script>
   export let disabled = false
+  /** @type {string | undefined} */
+  export let id = undefined
   /** @type {HTMLButtonElement | undefined} */
   export let button = undefined
 </script>
 
-<button on:click bind:this={button} {disabled}>
+<button on:click bind:this={button} {disabled} {id}>
   <slot />
 </button>
 
diff --git a/apps/content/src/browser/components/pageAction.js b/apps/content/src/browser/components/pageAction.js
index 311233c..7921f7a 100644
--- a/apps/content/src/browser/components/pageAction.js
+++ b/apps/content/src/browser/components/pageAction.js
@@ -66,12 +66,13 @@ export function handleClick(view) {
       },
     })
 
-    await buildPanelBrowser(view)
     // Panel may not exist if there is no popupUrl
     const panel = view.panel()
     if (view.panel()) {
       panel.openPopup(view.trigger(), 'bottomright topright')
     }
+
+    await buildPanelBrowser(view)
   }
 }
 
diff --git a/apps/content/src/browser/windowApi/WindowTabs.js b/apps/content/src/browser/windowApi/WindowTabs.js
index ca204f0..bc0dac3 100644
--- a/apps/content/src/browser/windowApi/WindowTabs.js
+++ b/apps/content/src/browser/windowApi/WindowTabs.js
@@ -55,20 +55,7 @@ activeTabId.subscribe((activeId) => {
 /**
  * @type {import('@amadeus-it-group/tansu').WritableSignal<WebsiteTab[]>}
  */
-export const windowTabs = writable([
-  {
-    kind: 'website',
-    view: WebsiteViewApi.create(
-      browserImports.NetUtil.newURI('https://google.com'),
-    ),
-  },
-  {
-    kind: 'website',
-    view: WebsiteViewApi.create(
-      browserImports.NetUtil.newURI('https://svelte.dev'),
-    ),
-  },
-])
+export const windowTabs = writable([])
 
 export const activeTab = derived(
   [activeTabId, windowTabs],
@@ -76,4 +63,15 @@ export const activeTab = derived(
     $windowTabs.find((tab) => tab.view.windowBrowserId === $activeTabId),
 )
 
-activeTabId.set(windowTabs()[0].view.windowBrowserId)
+/**
+ * @param {string[]} urls
+ */
+export function initialize(urls) {
+  windowTabs.set(
+    urls.map((url) => ({
+      kind: 'website',
+      view: WebsiteViewApi.create(browserImports.NetUtil.newURI(url)),
+    })),
+  )
+  activeTabId.set(windowTabs()[0].view.windowBrowserId)
+}
diff --git a/apps/content/static/gtests.html b/apps/content/static/gtests.html
index 1d18a18..e012884 100644
--- a/apps/content/static/gtests.html
+++ b/apps/content/static/gtests.html
@@ -18,12 +18,7 @@ <h1>Test runner</h1>
 
       // @ts-check
       /// <reference types="@browser/link" />
-      console.log('start import')
-
-      console.log('import int')
-
-      console.log('call')
-      TestManager.call()
+      TestManager.report()
     </script>
   </body>
 </html>
diff --git a/apps/extensions/lib/parent/ext-pageAction.js b/apps/extensions/lib/parent/ext-pageAction.js
index c0ebab0..dd00f1e 100644
--- a/apps/extensions/lib/parent/ext-pageAction.js
+++ b/apps/extensions/lib/parent/ext-pageAction.js
@@ -15,6 +15,7 @@ this.pageAction = class extends ExtensionAPIPersistent {
     const options = extension.manifest.page_action
 
     this.pageAction = new lazy.EPageActions.PageAction({
+      extensionId: extension.id,
       tooltip: options.default_title,
       popupUrl: options.default_popup,
       showMatches: options.show_matches,
diff --git a/apps/modules/lib/EPageActions.sys.mjs b/apps/modules/lib/EPageActions.sys.mjs
index 9aed654..a416f4e 100644
--- a/apps/modules/lib/EPageActions.sys.mjs
+++ b/apps/modules/lib/EPageActions.sys.mjs
@@ -1,7 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 /// @ts-check
 /// <reference types="@browser/link" />
 import mitt from 'resource://app/modules/mitt.sys.mjs'
@@ -15,6 +14,7 @@ export class PageAction {
   /** @type {import('resource://app/modules/EPageActions.sys.mjs').PageActionImpl['events']} */
   events = mitt()
 
+  extensionId
   tooltip
   popupUrl
   showMatches
@@ -31,6 +31,7 @@ export class PageAction {
    * @param {import('resource://app/modules/EPageActions.sys.mjs').PageActionOptions<string[]>} data
    */
   constructor(data) {
+    this.extensionId = data.extensionId
     this.tooltip = data.tooltip
     this.popupUrl = data.popupUrl
     this.showMatches = new MatchPatternSet(data.showMatches || [])
diff --git a/apps/modules/lib/ExtensionTestUtils.sys.mjs b/apps/modules/lib/ExtensionTestUtils.sys.mjs
new file mode 100644
index 0000000..14dc282
--- /dev/null
+++ b/apps/modules/lib/ExtensionTestUtils.sys.mjs
@@ -0,0 +1,264 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// @ts-check
+import { lazyESModuleGetters } from 'resource://app/modules/TypedImportUtils.sys.mjs'
+
+const lazy = lazyESModuleGetters({
+  AddonManager: 'resource://gre/modules/AddonManager.sys.mjs',
+  Extension: 'resource://gre/modules/Extension.sys.mjs',
+  ExtensionData: 'resource://gre/modules/Extension.sys.mjs',
+  ExtensionUtils: 'resource://gre/modules/ExtensionUtils.sys.mjs',
+  FileUtils: 'resource://gre/modules/FileUtils.sys.mjs',
+})
+
+/**
+ * @param {Function} script
+ * @returns {string}
+ */
+function serializeFunction(script) {
+  // Serialization of object methods doesn't include `function` anymore.
+  const method = /^(async )?(?:(\w+)|"(\w+)\.js")\(/
+
+  let code = script.toString()
+  let match = code.match(method)
+  if (match && match[2] !== 'function') {
+    code = code.replace(method, '$1function $2$3(')
+  }
+  return code
+}
+
+/**
+ * @param {string | Function | Array<string>} script
+ * @returns {string}
+ */
+function serializeScript(script) {
+  if (Array.isArray(script)) {
+    return Array.from(script, serializeScript).join(';')
+  }
+
+  if (typeof script !== 'function') return script
+  return `(${serializeFunction(script)})();`
+}
+
+/**
+ * @param {Partial<import("resource://app/modules/ExtensionTestUtils.sys.mjs").ExtStaticManifest>} data
+ * @returns {Record<string, string>}
+ */
+function generateFiles(data) {
+  const files = { ...data.files }
+
+  /** @type {Partial<import("resource://app/modules/ExtensionTestUtils.sys.mjs").WebExtensionManifest>} */
+  const manifest = data.manifest || {}
+
+  manifest.name ??= 'Generated extension'
+  manifest.manifest_version ??= 2
+  manifest.version ??= '1.0'
+
+  if (data.background) {
+    const bgScript = `${Services.uuid.generateUUID().number}.js`
+    files[bgScript] = data.background
+    manifest.background = { scripts: [bgScript], persistent: true }
+  }
+
+  files['manifest.json'] = JSON.stringify(manifest, null, 2)
+  return files
+}
+
+/**
+ * @param {Record<string, string>} files
+ * @returns {nsIFileType}
+ */
+function generateZipFile(files) {
+  const baseName = 'generated-extension.xpi'
+  const ZipWriter = Components.Constructor(
+    '@mozilla.org/zipwriter;1',
+    'nsIZipWriter',
+  )
+  const writer = new ZipWriter()
+
+  const file = new lazy.FileUtils.File(
+    PathUtils.join(PathUtils.tempDir, baseName),
+  )
+  file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, lazy.FileUtils.PERMS_FILE)
+
+  const { MODE_WRONLY, MODE_TRUNCATE } = lazy.FileUtils
+  writer.open(file, MODE_WRONLY | MODE_TRUNCATE)
+
+  const time = Date.now() * 1000
+
+  for (const filename in files) {
+    const contents = files[filename]
+    const buffer = new TextEncoder().encode(contents).buffer
+
+    const stream = Cc[
+      '@mozilla.org/io/arraybuffer-input-stream;1'
+    ].createInstance(Ci.nsIArrayBufferInputStream)
+    stream.setData(buffer, 0, buffer.byteLength)
+
+    const components = filename.split('/')
+    let path = ''
+    for (const component of components.slice(0, -1)) {
+      path += component + '/'
+      if (!writer.hasEntry(path)) {
+        writer.addEntryDirectory(path, time, false)
+      }
+    }
+
+    writer.addEntryStream(filename, time, 0, stream, false)
+  }
+
+  writer.close()
+  return file
+}
+
+/**
+ * @param {Partial<import("resource://app/modules/ExtensionTestUtils.sys.mjs").ExtStaticManifest>} data
+ * @returns {nsIFileType}
+ */
+function generateXPI(data) {
+  const files = generateFiles(data)
+  return generateZipFile(files)
+}
+
+/**
+ * @param {Partial<import("resource://app/modules/ExtensionTestUtils.sys.mjs").ExtStaticManifest>} data
+ * @returns {import('resource://gre/modules/Extension.sys.mjs').Extension}
+ */
+function generate(data) {
+  const file = generateXPI(data)
+
+  lazy.ExtensionUtils.flushJarCache(file.path)
+  Services.ppmm.broadcastAsyncMessage('Extension:FlushJarCache', {
+    path: file.path,
+  })
+
+  const fileURI = Services.io.newFileURI(file)
+  const jarURI = Services.io.newURI(`jar:${fileURI.spec}!/`)
+
+  const id = Services.uuid.generateUUID().number
+  // TODO: Allow the manifest to specify signed states
+  const signedState = lazy.AddonManager.SIGNEDSTATE_SIGNED
+
+  return new lazy.Extension(
+    {
+      id,
+      resourceURI: jarURI,
+      cleanupFile: file,
+      signedState,
+      temporarilyInstalled: true,
+      isPrivleged: false,
+      TEST_NO_ADDON_MANAGER: true,
+      TEST_NO_DELAYED_STARTUP: true,
+    },
+    'ADDON_INSTALL',
+    undefined,
+  )
+}
+
+/**
+ * @template T
+ * @template R
+ *
+ * @param {Record<string, T>} obj
+ * @param {(value: T, key: string, index: number) => R} fn
+ *
+ * @returns {Record<string, R>}
+ */
+const objectMap = (obj, fn) =>
+  Object.fromEntries(Object.entries(obj).map(([k, v], i) => [k, fn(v, k, i)]))
+
+/**
+ * @typedef {import("resource://app/modules/ExtensionTestUtils.sys.mjs").IExtensionTestUtils} IExtensionTestUtils
+ */
+
+/**
+ * @implements {IExtensionTestUtils}
+ */
+class ExtensionTestUtilsImpl {
+  /**
+   * @template {import('resource://app/modules/zora.sys.mjs').IAssert} A
+   *
+   * @param {Partial<import("resource://app/modules/ExtensionTestUtils.sys.mjs").ExtManifest>} definition
+   * @param {import('resource://app/modules/ExtensionTestUtils.sys.mjs').AddonMiddleware<A>} assert
+   *
+   * @returns {import('resource://app/modules/ExtensionTestUtils.sys.mjs').ExtensionWrapper}
+   */
+  loadExtension(definition, assert) {
+    const extension = generate({
+      ...definition,
+      files: objectMap(definition.files || {}, serializeScript),
+      background:
+        definition.background && serializeScript(definition.background),
+    })
+
+    function handleTestResults(kind, pass, msg, ...args) {
+      if (kind == 'test-eq') {
+        let [expected, actual] = args
+        assert.ok(pass, `${msg} - Expected: ${expected}, Actual: ${actual}`)
+      } else if (kind == 'test-log') {
+        console.info(msg)
+      } else if (kind == 'test-result') {
+        assert.ok(pass, msg)
+      }
+    }
+
+    extension.on('test-result', handleTestResults)
+    extension.on('test-eq', handleTestResults)
+    extension.on('test-log', handleTestResults)
+    extension.on('test-done', (...args) =>
+      console.warn('Not Implemented', ...args),
+    )
+
+    extension.on('test-message', (...args) => console.log('message', ...args))
+
+    return {
+      extension,
+      async startup() {
+        try {
+          /** @type {Promise<[string, string]>} */
+          const startupPromise = new Promise((res) =>
+            extension.once('startup', (_eventName, ext) =>
+              res([ext.id, ext.uuid]),
+            ),
+          )
+
+          const extensionData = new lazy.ExtensionData(extension.rootURI)
+          await extensionData.loadManifest()
+          try {
+            await extensionData.initAllLocales()
+          } catch {
+            /* Ignore */
+          }
+          await extension.startup()
+          return await startupPromise
+        } catch (e) {
+          assert.fail(`Errored: ${e}`)
+        }
+      },
+      async unload() {
+        await extension.shutdown()
+        return await extension._uninstallPromise
+      },
+
+      sendMsg(msg) {
+        extension.testMessage(msg)
+      },
+      async awaitMsg(msg) {
+        return new Promise((res) => {
+          const callback = (_, event) => {
+            if (event == msg) {
+              extension.off('test-message', callback)
+              res(void 0)
+            }
+          }
+
+          extension.on('test-message', callback)
+        })
+      },
+    }
+  }
+}
+
+export const ExtensionTestUtils = new ExtensionTestUtilsImpl()
diff --git a/apps/modules/lib/TestManager.sys.mjs b/apps/modules/lib/TestManager.sys.mjs
index be9b5b8..81e4d1d 100644
--- a/apps/modules/lib/TestManager.sys.mjs
+++ b/apps/modules/lib/TestManager.sys.mjs
@@ -1,7 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 // @ts-check
 /// <reference types="@browser/link" />
 import {
@@ -15,55 +14,70 @@ const TEST_PORT = 3948
 
 /** @typedef {import('resource://app/modules/TestManager.sys.mjs').TestManagerInterface} TestManagerInst */
 
+// Tell the test reporter not to output to console straight away
+hold()
+
 /** @implements {TestManagerInst} */
 class TestManagerSingleton {
   /**
-   * @private
-   * @type {import('resource://app/modules/TestManager.sys.mjs').Test[]}
+   * @public
+   * @param {string} descr
+   * @param {(assert: import('resource://app/modules/TestManager.sys.mjs').IDefaultAssert) => Promise<void> | void} assertFn
    */
-  tests = []
+  async test(descr, assertFn) {
+    const cleanup = []
 
-  /**
-   * @param {string} name
-   * @param {import('resource://app/modules/TestManager.sys.mjs').BrowserTestFunction} spec
-   * @param {import('resource://app/modules/zora.sys.mjs').ITestOptions} [options]
-   */
-  browserTest(name, spec, options) {
-    this.tests.push({ name, spec, options })
+    return await test(descr, async (assert) => {
+      /** @type {import('resource://app/modules/TestManager.sys.mjs').IDefaultAssert} */
+      const newAssert = {
+        ...assert,
+        onCleanup: (cleanupFn) => void cleanup.push(cleanupFn),
+      }
+
+      const ret = await assertFn(newAssert)
+
+      for (let i = 0; i < cleanup.length; i++) {
+        const fn = cleanup[i]
+        await fn(newAssert)
+      }
+
+      return ret
+    })
   }
 
-  async call() {
-    hold()
+  /**
+   * @param {string} initialUrl
+   * @param {(win: Window) => Promise<void>} using
+   */
+  async withBrowser(initialUrl, using) {
+    const args = { initialUrl }
 
-    console.log('Starting tests')
-    let testIndex = 0
-    for (const { name, spec, options } of this.tests) {
-      testIndex += 1
-      console.time(`test-${testIndex}`)
-      /** @type {Window} */
-      // @ts-expect-error Incorrect type gen
-      const window = Services.ww.openWindow(
-        // @ts-expect-error Incorrect type generation
-        null,
-        Services.prefs.getStringPref('app.content'),
-        '_blank',
-        'chrome,dialog=no,all',
-        undefined,
-      )
+    /** @type {Window} */
+    // @ts-expect-error Incorrect type gen
+    const window = Services.ww.openWindow(
+      // @ts-expect-error Incorrect type generation
+      null,
+      Services.prefs.getStringPref('app.content'),
+      '_blank',
+      'chrome,dialog=no,all',
+      args,
+    )
 
-      await new Promise((res) =>
-        window.addEventListener('DOMContentLoaded', res),
-      )
-      const testFn = spec(window)
-      await test(name, testFn, options)
-      window.close()
-      console.time(`test-${testIndex}`)
-    }
+    await new Promise((res) => window.addEventListener('DOMContentLoaded', res))
+    await using(window)
+    window.close()
+  }
 
+  async report() {
     let log = ''
-    const reporter = createTAPReporter({ log: (s) => (log += s + '\n') })
+    const reporter = createTAPReporter({
+      log: (s) => {
+        log += s + '\n'
+      },
+    })
     await report({ reporter })
 
+    console.log(log)
     await fetch(`http://localhost:${TEST_PORT}/results`, {
       method: 'POST',
       body: log,
diff --git a/apps/tests/integrations/_index.sys.mjs b/apps/tests/integrations/_index.sys.mjs
index 34b8353..b7f8260 100644
--- a/apps/tests/integrations/_index.sys.mjs
+++ b/apps/tests/integrations/_index.sys.mjs
@@ -1,13 +1,4 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import { TestManager } from 'resource://app/modules/TestManager.sys.mjs'
-
-TestManager.browserTest('Has Tabs', (window) => (test) => {
-  test.notEq(
-    window.document.getElementsByClassName('tabs').length,
-    0,
-    'There must be at least one element with the class tabs',
-  )
-})
+import './extensions/pageAction.mjs'
diff --git a/apps/tests/integrations/extensions/pageAction.mjs b/apps/tests/integrations/extensions/pageAction.mjs
new file mode 100644
index 0000000..6c62ca5
--- /dev/null
+++ b/apps/tests/integrations/extensions/pageAction.mjs
@@ -0,0 +1,89 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// @ts-check
+/// <reference types="@browser/link" />
+import { ExtensionTestUtils } from 'resource://app/modules/ExtensionTestUtils.sys.mjs'
+import { TestManager } from 'resource://app/modules/TestManager.sys.mjs'
+
+/**
+ * @param {() => boolean} predicate
+ * @returns {Promise<void>}
+ */
+async function spinLock(predicate) {
+  while (!predicate()) {
+    await new Promise((res) => setTimeout(res, 100))
+  }
+}
+
+await TestManager.withBrowser('http://example.com/', async (window) => {
+  await TestManager.test('Extension Test', async (test) => {
+    const extension = ExtensionTestUtils.loadExtension(
+      {
+        manifest: {
+          page_action: {
+            default_icon: './flask-line.svg',
+            default_popup: 'pageaction.html',
+            show_matches: ['<all_urls>'],
+          },
+        },
+        files: {
+          'flask-line.svg': `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M15.9994 2V4H14.9994V7.24291C14.9994 8.40051 15.2506 9.54432 15.7357 10.5954L20.017 19.8714C20.3641 20.6236 20.0358 21.5148 19.2836 21.8619C19.0865 21.9529 18.8721 22 18.655 22H5.34375C4.51532 22 3.84375 21.3284 3.84375 20.5C3.84375 20.2829 3.89085 20.0685 3.98181 19.8714L8.26306 10.5954C8.74816 9.54432 8.99939 8.40051 8.99939 7.24291V4H7.99939V2H15.9994ZM13.3873 10.0012H10.6115C10.5072 10.3644 10.3823 10.7221 10.2371 11.0724L10.079 11.4335L6.12439 20H17.8734L13.9198 11.4335C13.7054 10.9691 13.5276 10.4902 13.3873 10.0012ZM10.9994 7.24291C10.9994 7.49626 10.9898 7.7491 10.9706 8.00087H13.0282C13.0189 7.87982 13.0119 7.75852 13.0072 7.63704L12.9994 7.24291V4H10.9994V7.24291Z"></path></svg>`,
+          'pageaction.html': `
+          <!DOCTYPE html>
+          <html lang="en">
+            <head>
+              <meta charset="UTF-8" />
+              <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+              <title>Page Action</title>
+            </head>
+            <body>
+              <h1>Hello world</h1>
+            </body>
+          </html>`,
+        },
+      },
+      test,
+    )
+
+    await extension.startup()
+    await new Promise((res) => setTimeout(res, 100))
+
+    const pageActionId = `page-action-icon__${extension.extension.id}--0`
+      .replace('@', '')
+      .replace('}', '')
+      .replace('{', '')
+    let pageActionButton = window.document.getElementById(pageActionId)
+    test.truthy(pageActionButton, 'Page action must exist')
+
+    await test.test('Page Action - Panel', async (test) => {
+      pageActionButton?.click()
+
+      const pageActionPanelId =
+        `page-action-panel__${extension.extension.id}--0`
+          .replace('@', '')
+          .replace('}', '')
+          .replace('{', '')
+      const pageActionPanel = window.document.getElementById(pageActionPanelId)
+      test.truthy(pageActionPanel, 'The panel has opened')
+
+      await new Promise((res) => queueMicrotask(res))
+
+      /** @type {XULBrowserElement | null} */
+      const browserElement = window.document.querySelector(
+        `#${pageActionPanelId} > browser`,
+      )
+
+      test.truthy(browserElement, 'Browser element must exist')
+      await spinLock(() => browserElement?.mInitialized)
+      test.ok('Panel initialized')
+    })
+
+    await extension.unload()
+
+    pageActionButton = window.document.getElementById(pageActionId)
+    test.falsy(pageActionButton, 'Page action should be removed')
+
+    test.ok(true, 'Test finished')
+  })
+})
diff --git a/libs/link/types/globals/Elements.d.ts b/libs/link/types/globals/Elements.d.ts
index a9cf852..d1ad86f 100644
--- a/libs/link/types/globals/Elements.d.ts
+++ b/libs/link/types/globals/Elements.d.ts
@@ -4,6 +4,10 @@
 
 /// <reference types="gecko-types" />
 
+declare interface Window {
+  arguments?: [Record<string, string> | nsISupportsType]
+}
+
 declare interface Document {
   documentURIObject: nsIURIType
 }
diff --git a/libs/link/types/modules/EPageActions.d.ts b/libs/link/types/modules/EPageActions.d.ts
index c645973..4746e94 100644
--- a/libs/link/types/modules/EPageActions.d.ts
+++ b/libs/link/types/modules/EPageActions.d.ts
@@ -28,6 +28,8 @@ declare module 'resource://app/modules/EPageActions.sys.mjs' {
    *       power users, we might want to implement `pinned`
    */
   export interface PageActionOptions<PS = MatchPatternSet> {
+    extensionId?: string
+
     /**
      * The tooltip displayed when the user hovers over the action button.
      *
diff --git a/libs/link/types/modules/ExtensionTestUtils.d.ts b/libs/link/types/modules/ExtensionTestUtils.d.ts
index bff9b3a..a4e7cdc 100644
--- a/libs/link/types/modules/ExtensionTestUtils.d.ts
+++ b/libs/link/types/modules/ExtensionTestUtils.d.ts
@@ -1,50 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 /// <reference types="@types/firefox-webext-browser" />
 
 declare module 'resource://app/modules/ExtensionTestUtils.sys.mjs' {
-  import type { IAssert } from 'zora'
-
-  type AddonWrapper = unknown
-  type ContentPage = unknown
-
-  export class ExtensionWrapper {
-    addon: AddonWrapper
-    addonPromise: Promise<AddonWrapper>
-    cleanupFiles: nsIFileType[]
-
-    destroy()
-    attachExtension(extension)
-    clearMessageQueues()
-    handleResult(kind: string, pass, nsg, expected, actual)
-    handleMessage(kind: string, msg, ...args)
+  import type { IDefaultAssert } from 'resource://app/modules/TestManager.sys.mjs'
+  import type { Extension } from 'resource://gre/modules/Extension.sys.mjs'
 
-    awaitStartup(): Promise<AddonWrapper>
-    awaitBackgroundStarted(): Promise<[AddonWrapper, unknown]>
-    startup(): Promise<void>
-
-    terminateBackground(...args): Promise<unknown>
-    wakeupBackground(): Promise<unknown>
-    sendMessage(...args): Promise<unknown>
-    awaitFInish(msg): Promise<unknown>
-
-    checkMessages(): void
-    checkDuplicateListener(msg): void
-    awaitMessage(msg): Promise<void>
-    onMessage(msg, callback): void
-  }
-
-  export type ExtensionTestAssertions = {
-    getPersistentListeners(extWrapper, apiNs, apiEvent)
-    assertPersistentListeners(
-      extWrapper,
-      apiNs,
-      apiEvent,
-      options: { primed; persisted: boolean; primedListenersCount },
-    )
-  }
+  export type WebExtensionManifest = browser._manifest.WebExtensionManifest
 
   /* eslint @typescript-eslint/ban-types: 0 */
   export type ExtSerializableScript = string | Function | Array<string>
@@ -54,19 +17,33 @@ declare module 'resource://app/modules/ExtensionTestUtils.sys.mjs' {
     manifest: browser._manifest.WebExtensionManifest
   }
 
-  export const ExtensionTestUtils: {
-    getBackgroundServiceWorkerEnabled(): boolean
-    isInBackgroundServiceWorkerTests(): boolean
+  export type ExtensionWrapper = {
+    extension: Extension
+    startup(): Promise<[string, string]>
+    unload(): Promise<unknown>
 
-    testAssertions: ExtensionTestAssertions
+    sendMsg(msg: string): void
+    awaitMsg(msg: string): Promise<void>
+  }
 
-    loadExtension(
-      ext: Partial<ExtManifest>,
-      assert: IAssert,
-    ): { extension: ExtensionWrapper; cleanupFn: () => void }
+  /**
+   * Similar in structure to {@link ExtManifest}, except only allowing strings
+   * to be provided
+   */
+  export type ExtStaticManifest = {
+    files: Record<string, string>
+    background: string
+    manifest: browser._manifest.WebExtensionManifest
+  }
 
-    failOnSchemaWarnings(warningsAsErrors?: boolean): void
+  export interface IExtensionTestUtils {
+    loadExtension(
+      definition: Partial<ExtManifest>,
+      assert: IDefaultAssert,
+    ): ExtensionWrapper
   }
+
+  const ExtensionTestUtils: IExtensionTestUtils
 }
 
 declare interface MozESMExportFile {
diff --git a/libs/link/types/modules/TestManager.d.ts b/libs/link/types/modules/TestManager.d.ts
index f9206d3..947691f 100644
--- a/libs/link/types/modules/TestManager.d.ts
+++ b/libs/link/types/modules/TestManager.d.ts
@@ -3,10 +3,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 declare module 'resource://app/modules/TestManager.sys.mjs' {
-  import type { ISpecFunction, ITestOptions } from 'zora'
+  import type { ISpecFunction, ITestOptions, IAssert } from 'zora'
 
   export type BrowserTestFunction = (window: Window) => ISpecFunction
 
+  export type IDefaultAssert = IAssert & {
+    onCleanup: (fn: (assert: IDefaultAssert) => Promise<void> | void) => void
+  }
+
   export type Test = {
     name: string
     spec: BrowserTestFunction
@@ -14,12 +18,16 @@ declare module 'resource://app/modules/TestManager.sys.mjs' {
   }
 
   export interface TestManagerInterface {
-    browserTest(
-      name: string,
-      spec: BrowserTestFunction,
-      options?: ITestOptions,
-    ): void
-    call(): Promise<void>
+    test(
+      description: string,
+      assertFn: (assert: IDefaultAssert) => Promise<void> | void,
+    ): Promise<void>
+    withBrowser(
+      defaultUrl: string,
+      using: (win: Window) => Promise<void>,
+    ): Promise<void>
+
+    report(): Promise<void>
   }
 
   export const TestManager: TestManagerInterface
diff --git a/package.json b/package.json
index 508b793..4532abe 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "lint": "eslint .",
     "format": "pnpm lint && pnpm script:license-check --fix && prettier . --write --plugin prettier-plugin-svelte",
     "data": "concurrently -c auto pnpm:data:*",
-    "data:tld": "wget https://data.iana.org/TLD/tlds-alpha-by-domain.txt -O ./apps/content/src/browser/data/tld.txt"
+    "data:tld": "wget https://data.iana.org/TLD/tlds-alpha-by-domain.txt -O ./apps/content/src/browser/data/tld.txt",
+    "test": "pnpm script:unit-test"
   },
   "keywords": [],
   "author": "",
@@ -38,7 +39,7 @@
     "prettier": "^3.0.3",
     "prettier-plugin-organize-imports": "^3.2.3",
     "prettier-plugin-svelte": "^3.0.3",
-    "tap-spec": "^5.0.0",
+    "tap-parser": "^15.3.2",
     "turbo": "^1.11.2",
     "typescript": "^5.2.2"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 548cdf7..7a07c39 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -58,9 +58,9 @@ importers:
       prettier-plugin-svelte:
         specifier: ^3.0.3
         version: 3.0.3(prettier@3.0.3)(svelte@4.2.12)
-      tap-spec:
-        specifier: ^5.0.0
-        version: 5.0.0
+      tap-parser:
+        specifier: ^15.3.2
+        version: 15.3.2
       turbo:
         specifier: ^1.11.2
         version: 1.11.2
@@ -1023,21 +1023,11 @@ packages:
     hasBin: true
     dev: true
 
-  /ansi-regex@2.1.1:
-    resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /ansi-regex@5.0.1:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
     dev: true
 
-  /ansi-styles@2.2.1:
-    resolution: {integrity: sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /ansi-styles@3.2.1:
     resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
     engines: {node: '>=4'}
@@ -1165,10 +1155,6 @@ packages:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
     dev: true
 
-  /buffer-shims@1.0.0:
-    resolution: {integrity: sha512-Zy8ZXMyxIT6RMTeY7OP/bDndfj6bwCan7SS98CEndS6deHwWPpseeHlwarNcBim+etXnF9HBc1non5JgDaJU1g==}
-    dev: true
-
   /bytes@3.0.0:
     resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==}
     engines: {node: '>= 0.8'}
@@ -1202,17 +1188,6 @@ packages:
     resolution: {integrity: sha512-W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA==}
     dev: true
 
-  /chalk@1.1.3:
-    resolution: {integrity: sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      ansi-styles: 2.2.1
-      escape-string-regexp: 1.0.5
-      has-ansi: 2.0.0
-      strip-ansi: 3.0.1
-      supports-color: 2.0.0
-    dev: true
-
   /chalk@2.4.2:
     resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
     engines: {node: '>=4'}
@@ -1639,10 +1614,6 @@ packages:
       tslib: 2.6.2
     dev: true
 
-  /duplexer@0.1.2:
-    resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
-    dev: true
-
   /ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
     dev: true
@@ -1850,6 +1821,11 @@ packages:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
 
+  /events-to-array@2.0.3:
+    resolution: {integrity: sha512-f/qE2gImHRa4Cp2y1stEOSgw8wTFyUdVJX7G//bMwbaV9JqISFxg99NbmVQeP7YLnDUZ2un851jlaDrlpmGehQ==}
+    engines: {node: '>=12'}
+    dev: true
+
   /events@3.3.0:
     resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
     engines: {node: '>=0.8.x'}
@@ -1965,14 +1941,6 @@ packages:
       websocket-driver: 0.7.4
     dev: true
 
-  /figures@1.7.0:
-    resolution: {integrity: sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      escape-string-regexp: 1.0.5
-      object-assign: 4.1.1
-    dev: true
-
   /file-entry-cache@6.0.1:
     resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
     engines: {node: ^10.12.0 || >=12.0.0}
@@ -2170,13 +2138,6 @@ packages:
     resolution: {integrity: sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==}
     dev: true
 
-  /has-ansi@2.0.0:
-    resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      ansi-regex: 2.1.1
-    dev: true
-
   /has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
@@ -2455,11 +2416,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-finite@1.1.0:
-    resolution: {integrity: sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /is-fullwidth-code-point@3.0.0:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
@@ -2908,11 +2864,6 @@ packages:
       boolbase: 1.0.0
     dev: true
 
-  /object-assign@4.1.1:
-    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /object-inspect@1.12.3:
     resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
     dev: true
@@ -3039,11 +2990,6 @@ packages:
       lines-and-columns: 1.2.4
     dev: true
 
-  /parse-ms@1.0.1:
-    resolution: {integrity: sha512-LpH1Cf5EYuVjkBvCDBYvkUPh+iv2bk3FHflxHkpCYT0/FZ1d3N3uJaLiHr4yGuMcFUhv6eAivitTvWZI4B/chg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /parseurl@1.3.3:
     resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
     engines: {node: '>= 0.8'}
@@ -3112,11 +3058,6 @@ packages:
       find-up: 4.1.0
     dev: true
 
-  /plur@1.0.0:
-    resolution: {integrity: sha512-qSnKBSZeDY8ApxwhfVIwKwF36KVJqb1/9nzYYq3j3vdwocULCXT8f8fQGkiw1Nk9BGfxiDagEe/pwakA+bOBqw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /postcss-loader@7.3.4(postcss@8.4.31)(typescript@5.3.3)(webpack@5.89.0):
     resolution: {integrity: sha512-iW5WTTBSC5BfsBJ9daFMPVrLT36MrNiC6fqOZTTaHjBNX6Pfd5p+hSBqe/fEeNd7pc13QiAyGt7VdGMw4eRC4A==}
     engines: {node: '>= 14.15.0'}
@@ -3240,19 +3181,6 @@ packages:
       renderkid: 3.0.0
     dev: true
 
-  /pretty-ms@2.1.0:
-    resolution: {integrity: sha512-H2enpsxzDhuzRl3zeSQpQMirn8dB0Z/gxW96j06tMfTviUWvX14gjKb7qd1gtkUyYhDPuoNe00K5PqNvy2oQNg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-finite: 1.1.0
-      parse-ms: 1.0.1
-      plur: 1.0.0
-    dev: true
-
-  /process-nextick-args@1.0.7:
-    resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
-    dev: true
-
   /process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
     dev: true
@@ -3302,22 +3230,6 @@ packages:
       unpipe: 1.0.0
     dev: true
 
-  /re-emitter@1.1.3:
-    resolution: {integrity: sha512-bHJul9CWcocrS+w5e5QrKYXV9NkbSA9hxSEyhYuctwm6keY9NXR2Xt/4A0vbMP0QvuwyfEyb4bkowYXv1ziEbg==}
-    dev: true
-
-  /readable-stream@2.2.9:
-    resolution: {integrity: sha512-iuxqX7b7FYt08AriYECxUsK9KTXE3A/FenxIa3IPmvANHxaTP/wGIwwf+IidvvIDk/MsCp/oEV6A8CXo4SDcCg==}
-    dependencies:
-      buffer-shims: 1.0.0
-      core-util-is: 1.0.3
-      inherits: 2.0.4
-      isarray: 1.0.0
-      process-nextick-args: 1.0.7
-      string_decoder: 1.0.3
-      util-deprecate: 1.0.2
-    dev: true
-
   /readable-stream@2.3.8:
     resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
     dependencies:
@@ -3381,11 +3293,6 @@ packages:
       strip-ansi: 6.0.1
     dev: true
 
-  /repeat-string@1.6.1:
-    resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
-    engines: {node: '>=0.10'}
-    dev: true
-
   /require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -3737,12 +3644,6 @@ packages:
       - supports-color
     dev: true
 
-  /split@1.0.0:
-    resolution: {integrity: sha512-3SVfJe2A0WZg3D+ZEtXqYkvpSGAVaZ1MgufNCeHioBESCqQFsuT1VcQufiopBfJZqh92ZwQ6ddL378iUSbqVNQ==}
-    dependencies:
-      through: 2.3.8
-    dev: true
-
   /statuses@1.5.0:
     resolution: {integrity: sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==}
     engines: {node: '>= 0.6'}
@@ -3762,12 +3663,6 @@ packages:
       strip-ansi: 6.0.1
     dev: true
 
-  /string_decoder@1.0.3:
-    resolution: {integrity: sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==}
-    dependencies:
-      safe-buffer: 5.1.2
-    dev: true
-
   /string_decoder@1.1.1:
     resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
     dependencies:
@@ -3780,13 +3675,6 @@ packages:
       safe-buffer: 5.2.1
     dev: true
 
-  /strip-ansi@3.0.1:
-    resolution: {integrity: sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      ansi-regex: 2.1.1
-    dev: true
-
   /strip-ansi@6.0.1:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
@@ -3825,11 +3713,6 @@ packages:
       webpack: 5.89.0(webpack-cli@5.1.4)
     dev: true
 
-  /supports-color@2.0.0:
-    resolution: {integrity: sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==}
-    engines: {node: '>=0.8.0'}
-    dev: true
-
   /supports-color@5.5.0:
     resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
     engines: {node: '>=4'}
@@ -3964,28 +3847,21 @@ packages:
       periscopic: 3.1.0
     patched: true
 
-  /tap-out@2.1.0:
-    resolution: {integrity: sha512-LJE+TBoVbOWhwdz4+FQk40nmbIuxJLqaGvj3WauQw3NYYU5TdjoV3C0x/yq37YAvVyi+oeBXmWnxWSjJ7IEyUw==}
+  /tap-parser@15.3.2:
+    resolution: {integrity: sha512-uvauHuQqAMwfeFVxNpFXhvnWLVL0sthnHk4TxRM3cUy6+dejO9fatoKR7YejbMu4+2/1nR6UQE9+eUcX3PUmsA==}
+    engines: {node: 16 >=16.17.0 || 18 >= 18.6.0 || >=20}
     hasBin: true
     dependencies:
-      re-emitter: 1.1.3
-      readable-stream: 2.2.9
-      split: 1.0.0
-      trim: 0.0.1
+      events-to-array: 2.0.3
+      tap-yaml: 2.2.2
     dev: true
 
-  /tap-spec@5.0.0:
-    resolution: {integrity: sha512-zMDVJiE5I6Y4XGjlueGXJIX2YIkbDN44broZlnypT38Hj/czfOXrszHNNJBF/DXR8n+x6gbfSx68x04kIEHdrw==}
-    hasBin: true
+  /tap-yaml@2.2.2:
+    resolution: {integrity: sha512-MWG4OpAKtNoNVjCz/BqlDJiwTM99tiHRhHPS4iGOe1ZS0CgM4jSFH92lthSFvvy4EdDjQZDV7uYqUFlU9JuNhw==}
+    engines: {node: 16 >=16.17.0 || 18 >= 18.6.0 || >=20}
     dependencies:
-      chalk: 1.1.3
-      duplexer: 0.1.2
-      figures: 1.7.0
-      lodash: 4.17.21
-      pretty-ms: 2.1.0
-      repeat-string: 1.6.1
-      tap-out: 2.1.0
-      through2: 2.0.5
+      yaml: 2.4.1
+      yaml-types: 0.3.0(yaml@2.4.1)
     dev: true
 
   /tapable@2.2.1:
@@ -4032,17 +3908,6 @@ packages:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
     dev: true
 
-  /through2@2.0.5:
-    resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
-    dependencies:
-      readable-stream: 2.3.8
-      xtend: 4.0.2
-    dev: true
-
-  /through@2.3.8:
-    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
-    dev: true
-
   /thunky@1.1.0:
     resolution: {integrity: sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==}
     dev: true
@@ -4069,11 +3934,6 @@ packages:
     hasBin: true
     dev: true
 
-  /trim@0.0.1:
-    resolution: {integrity: sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==}
-    deprecated: Use String.prototype.trim() instead
-    dev: true
-
   /truncate-utf8-bytes@1.0.2:
     resolution: {integrity: sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==}
     dependencies:
@@ -4481,11 +4341,6 @@ packages:
         optional: true
     dev: true
 
-  /xtend@4.0.2:
-    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
-    engines: {node: '>=0.4'}
-    dev: true
-
   /y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
@@ -4495,6 +4350,21 @@ packages:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
     dev: true
 
+  /yaml-types@0.3.0(yaml@2.4.1):
+    resolution: {integrity: sha512-i9RxAO/LZBiE0NJUy9pbN5jFz5EasYDImzRkj8Y81kkInTi1laia3P3K/wlMKzOxFQutZip8TejvQP/DwgbU7A==}
+    engines: {node: '>= 16', npm: '>= 7'}
+    peerDependencies:
+      yaml: ^2.3.0
+    dependencies:
+      yaml: 2.4.1
+    dev: true
+
+  /yaml@2.4.1:
+    resolution: {integrity: sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==}
+    engines: {node: '>= 14'}
+    hasBin: true
+    dev: true
+
   /yargs-parser@21.1.1:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
     engines: {node: '>=12'}
diff --git a/scripts/lib/tapReporter.ts b/scripts/lib/tapReporter.ts
new file mode 100644
index 0000000..737f3c5
--- /dev/null
+++ b/scripts/lib/tapReporter.ts
@@ -0,0 +1,59 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import kleur from 'kleur'
+import { Parser, type Result } from 'tap-parser'
+
+const { blue, bold, green, grey, red, underline } = kleur
+
+const SKIP_MARK = blue('⇥')
+const SUCCESS_MARK = green('✓')
+const FAILURE_MARK = red('✗')
+const TODO_MARK = blue('␣')
+
+const SKIP_COMMENTS = ['tests', 'pass', 'fail', 'skip'].map((c) => '# ' + c)
+
+export function reporter(watch: boolean) {
+  const parser = new Parser({ passes: true, flat: false }, (results) => {
+    console.log('\n\n')
+
+    console.log(`Total:\t${results.count}`)
+    console.log(green(`Pass:\t${results.pass}`))
+    console.log(red(`Fail:\t${results.fail}`))
+    console.log(grey(`Skip:\t${results.skip}`))
+    console.log(grey(`Todo:\t${results.todo}`))
+
+    if (!watch && results.fail != 0) {
+      process.exit(1)
+    }
+  })
+
+  parser.on('comment', (comment: string) => {
+    if (SKIP_COMMENTS.some((c) => comment.startsWith(c))) {
+      return
+    }
+
+    console.log(`\n\n  ${bold(comment)}`)
+  })
+
+  parser.on('assert', (res: Result) => {
+    if (res.skip) {
+      return console.log(`    ${SKIP_MARK} ${grey(res.name)}`)
+    }
+    if (res.todo) {
+      return console.log(`    ${TODO_MARK} ${grey(res.name)}`)
+    }
+    if (res.ok) {
+      return console.log(`    ${SUCCESS_MARK} ${grey(res.name)}`)
+    }
+
+    console.log(`    ${FAILURE_MARK} ${underline(red(res.name))}`)
+    for (const key in res.diag) {
+      const value = res.diag[key]
+      console.log(grey(`        ${key}: ${value}`))
+    }
+  })
+
+  return parser
+}
diff --git a/scripts/scripts.d.ts b/scripts/scripts.d.ts
deleted file mode 100644
index 2fafa51..0000000
--- a/scripts/scripts.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-declare module 'tap-spec' {
-  import { Transform } from 'stream'
-
-  declare type SpecOptions = {
-    padding?: string
-  }
-
-  function tapSpec(spec?: SpecOptions): Transform
-  export default tapSpec
-}
diff --git a/scripts/setup.ts b/scripts/setup.ts
index b905c52..e428965 100644
--- a/scripts/setup.ts
+++ b/scripts/setup.ts
@@ -76,7 +76,7 @@ await linkContents(getFile('apps/misc/static'), ARTIFACT_RT_PATH)
 
 await linkContents(getFile('apps/actors/lib'), getArtifactFile('actors'))
 await linkContents(getFile('apps/modules/lib'), getArtifactFile('modules'))
-await linkContents(
+await linkFolder(
   getFile('apps/tests/integrations'),
   getArtifactFile('modules/tests/integrations'),
 )
diff --git a/scripts/unit-test.ts b/scripts/unit-test.ts
index d4cf59e..5d5020b 100644
--- a/scripts/unit-test.ts
+++ b/scripts/unit-test.ts
@@ -1,12 +1,12 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/// <reference path="./scripts.d.ts" />
 import { App } from '@tinyhttp/app'
 import { type ExecaChildProcess, execa } from 'execa'
 import { createWriteStream } from 'node:fs'
 import { argv, exit } from 'node:process'
-import tapSpec from 'tap-spec'
+
+import { reporter } from './lib/tapReporter.js'
 
 // If you update this port, you should update the port in the test runner
 const TEST_PORT = 3948
@@ -51,7 +51,7 @@ function createTestReporter(
       .get('/config', (_, res) => void res.send({ shouldWatch }))
       .post('/results', (req, res) => {
         // Provide a nice reporter to the console
-        req.pipe(tapSpec()).pipe(process.stdout)
+        req.pipe(reporter(shouldWatch))
 
         if (testProcess) {
           req