chore: cleanup

packages/browser/src/node/plugins/mocker.ts

@@ -1,6 +1,5 @@
 import type { Plugin } from 'vitest/config'
 import type { WorkspaceProject } from 'vitest/node'
-import type { Reporter } from 'vitest/reporters'
 import type { WebSocketRPC } from 'vitest'
 
 export default (project: WorkspaceProject): Plugin => {
@@ -10,11 +9,11 @@ export default (project: WorkspaceProject): Plugin => {
     async load(id) {
       const queued = project.browserMocks.queued
       if (queued.has(id)) {
-        const reporter = project.ctx.reporters.find(r => 'wss' in r && 'clients' in r && (r.clients as any).size) as Reporter & {
+        const reporter = project.ctx.reporters.find(r => 'wss' in r && 'clients' in r && (r.clients as any).size) as {
           clients: Map<any, WebSocketRPC>
         }
 
-        if (!reporter || !reporter.clients.size)
+        if (!reporter)
           throw new Error('WebSocketReporter not found')
 
         const exports = await startMocking(reporter.clients, id)
@@ -32,7 +31,9 @@ export default (project: WorkspaceProject): Plugin => {
 
 async function startMocking(clients: Map<any, WebSocketRPC>, id: string) {
   const errors: unknown[] = []
-  for (const client of clients.values()) {
+  // start from the end since it's more likely that the last iframe is the one
+  // who subscribed with a running test
+  for (const client of [...clients.values()].reverse()) {
     try {
       const context = await client.getTestContext()
       if (!context)

test/browser/specs/runner.test.ts

@@ -23,8 +23,8 @@ describe('running browser tests', async () => {
       console.error(stderr)
     })
 
-    expect(browserResultJson.testResults).toHaveLength(16)
-    expect(passedTests).toHaveLength(14)
+    expect(browserResultJson.testResults).toHaveLength(17)
+    expect(passedTests).toHaveLength(15)
     expect(failedTests).toHaveLength(2)
 
     expect(stderr).not.toContain('has been externalized for browser compatibility')

test/core/test/injector-esm.test.ts

@@ -198,7 +198,7 @@ test('dynamic import', async () => {
   )
   expect(result).toMatchInlineSnapshot(`
     "const __vi_inject__ = { [Symbol.toStringTag]: "Module" };
-    const i = () => __vitest_browser_runner__.wrapModule(import('./foo'))
+    const i = () => __vitest_browser_runner__.wrapModule(() => import('./foo'))
     export { __vi_inject__ }"
   `)
 })