Refactor tests for Bun and Playwright; cache Stripe loader

brandonkachen · brandonkachen · commit 41f707dee09f · 2025-12-19T15:49:47.000-08:00
diff --git a/cli/src/__tests__/e2e/logout-relogin-flow.test.ts b/cli/src/__tests__/e2e/logout-relogin-flow.test.ts
@@ -19,8 +19,8 @@ import {
 } from '../../utils/auth'
 import { setProjectRoot } from '../../project-files'
 
-import type * as AuthModule from '../../utils/auth'
-import type * as CodebuffApiModule from '../../utils/codebuff-api'
+import * as AuthModule from '../../utils/auth'
+import * as CodebuffApiModule from '../../utils/codebuff-api'
 
 type User = AuthModule.User
 
@@ -57,17 +57,14 @@ describe('Logout and Re-login helpers', () => {
   })
 
   const mockConfigPaths = () => {
-    const authModule = require('../../utils/auth') as typeof AuthModule
-    spyOn(authModule, 'getConfigDir').mockReturnValue(tempConfigDir)
-    spyOn(authModule, 'getCredentialsPath').mockReturnValue(
+    spyOn(AuthModule, 'getConfigDir').mockReturnValue(tempConfigDir)
+    spyOn(AuthModule, 'getCredentialsPath').mockReturnValue(
       path.join(tempConfigDir, 'credentials.json'),
     )
   }
 
   const mockLogoutApi = () => {
-    const apiModule =
-      require('../../utils/codebuff-api') as typeof CodebuffApiModule
-    spyOn(apiModule, 'getApiClient').mockReturnValue({
+    spyOn(CodebuffApiModule, 'getApiClient').mockReturnValue({
       logout: async () => ({ ok: true, status: 200 }),
     } as any)
   }
diff --git a/cli/src/__tests__/e2e/returning-user-auth.test.ts b/cli/src/__tests__/e2e/returning-user-auth.test.ts
@@ -14,9 +14,8 @@ import {
 } from 'bun:test'
 
 import { validateApiKey } from '../../hooks/use-auth-query'
+import * as AuthModule from '../../utils/auth'
 import { getAuthTokenDetails, saveUserCredentials } from '../../utils/auth'
-
-import type * as AuthModule from '../../utils/auth'
 import type { GetUserInfoFromApiKeyFn } from '@codebuff/common/types/contracts/database'
 import type { Logger } from '@codebuff/common/types/contracts/logger'
 
@@ -58,10 +57,8 @@ describe('Returning User Authentication helpers', () => {
   })
 
   test('should load auth token from credentials file for returning user', () => {
-    const authModule = require('../../utils/auth') as typeof AuthModule
-
-    spyOn(authModule, 'getConfigDir').mockReturnValue(tempConfigDir)
-    spyOn(authModule, 'getCredentialsPath').mockReturnValue(
+    spyOn(AuthModule, 'getConfigDir').mockReturnValue(tempConfigDir)
+    spyOn(AuthModule, 'getCredentialsPath').mockReturnValue(
       path.join(tempConfigDir, 'credentials.json'),
     )
 
@@ -73,10 +70,8 @@ describe('Returning User Authentication helpers', () => {
   })
 
   test('should fall back to CODEBUFF_API_KEY when credentials are missing', () => {
-    const authModule = require('../../utils/auth') as typeof AuthModule
-
-    spyOn(authModule, 'getConfigDir').mockReturnValue(tempConfigDir)
-    spyOn(authModule, 'getCredentialsPath').mockReturnValue(
+    spyOn(AuthModule, 'getConfigDir').mockReturnValue(tempConfigDir)
+    spyOn(AuthModule, 'getCredentialsPath').mockReturnValue(
       path.join(tempConfigDir, 'credentials.json'),
     )
 
@@ -88,10 +83,8 @@ describe('Returning User Authentication helpers', () => {
   })
 
   test('should validate stored credentials without blocking the UI thread', async () => {
-    const authModule = require('../../utils/auth') as typeof AuthModule
-
-    spyOn(authModule, 'getConfigDir').mockReturnValue(tempConfigDir)
-    spyOn(authModule, 'getCredentialsPath').mockReturnValue(
+    spyOn(AuthModule, 'getConfigDir').mockReturnValue(tempConfigDir)
+    spyOn(AuthModule, 'getCredentialsPath').mockReturnValue(
       path.join(tempConfigDir, 'credentials.json'),
     )
 
diff --git a/cli/src/__tests__/test-utils.ts b/cli/src/__tests__/test-utils.ts
@@ -43,7 +43,8 @@ function loadCliEnv(): Record<string, string> {
   }
 
   try {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    // NOTE: Inline require() is used for lazy loading - the env module depends on
+    // Infisical secrets which may not be available at module load time in test environments
     const { env } = require('../../../packages/internal/src/env') as {
       env: Record<string, unknown>
     }
diff --git a/cli/src/hooks/__tests__/use-directory-browser.test.ts b/cli/src/hooks/__tests__/use-directory-browser.test.ts
@@ -1,5 +1,12 @@
 import { describe, test, expect, beforeEach, afterEach } from 'bun:test'
-import { mkdirSync, mkdtempSync, rmSync } from 'fs'
+import {
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  rmSync,
+  statSync,
+  writeFileSync,
+} from 'fs'
 import os from 'os'
 import path from 'path'
 
@@ -21,7 +28,6 @@ const expandPath = (inputPath: string): string => {
 
 // Extract the path validation logic for testing
 const isValidDirectoryPath = (inputPath: string): boolean => {
-  const { existsSync, statSync } = require('fs')
   const expandedPath = expandPath(inputPath.trim())
   try {
     return existsSync(expandedPath) && statSync(expandedPath).isDirectory()
@@ -141,7 +147,7 @@ describe('useDirectoryBrowser - path validation', () => {
 
     test('returns false for file (not directory)', () => {
       const filePath = path.join(tempDir, 'test.txt')
-      require('fs').writeFileSync(filePath, 'test')
+      writeFileSync(filePath, 'test')
       expect(isValidDirectoryPath(filePath)).toBe(false)
     })
 
diff --git a/cli/src/hooks/__tests__/use-user-details-query.test.ts b/cli/src/hooks/__tests__/use-user-details-query.test.ts
@@ -11,8 +11,8 @@ import {
 import { createMockApiClient } from '../../__tests__/helpers/mock-api-client'
 import { fetchUserDetails } from '../use-user-details-query'
 
+import * as CodebuffApiModule from '../../utils/codebuff-api'
 import type { Logger } from '@codebuff/common/types/contracts/logger'
-import type * as CodebuffApiModule from '../../utils/codebuff-api'
 
 describe('fetchUserDetails', () => {
   const mockLogger: Logger = {
@@ -198,10 +198,11 @@ describe('fetchUserDetails', () => {
       )
       const apiClient = createMockApiClient({ me: meMock })
 
-      const apiModule =
-        require('../../utils/codebuff-api') as typeof CodebuffApiModule
-      const setTokenSpy = spyOn(apiModule, 'setApiClientAuthToken')
-      spyOn(apiModule, 'getApiClient').mockReturnValue(apiClient as any)
+      const setTokenSpy = spyOn(
+        CodebuffApiModule,
+        'setApiClientAuthToken',
+      )
+      spyOn(CodebuffApiModule, 'getApiClient').mockReturnValue(apiClient as any)
 
       await expect(
         fetchUserDetails({
diff --git a/cli/src/utils/__tests__/image-dimensions.test.ts b/cli/src/utils/__tests__/image-dimensions.test.ts
@@ -2,6 +2,7 @@ import { mkdirSync, rmSync } from 'fs'
 import path from 'path'
 
 import { describe, test, expect, beforeEach, afterEach } from 'bun:test'
+import { Jimp } from 'jimp'
 
 import { setProjectRoot } from '../../project-files'
 import { calculateDisplaySize } from '../image-display'
@@ -18,8 +19,6 @@ beforeEach(async () => {
   setProjectRoot(TEST_DIR)
 
   // Create test images with known dimensions using Jimp
-  const { Jimp } = await import('jimp')
-
   // Wide image: 200x100 (2:1 aspect ratio)
   const wideImage = new Jimp({ width: 200, height: 100, color: 0xff0000ff })
   await wideImage.write(
@@ -79,7 +78,6 @@ describe('Image Dimensions', () => {
 
     test('should return compressed dimensions when image is compressed', async () => {
       // Create a large image that will be compressed
-      const { Jimp } = await import('jimp')
       const largeImage = new Jimp({
         width: 2000,
         height: 1000,
diff --git a/cli/src/utils/clipboard.ts b/cli/src/utils/clipboard.ts
@@ -84,6 +84,8 @@ export async function copyTextToClipboard(
     if (typeof navigator !== 'undefined' && navigator.clipboard) {
       await navigator.clipboard.writeText(text)
     } else if (typeof process !== 'undefined' && process.platform) {
+      // NOTE: Inline require() is used because this code path only runs in Node.js
+      // environments, and we need to check process.platform at runtime first
       const { execSync } = require('child_process') as {
         execSync: (command: string, options: { input: string }) => void
       }
diff --git a/cli/src/utils/local-agent-registry.ts b/cli/src/utils/local-agent-registry.ts
@@ -118,6 +118,8 @@ interface BundledAgentsModule {
   getBundledAgentsAsLocalInfo: () => LocalAgentInfo[]
 }
 
+// NOTE: Inline require() with try/catch is used because this file is generated at
+// build time by prebuild-agents.ts and may not exist during development
 let bundledAgentsModule: BundledAgentsModule | null = null
 try {
   bundledAgentsModule = require('../agents/bundled-agents.generated')
diff --git a/common/src/testing/fixtures/agent-runtime.ts b/common/src/testing/fixtures/agent-runtime.ts
@@ -10,6 +10,7 @@ import type {
   AgentRuntimeDeps,
   AgentRuntimeScopedDeps,
 } from '../../types/contracts/agent-runtime'
+import type { GetUserInfoFromApiKeyInput, UserColumn } from '../../types/contracts/database'
 import type { ClientEnv, CiEnv } from '../../types/contracts/env'
 import type { Logger } from '../../types/contracts/logger'
 
@@ -56,13 +57,22 @@ export const TEST_AGENT_RUNTIME_IMPL = Object.freeze<
   ciEnv: testCiEnv,
 
   // Database
-  getUserInfoFromApiKey: async () => ({
-    id: 'test-user-id',
-    email: 'test-email',
-    discord_id: 'test-discord-id',
-    referral_code: 'ref-test-code',
-    banned: false,
-  }),
+  getUserInfoFromApiKey: async <T extends UserColumn>({
+    fields,
+  }: GetUserInfoFromApiKeyInput<T>) => {
+    const user = {
+      id: 'test-user-id',
+      email: 'test-email',
+      discord_id: 'test-discord-id',
+      referral_code: 'ref-test-code',
+      stripe_customer_id: null,
+      banned: false,
+    } as const
+
+    return Object.fromEntries(fields.map((field) => [field, user[field]])) as {
+      [K in T]: (typeof user)[K]
+    }
+  },
   fetchAgentFromDatabase: async () => null,
   startAgentRun: async () => 'test-agent-run-id',
   finishAgentRun: async () => {},
@@ -125,4 +135,3 @@ export const TEST_AGENT_RUNTIME_IMPL = Object.freeze<
 
   apiKey: 'test-api-key',
 })
-
diff --git a/common/src/util/model-utils.ts b/common/src/util/model-utils.ts
@@ -6,8 +6,8 @@ let explicitlyDefinedModels: Set<string> | null = null
 
 function getExplicitlyDefinedModels(): Set<string> {
   if (explicitlyDefinedModels === null) {
-    // Dynamically import to avoid circular dependency issues
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    // NOTE: Inline require() avoids circular dependency - old-constants imports this
+    // module, so a top-level import would create a circular reference
     const { models, shouldCacheModels } = require('../old-constants')
     explicitlyDefinedModels = new Set([
       ...(Object.values(models) as string[]),
diff --git a/packages/agent-runtime/src/__tests__/n-parameter.test.ts b/packages/agent-runtime/src/__tests__/n-parameter.test.ts
@@ -18,10 +18,10 @@ import {
   clearAgentGeneratorCache,
   runProgrammaticStep,
 } from '../run-programmatic-step'
+import * as toolExecutor from '../tools/tool-executor'
 import { mockFileContext } from './test-utils'
 
 import type { AgentTemplate, StepGenerator } from '../templates/types'
-import type { executeToolCall } from '../tools/tool-executor'
 import type {
   AgentRuntimeDeps,
   AgentRuntimeScopedDeps,
@@ -329,12 +329,12 @@ describe('n parameter and GENERATE_N functionality', () => {
 
       // Mock executeToolCall to handle set_output
       const executeToolCallSpy = spyOn(
-        await import('../tools/tool-executor'),
+        toolExecutor,
         'executeToolCall',
       ).mockImplementation(
         async (
-          options: ParamsOf<typeof executeToolCall>,
-        ): ReturnType<typeof executeToolCall> => {
+          options: ParamsOf<typeof toolExecutor.executeToolCall>,
+        ): ReturnType<typeof toolExecutor.executeToolCall> => {
           if (options.toolName === 'set_output') {
             options.agentState.output = options.input
           }
@@ -420,7 +420,7 @@ describe('n parameter and GENERATE_N functionality', () => {
 
       // Mock executeToolCall for this test
       const executeToolCallSpy = spyOn(
-        await import('../tools/tool-executor'),
+        toolExecutor,
         'executeToolCall',
       ).mockImplementation(async () => {})
 
@@ -508,12 +508,12 @@ describe('n parameter and GENERATE_N functionality', () => {
 
       // Mock executeToolCall for this test
       const executeToolCallSpy = spyOn(
-        await import('../tools/tool-executor'),
+        toolExecutor,
         'executeToolCall',
       ).mockImplementation(
         async (
-          options: ParamsOf<typeof executeToolCall>,
-        ): ReturnType<typeof executeToolCall> => {
+          options: ParamsOf<typeof toolExecutor.executeToolCall>,
+        ): ReturnType<typeof toolExecutor.executeToolCall> => {
           if (options.toolName === 'set_output') {
             options.agentState.output = options.input
           }
diff --git a/packages/agent-runtime/src/templates/__tests__/agent-registry.test.ts b/packages/agent-runtime/src/templates/__tests__/agent-registry.test.ts
@@ -1,4 +1,5 @@
 import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import * as validationModule from '@codebuff/common/templates/agent-validation'
 import { getStubProjectFileContext } from '@codebuff/common/util/file'
 import {
   describe,
@@ -77,9 +78,6 @@ describe('Agent Registry', () => {
     mockFileContext = getStubProjectFileContext()
 
     // Spy on validation functions
-    const validationModule = await import(
-      '@codebuff/common/templates/agent-validation'
-    )
     spyOn(validationModule, 'validateAgents').mockImplementation(
       ({
         agentTemplates = {},
diff --git a/packages/code-map/__tests__/parse.test.ts b/packages/code-map/__tests__/parse.test.ts
@@ -2,6 +2,7 @@ import { describe, it, expect, mock } from 'bun:test'
 import {
   parseTokens,
   DEBUG_PARSING,
+  getFileTokenScores,
   type TokenCallerMap,
   type FileTokenData,
 } from '../src/parse'
@@ -569,66 +570,7 @@ console.log('Total:', formatCurrency(total));
         return testFiles[fullPath as keyof typeof testFiles] || null
       }
 
-      // Mock getLanguageConfig to return a working config
-      const originalGetLanguageConfig = (await import('../src/parse'))
-        .getFileTokenScores
-
-      // Create a mock implementation that simulates real parsing results
-      const mockUtilsCaptures = [
-        { name: 'identifier', node: { text: 'calculateTax' } },
-        { name: 'identifier', node: { text: 'amount' } },
-        { name: 'identifier', node: { text: 'rate' } },
-        { name: 'identifier', node: { text: 'formatCurrency' } },
-        { name: 'identifier', node: { text: 'value' } },
-        { name: 'call.identifier', node: { text: 'toFixed' } },
-      ]
-
-      const mockMainCaptures = [
-        { name: 'identifier', node: { text: 'price' } },
-        { name: 'identifier', node: { text: 'taxRate' } },
-        { name: 'identifier', node: { text: 'total' } },
-        { name: 'call.identifier', node: { text: 'calculateTax' } },
-        { name: 'call.identifier', node: { text: 'formatCurrency' } },
-        { name: 'call.identifier', node: { text: 'console' } },
-        { name: 'call.identifier', node: { text: 'log' } },
-      ]
-
-      const createMockConfig = (captures: any[]) => {
-        const mockTree = { rootNode: { text: 'mock tree' } }
-        const mockQuery = { captures: mock(() => captures) } as any
-        const mockParser = { parse: mock(() => mockTree) } as any
-
-        return {
-          extensions: ['.ts'],
-          wasmFile: 'tree-sitter-typescript.wasm',
-          queryText: 'mock query',
-          parser: mockParser,
-          query: mockQuery,
-        }
-      }
-
-      // Mock the getLanguageConfig function used internally
-      const mockGetLanguageConfig = mock().mockImplementation(
-        async (filePath: string) => {
-          if (filePath.includes('utils.ts')) {
-            return createMockConfig(mockUtilsCaptures)
-          } else if (filePath.includes('main.ts')) {
-            return createMockConfig(mockMainCaptures)
-          }
-          return undefined
-        },
-      )
-
-      // Temporarily replace the import
-      const parseModule = await import('../src/parse')
-      const originalFunction = parseModule.getFileTokenScores
-
-      // Create a version that uses our mock
-      const result = await originalFunction(
-        projectRoot,
-        filePaths,
-        fileProvider,
-      )
+      const result = await getFileTokenScores(projectRoot, filePaths, fileProvider)
 
       // This test actually runs with the real implementation but uses mocked file content
       // The real implementation should gracefully handle when no language config is found
diff --git a/web/playwright.config.ts b/web/playwright.config.ts
diff --git a/web/src/__tests__/e2e/store-hydration.spec.ts b/web/src/__tests__/e2e/store-hydration.spec.ts
diff --git a/web/src/__tests__/e2e/store-ssr.spec.ts b/web/src/__tests__/e2e/store-ssr.spec.ts
diff --git a/web/src/__tests__/playwright-runner.test.ts b/web/src/__tests__/playwright-runner.test.ts
diff --git a/web/src/app/orgs/[slug]/billing/setup/page.tsx b/web/src/app/orgs/[slug]/billing/setup/page.tsx
diff --git a/web/src/lib/__tests__/ban-conditions.test.ts b/web/src/lib/__tests__/ban-conditions.test.ts

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ function loadCliEnv(): Record<string, string> {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`try {`
`46`		`- // eslint-disable-next-line @typescript-eslint/no-var-requires`
	`46`	`+ // NOTE: Inline require() is used for lazy loading - the env module depends on`
	`47`	`+ // Infisical secrets which may not be available at module load time in test environments`
`47`	`48`	`const { env } = require('../../../packages/internal/src/env') as {`
`48`	`49`	`env: Record<string, unknown>`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,8 @@ export async function copyTextToClipboard(`
`84`	`84`	`if (typeof navigator !== 'undefined' && navigator.clipboard) {`
`85`	`85`	`await navigator.clipboard.writeText(text)`
`86`	`86`	`} else if (typeof process !== 'undefined' && process.platform) {`
	`87`	`+ // NOTE: Inline require() is used because this code path only runs in Node.js`
	`88`	`+ // environments, and we need to check process.platform at runtime first`
`87`	`89`	`const { execSync } = require('child_process') as {`
`88`	`90`	`execSync: (command: string, options: { input: string }) => void`
`89`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,8 @@ interface BundledAgentsModule {`
`118`	`118`	`getBundledAgentsAsLocalInfo: () => LocalAgentInfo[]`
`119`	`119`	`}`
`120`	`120`
	`121`	`+// NOTE: Inline require() with try/catch is used because this file is generated at`
	`122`	`+// build time by prebuild-agents.ts and may not exist during development`
`121`	`123`	`let bundledAgentsModule: BundledAgentsModule \| null = null`
`122`	`124`	`try {`
`123`	`125`	`bundledAgentsModule = require('../agents/bundled-agents.generated')`