Huge simplification.

Author: nedtwigg

browser-extension/tests/test-fixtures.ts

@@ -1,103 +1,26 @@
 import { describe as baseDescribe, test as baseTest, expect } from 'vitest'
-import { PAGES } from './har-index'
-import {
-  cleanupDOM,
-  createDOMFromHar,
-  loadHtmlFromHar,
-  setupDOMFromHar,
-  type TestDOMGlobals,
-} from './test-utils'
-
-export interface TestFixtures {
-  harDOM: (key: keyof typeof PAGES) => Promise<TestDOMGlobals>
-}
-
-export const test = baseTest.extend<TestFixtures>({
-  // biome-ignore lint/correctness/noEmptyPattern: Required by Vitest fixture API
-  harDOM: async ({}, use) => {
-    let currentDOM: TestDOMGlobals | null = null
-
-    const setupDOM = async (key: keyof typeof PAGES): Promise<TestDOMGlobals> => {
-      // Clean up any existing DOM
-      if (currentDOM) {
-        cleanupDOM()
-      }
-
-      // Load HTML from HAR file
-      const html = await loadHtmlFromHar(key)
-      const url = PAGES[key]
-
-      // Create and setup new DOM
-      const domGlobals = createDOMFromHar(html, url)
-      setupDOMFromHar(domGlobals)
-
-      currentDOM = domGlobals
-      return domGlobals
-    }
-
-    // Provide the setup function to the test
-    await use(setupDOM)
-
-    // Cleanup after test completes
-    if (currentDOM) {
-      cleanupDOM()
-      currentDOM = null
-    }
-  },
-})
+import type { PAGES } from './har-index'
+import { cleanupDOM, setupHarDOM } from './test-utils'
 
 export const describe = baseDescribe
-export const it = test
 
 // Re-export expect from vitest
 export { expect }
 
 // Fluent interface for HAR-based tests
 export function usingHar(harKey: keyof typeof PAGES) {
-  // Create a test with auto-setup fixture for this HAR
-  const harTest = baseTest.extend<TestFixtures & { _harAutoSetup: undefined }>({
-    // Auto-setup fixture that runs the HAR setup automatically
-    _harAutoSetup: [
-      async ({ harDOM }, use) => {
-        await harDOM(harKey)
-        await use(undefined)
-      },
-      { auto: true },
-    ],
-    // Keep the original harDOM fixture
-    // biome-ignore lint/correctness/noEmptyPattern: Required by Vitest fixture API
-    harDOM: async ({}, use) => {
-      let currentDOM: TestDOMGlobals | null = null
-
-      const setupDOM = async (key: keyof typeof PAGES): Promise<TestDOMGlobals> => {
-        if (currentDOM) {
-          cleanupDOM()
-        }
-        const html = await loadHtmlFromHar(key)
-        const url = PAGES[key]
-        const domGlobals = createDOMFromHar(html, url)
-        setupDOMFromHar(domGlobals)
-        currentDOM = domGlobals
-        return domGlobals
-      }
-
-      await use(setupDOM)
-
-      if (currentDOM) {
-        cleanupDOM()
-        currentDOM = null
-      }
-    },
-  })
-
   return {
-    describe: (name: string, fn: () => void) => {
-      return baseDescribe(name, fn)
-    },
-
     it: (name: string, fn: () => void | Promise<void>) => {
-      return harTest(name, async () => {
-        return await fn()
+      return baseTest(name, async () => {
+        // Setup HAR DOM before test
+        await setupHarDOM(harKey)
+
+        try {
+          return await fn()
+        } finally {
+          // Cleanup after test
+          cleanupDOM()
+        }
       })
     },
   }