@remix-run/test 0.1.0 → 0.2.0

package/src/cli-entry.ts

@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+import * as process from 'node:process'
+
+import { runRemixTest } from './cli.ts'
+
+try {
+  let exitCode = await runRemixTest({
+    argv: process.argv.slice(2),
+    cwd: process.cwd(),
+  })
+  process.exit(exitCode)
+} catch (error) {
+  console.error('Error running tests:', error)
+  process.exit(1)
+}

package/src/cli.ts

@@ -1,210 +1,384 @@
-#!/usr/bin/env node
 import * as fsp from 'node:fs/promises'
+import type * as http from 'node:http'
 import * as path from 'node:path'
-import { tsImport } from 'tsx/esm/api'
-import { runServerTests } from './lib/runner.ts'
+import {
+  getRemixTestHelpText,
+  IS_RUNNING_FROM_SRC,
+  loadConfig,
+  type ResolvedRemixTestConfig,
+} from './lib/config.ts'
+import { generateCombinedCoverageReport } from './lib/coverage.ts'
+import { loadPlaywrightConfig, resolveProjects } from './lib/playwright.ts'
 import { createReporter } from './lib/reporters/index.ts'
+import { runBrowserTests } from './lib/runner-browser.ts'
+import { runServerTests } from './lib/runner.ts'
 import { createWatcher } from './lib/watcher.ts'
-import { loadPlaywrightConfig, resolveProjects } from './lib/playwright.ts'
-import { loadConfig, type ResolvedRemixTestConfig } from './lib/config.ts'
-import type { Counts } from './lib/utils.ts'
+import { importModule } from './lib/import-module.ts'
+import type { Counts } from './lib/reporters/results.ts'
+import { IS_BUN } from './lib/runtime.ts'
+import { isMainThread } from 'node:worker_threads'
 
-const config = await loadConfig()
+export { getRemixTestHelpText }
 
-let hasExited = false
-let latestExitCode = 0
-let watcher: ReturnType<typeof createWatcher> | undefined
-let running = false
-let queued = false
-let rerunTimer: NodeJS.Timeout | undefined
+export interface RunRemixTestOptions {
+  argv?: string[]
+  cwd?: string
+}
 
-process.on('SIGINT', () => cleanupAndExit(latestExitCode))
-process.on('SIGTERM', () => cleanupAndExit(latestExitCode))
+interface DiscoveredTests {
+  files: string[]
+  serverFiles: string[]
+  browserFiles: string[]
+  e2eFiles: string[]
+}
 
-try {
-  await executeRun()
+export async function runRemixTest(options: RunRemixTestOptions = {}): Promise<number> {
+  let argv = options.argv ?? process.argv.slice(2)
+  let cwd = await resolveCwd(options.cwd ?? process.cwd())
+  let previousCwd = process.cwd()
 
-  if (config.watch) {
-    console.log('Watching for changes. Press Ctrl+C to stop.')
+  if (!isMainThread) {
+    return await runRemixTestInCwd(argv, cwd)
+  }
+
+  try {
+    process.chdir(cwd)
+    return await runRemixTestInCwd(argv, cwd)
+  } finally {
+    process.chdir(previousCwd)
   }
-} catch {
-  cleanupAndExit(1)
 }
 
-async function executeRun() {
-  if (hasExited) return
+async function runRemixTestInCwd(argv: string[], cwd: string): Promise<number> {
+  if (argv.includes('--help') || argv.includes('-h')) {
+    console.log(getRemixTestHelpText())
+    return 0
+  }
 
-  running = true
+  let config = await loadConfig(argv, cwd)
+  let hasExited = false
+  let latestExitCode = 0
+  let watcher: ReturnType<typeof createWatcher> | undefined
+  let running = false
+  let queued = false
+  let rerunTimer: NodeJS.Timeout | undefined
+  let browserServer: http.Server | undefined
+  let browserServerFilesKey: string | undefined
+  let browserPort: number | undefined
+  let resolveRun: ((exitCode: number) => void) | undefined
+
+  let runPromise = new Promise<number>((resolve) => {
+    resolveRun = resolve
+  })
+
+  let cleanupAndExit = (code: number) => {
+    if (hasExited) return
+    hasExited = true
+    watcher?.close()
+    browserServer?.close()
+    clearTimeout(rerunTimer)
+    process.off('SIGINT', handleInterrupt)
+    process.off('SIGTERM', handleInterrupt)
+    resolveRun?.(code)
+  }
 
-  let globalTeardown: (() => Promise<void> | void) | undefined
+  let handleInterrupt = () => cleanupAndExit(latestExitCode)
+
+  let closeBrowserServer = async () => {
+    if (!browserServer) return
+    let server = browserServer
+    await new Promise<void>((resolve, reject) =>
+      server.close((error) => (error ? reject(error) : resolve())),
+    )
+    browserServer = undefined
+    browserServerFilesKey = undefined
+    browserPort = undefined
+  }
 
-  try {
-    if (config.setup) {
-      let mod = await tsImport(path.resolve(process.cwd(), config.setup), {
-        parentURL: import.meta.url,
-      })
-      let globalSetup: (() => Promise<void> | void) | undefined = mod.globalSetup
-      globalTeardown = mod.globalTeardown
-      await globalSetup?.()
-    }
+  let queueRerun = (reason: string) => {
+    if (!config.watch || hasExited) return
 
-    let { files, serverFiles, e2eFiles } = await discoverTests(config)
+    clearTimeout(rerunTimer)
 
-    if (config.watch) {
-      watcher ??= createWatcher((file) => queueRerun(file))
-      watcher.update(files)
-    }
+    rerunTimer = setTimeout(() => {
+      rerunTimer = undefined
+      if (running) {
+        queued = true
+      } else {
+        console.log(`\n↻ Change detected (${reason}), re-running tests...\n`)
+        void executeRun()
+      }
+    }, 100)
+  }
 
-    let playwrightConfig =
-      config.playwrightConfig == null || typeof config.playwrightConfig === 'string'
-        ? await loadPlaywrightConfig(config.playwrightConfig)
-        : config.playwrightConfig
+  let executeRun = async () => {
+    if (hasExited) return
 
-    let reporter = createReporter(config.reporter)
-    let startTime = performance.now()
+    running = true
 
-    let counts: Counts = {
-      passed: 0,
-      failed: 0,
-      skipped: 0,
-      todo: 0,
-    }
+    let globalTeardown: (() => Promise<void> | void) | undefined
 
-    // Run server tests
-    if (serverFiles.length > 0) {
-      reporter.onSectionStart('\nRunning server tests:')
-      let serverResult = await runServerTests(serverFiles, reporter, config.concurrency, 'server')
-      counts.failed += serverResult.failed
-      counts.passed += serverResult.passed
-      counts.skipped += serverResult.skipped
-      counts.todo += serverResult.todo
-    }
+    try {
+      if (config.setup) {
+        let mod = await importModule(path.resolve(cwd, config.setup), import.meta)
+        let globalSetup: (() => Promise<void> | void) | undefined = mod.globalSetup
+        globalTeardown = mod.globalTeardown
+        await globalSetup?.()
+      }
 
-    // Run e2e tests for all browsers configured by the user
-    if (e2eFiles.length > 0) {
-      let projects = resolveProjects(playwrightConfig)
-      if (config.project) {
-        let projectNames = config.project.split(',').map((p) => p.trim())
-        projects = projects.filter((p) => p.name && projectNames.includes(p.name))
-        if (projects.length === 0) {
-          throw new Error(`No playwright projects found with name(s) "${config.project}"`)
-        }
+      let discoveredTests = await discoverTests(config, cwd)
+      if (discoveredTests == null) {
+        latestExitCode = 1
+        cleanupAndExit(latestExitCode)
+        return
+      }
+
+      let { files, serverFiles, browserFiles, e2eFiles } = discoveredTests
+
+      if (config.watch) {
+        watcher ??= createWatcher((file) => queueRerun(file))
+        watcher.update(files)
+      }
+
+      let browserFilesKey = browserFiles.join('\0')
+      if (browserServer && browserFiles.length === 0) {
+        await closeBrowserServer()
+      } else if (
+        browserFiles.length > 0 &&
+        (!browserServer || browserServerFilesKey !== browserFilesKey)
+      ) {
+        await closeBrowserServer()
+        let { startServer } = IS_RUNNING_FROM_SRC
+          ? await importModule('./app/server.ts', import.meta)
+          : await import(`./app/server.js`)
+        let result = await startServer(browserFiles)
+        browserServer = result.server
+        browserServerFilesKey = browserFilesKey
+        browserPort = result.port
+      }
+
+      let playwrightConfig =
+        config.playwrightConfig == null || typeof config.playwrightConfig === 'string'
+          ? await loadPlaywrightConfig(config.playwrightConfig, cwd)
+          : config.playwrightConfig
+
+      let reporter = createReporter(config.reporter)
+      let startTime = performance.now()
+
+      let counts: Counts = {
+        passed: 0,
+        failed: 0,
+        skipped: 0,
+        todo: 0,
+      }
+      let allCoverageMaps: Array<ReturnType<typeof Object.values>[number] | null | undefined> = []
+
+      if (serverFiles.length > 0) {
+        reporter.onSectionStart('\nRunning server tests:')
+        let serverResult = await runServerTests(
+          serverFiles,
+          reporter,
+          config.concurrency,
+          'server',
+          {
+            coverage: config.coverage,
+            cwd,
+          },
+        )
+        counts.failed += serverResult.failed
+        counts.passed += serverResult.passed
+        counts.skipped += serverResult.skipped
+        counts.todo += serverResult.todo
+        allCoverageMaps.push(serverResult.coverageMap)
       }
 
-      for (let project of projects) {
-        reporter.onSectionStart(`\nRunning tests for project \`${project.name}\`:`)
-
-        if (config.browser?.open) {
-          if (project.playwrightUseOpts?.headless === true) {
-            let label = project.name ? ` (project "${project.name}")` : ''
-            console.warn(
-              `Warning: browser.open is set but playwright headless is explicitly true${label} — ignoring browser.open`,
-            )
-          } else {
-            project.playwrightUseOpts = { ...project.playwrightUseOpts, headless: false }
+      // Run browser/e2e tests for all browsers configured by the user
+      if (browserFiles.length > 0 || e2eFiles.length > 0) {
+        let projects = resolveProjects(playwrightConfig)
+        if (config.project) {
+          let projectNames = config.project.split(',').map((project) => project.trim())
+          projects = projects.filter(
+            (project) => project.name && projectNames.includes(project.name),
+          )
+          if (projects.length === 0) {
+            throw new Error(`No playwright projects found with name(s) "${config.project}"`)
           }
         }
 
-        let e2eResult =
-          e2eFiles.length > 0
-            ? await runServerTests(e2eFiles, reporter, config.concurrency, 'e2e', {
-                open: config.browser?.open,
-                playwrightUseOpts: project.playwrightUseOpts,
-                projectName: project.name,
-              })
-            : null
-
-        counts.passed += e2eResult?.passed ?? 0
-        counts.failed += e2eResult?.failed ?? 0
-        counts.skipped += e2eResult?.skipped ?? 0
-        counts.todo += e2eResult?.todo ?? 0
+        let lastBrowserResult: Awaited<ReturnType<typeof runBrowserTests>> | null = null
+
+        for (let project of projects) {
+          reporter.onSectionStart(`\nRunning tests for project \`${project.name}\`:`)
+
+          if (config.browser?.open) {
+            if (project.playwrightUseOpts?.headless === true) {
+              let label = project.name ? ` (project "${project.name}")` : ''
+              console.warn(
+                `Warning: browser.open is set but playwright headless is explicitly true${label} — ignoring browser.open`,
+              )
+            } else {
+              project.playwrightUseOpts = { ...project.playwrightUseOpts, headless: false }
+            }
+          }
+
+          let [browserResult, e2eResult] = await Promise.all([
+            browserFiles.length > 0
+              ? runBrowserTests({
+                  baseUrl: `http://localhost:${browserPort}`,
+                  console: config.browser?.echo,
+                  coverage: !!config.coverage,
+                  open: config.browser?.open,
+                  playwrightUseOpts: project.playwrightUseOpts,
+                  projectName: project.name,
+                  reporter,
+                  testFiles: browserFiles,
+                })
+              : null,
+            e2eFiles.length > 0
+              ? runServerTests(e2eFiles, reporter, config.concurrency, 'e2e', {
+                  open: config.browser?.open,
+                  playwrightUseOpts: project.playwrightUseOpts,
+                  projectName: project.name,
+                  coverage: config.coverage,
+                  cwd,
+                })
+              : null,
+          ])
+
+          counts.passed += (browserResult?.results.passed ?? 0) + (e2eResult?.passed ?? 0)
+          counts.failed += (browserResult?.results.failed ?? 0) + (e2eResult?.failed ?? 0)
+          counts.skipped += (browserResult?.results.skipped ?? 0) + (e2eResult?.skipped ?? 0)
+          counts.todo += (browserResult?.results.todo ?? 0) + (e2eResult?.todo ?? 0)
+          allCoverageMaps.push(browserResult?.coverageMap)
+          allCoverageMaps.push(e2eResult?.coverageMap)
+
+          if (browserResult) {
+            lastBrowserResult = browserResult
+          }
+        }
+
+        if (config.browser?.open && lastBrowserResult) {
+          console.log('\nBrowser is open. Press Ctrl+C to close.')
+          await Promise.race([
+            lastBrowserResult.disconnected,
+            new Promise<void>((resolve) => {
+              process.once('SIGINT', resolve)
+              process.once('SIGTERM', resolve)
+            }),
+          ])
+          await lastBrowserResult.close()
+        }
       }
-    }
 
-    reporter.onSummary(counts, performance.now() - startTime)
+      reporter.onSummary(counts, performance.now() - startTime)
 
-    latestExitCode = counts.failed > 0 ? 1 : 0
-  } catch (error) {
-    console.error('Error running tests:', error)
-    latestExitCode = 1
-  } finally {
-    await globalTeardown?.()
-    running = false
-    if (queued) {
-      queued = false
-      queueRerun('queued change')
-    } else if (!config.watch) {
-      cleanupAndExit(latestExitCode)
+      let thresholdsPassed = true
+      if (config.coverage) {
+        thresholdsPassed = await generateCombinedCoverageReport(
+          allCoverageMaps,
+          cwd,
+          config.coverage,
+        )
+      }
+      latestExitCode = counts.failed > 0 || !thresholdsPassed ? 1 : 0
+    } catch (error) {
+      console.error('Error running tests:', error)
+      latestExitCode = 1
+    } finally {
+      await globalTeardown?.()
+      running = false
+      if (queued) {
+        queued = false
+        queueRerun('queued change')
+      } else if (!config.watch) {
+        cleanupAndExit(latestExitCode)
+      }
     }
   }
-}
 
-async function discoverTests(config: ResolvedRemixTestConfig): Promise<{
-  files: string[]
-  serverFiles: string[]
-  e2eFiles: string[]
-}> {
-  async function findFiles(pattern: string) {
-    let files: string[] = []
-    let exclude = ['node_modules/**', '.git/**']
+  process.on('SIGINT', handleInterrupt)
+  process.on('SIGTERM', handleInterrupt)
 
-    for await (let file of fsp.glob(pattern, { cwd: process.cwd(), exclude })) {
-      files.push(path.resolve(process.cwd(), file))
+  try {
+    await executeRun()
+
+    if (config.watch && !hasExited) {
+      console.log('Watching for changes. Press Ctrl+C to stop.')
     }
+  } catch {
+    cleanupAndExit(1)
+  }
 
-    return files
+  return await runPromise
+}
+
+async function resolveCwd(cwd: string): Promise<string> {
+  try {
+    return await fsp.realpath(cwd)
+  } catch {
+    return path.resolve(cwd)
   }
+}
 
-  let files = await findFiles(config.glob.test)
+async function discoverTests(
+  config: ResolvedRemixTestConfig,
+  cwd: string,
+): Promise<DiscoveredTests | null> {
+  let files = await findFiles(config.glob.test, config.glob.exclude, cwd)
 
   if (files.length === 0) {
     console.log(`No test files found matching pattern: ${config.glob.test}`)
-    process.exit(1)
+    return null
   }
 
-  let e2eSet = new Set(await findFiles(config.glob.e2e))
-
+  let browserSet = new Set(await findFiles(config.glob.browser, config.glob.exclude, cwd))
+  let e2eSet = new Set(await findFiles(config.glob.e2e, config.glob.exclude, cwd))
   let types = new Set(config.type.split(','))
-  let e2eFiles = types.has('e2e') ? files.filter((f) => e2eSet.has(f)) : []
-  let serverFiles = types.has('server') ? files.filter((f) => !e2eSet.has(f)) : []
-
-  let totalFiles = serverFiles.length + e2eFiles.length
+  let browserFiles = types.has('browser') ? files.filter((f) => browserSet.has(f)) : []
+  let e2eFiles = types.has('e2e') ? files.filter((file) => e2eSet.has(file)) : []
+  let serverFiles = types.has('server')
+    ? files.filter((file) => !browserSet.has(file) && !e2eSet.has(file))
+    : []
+  let totalFiles = browserFiles.length + serverFiles.length + e2eFiles.length
 
   if (totalFiles === 0) {
     console.log(`No test files remain after filtering for type ${config.type}`)
-    process.exit(1)
+    return null
   }
 
   console.log(
-    `Found ${totalFiles} test file(s) (${serverFiles.length} server, ${e2eFiles.length} e2e)`,
+    `Found ${totalFiles} test file(s) (${serverFiles.length} server, ${browserFiles.length} browser, ${e2eFiles.length} e2e)`,
   )
 
   return {
     files,
     serverFiles,
+    browserFiles,
     e2eFiles,
   }
 }
 
-function queueRerun(reason: string) {
-  if (!config.watch || hasExited) return
-
-  clearTimeout(rerunTimer)
-
-  rerunTimer = setTimeout(() => {
-    rerunTimer = undefined
-    if (running) {
-      queued = true
-    } else {
-      console.log(`\n↻ Change detected (${reason}), re-running tests...\n`)
-      void executeRun()
+async function findFiles(pattern: string, excludePattern: string, cwd: string): Promise<string[]> {
+  let files: string[] = []
+
+  if (IS_BUN) {
+    // Bun's `fs.promises.glob` follows symlinks and doesn't prune traversal
+    // via `exclude`, so it enters pnpm symlink cycles in `node_modules`.
+    // Use Bun's native Glob, which defaults to `followSymlinks: false`.
+    // @ts-expect-error — bun module is only resolvable under the Bun runtime
+    let { Glob } = await import('bun')
+    let glob = new Glob(pattern)
+    let excludeGlob = new Glob(excludePattern)
+    for await (let file of glob.scan({ cwd, absolute: true })) {
+      if (!excludeGlob.match(path.relative(cwd, file))) {
+        files.push(file)
+      }
     }
-  }, 100)
-}
+    return files
+  }
 
-function cleanupAndExit(code: number) {
-  if (hasExited) return
-  hasExited = true
-  watcher?.close()
-  process.exit(code)
+  for await (let file of fsp.glob(pattern, { cwd, exclude: [excludePattern] })) {
+    files.push(path.resolve(cwd, file))
+  }
+  return files
 }

package/src/index.ts

@@ -13,3 +13,4 @@ export {
 } from './lib/framework.ts'
 export { mock } from './lib/mock.ts'
 export type { TestContext } from './lib/context.ts'
+export type { FakeTimers } from './lib/fake-timers.ts'

package/src/lib/colors.ts

@@ -0,0 +1,3 @@
+import { createStyles } from '@remix-run/terminal'
+
+export const colors = createStyles()