refactor(common): consolidate testing exports to 2 entries

brandonkachen · brandonkachen · commit b8b8a24a7e08 · 2025-12-18T14:33:48.000-08:00
diff --git a/cli/src/__tests__/integration/credentials-storage.test.ts b/cli/src/__tests__/integration/credentials-storage.test.ts
@@ -5,7 +5,7 @@ import path from 'path'
 import {
   clearMockedModules,
   mockModule,
-} from '@codebuff/common/testing/mock-modules'
+} from '@codebuff/common/testing/fixtures'
 import {
   describe,
   test,
diff --git a/cli/testing/env.ts b/cli/testing/env.ts
@@ -2,7 +2,7 @@
  * Test-only CLI env fixtures.
  */
 
-import { createTestBaseEnv } from '@codebuff/common/testing/env-process'
+import { createTestBaseEnv } from '@codebuff/common/testing/fixtures'
 
 import type { CliEnv } from '../src/types/env'
 
diff --git a/common/package.json b/common/package.json
@@ -22,30 +22,6 @@
       "import": "./testing/fixtures/*.ts",
       "types": "./testing/fixtures/*.ts",
       "default": "./testing/fixtures/*.ts"
-    },
-    "./testing/env-process": {
-      "bun": "./testing/env-process.ts",
-      "import": "./testing/env-process.ts",
-      "types": "./testing/env-process.ts",
-      "default": "./testing/env-process.ts"
-    },
-    "./testing/env-ci": {
-      "bun": "./testing/env-ci.ts",
-      "import": "./testing/env-ci.ts",
-      "types": "./testing/env-ci.ts",
-      "default": "./testing/env-ci.ts"
-    },
-    "./testing/mock-modules": {
-      "bun": "./testing/mock-modules.ts",
-      "import": "./testing/mock-modules.ts",
-      "types": "./testing/mock-modules.ts",
-      "default": "./testing/mock-modules.ts"
-    },
-    "./testing/impl/*": {
-      "bun": "./testing/impl/*.ts",
-      "import": "./testing/impl/*.ts",
-      "types": "./testing/impl/*.ts",
-      "default": "./testing/impl/*.ts"
     }
   },
   "scripts": {
diff --git a/common/src/__tests__/env-ci.test.ts b/common/src/__tests__/env-ci.test.ts
@@ -1,7 +1,7 @@
 import { describe, test, expect, afterEach } from 'bun:test'
 
 import { getCiEnv, ciEnv, isCI } from '../env-ci'
-import { createTestCiEnv } from '../../testing/env-ci'
+import { createTestCiEnv } from '../../testing/fixtures'
 
 describe('env-ci', () => {
   describe('getCiEnv', () => {
diff --git a/common/src/__tests__/env-process.test.ts b/common/src/__tests__/env-process.test.ts
@@ -1,7 +1,7 @@
 import { describe, test, expect, afterEach } from 'bun:test'
 
 import { getProcessEnv, processEnv } from '../env-process'
-import { createTestProcessEnv } from '../../testing/env-process'
+import { createTestProcessEnv } from '../../testing/fixtures'
 
 describe('env-process', () => {
   describe('getProcessEnv', () => {
diff --git a/common/src/env-schema.ts b/common/src/env-schema.ts
@@ -14,7 +14,7 @@ export const clientEnvSchema = z.object({
     .url()
     .min(1)
     .default('https://us.i.posthog.com'),
-  NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: z.string().min(1).optional(),
+  NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: z.string().min(1),
   NEXT_PUBLIC_STRIPE_CUSTOMER_PORTAL: z.url().min(1).optional(),
   NEXT_PUBLIC_GOOGLE_SITE_VERIFICATION_ID: z.string().optional(),
   NEXT_PUBLIC_WEB_PORT: z.coerce.number().min(1000).default(3000),
diff --git a/common/testing/fixtures/env-ci.ts b/common/testing/fixtures/env-ci.ts
diff --git a/common/testing/fixtures/env-process.ts b/common/testing/fixtures/env-process.ts
diff --git a/common/testing/fixtures/index.ts b/common/testing/fixtures/index.ts
@@ -57,3 +57,10 @@ export {
   type MockFetchFn,
   type MockFetchResponseConfig,
 } from './fetch'
+
+// Environment fixtures
+export { createTestBaseEnv, createTestProcessEnv } from './env-process'
+export { createTestCiEnv } from './env-ci'
+
+// Module mocking utilities
+export { mockModule, clearMockedModules, type MockResult } from './mock-modules'
diff --git a/common/testing/fixtures/mock-modules.ts b/common/testing/fixtures/mock-modules.ts
diff --git a/common/testing/impl/agent-runtime.ts b/common/testing/impl/agent-runtime.ts
diff --git a/packages/agent-runtime/src/__tests__/cost-aggregation.test.ts b/packages/agent-runtime/src/__tests__/cost-aggregation.test.ts
@@ -1,4 +1,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import {
   getInitialAgentState,
   getInitialSessionState,
diff --git a/packages/agent-runtime/src/__tests__/fast-rewrite.test.ts b/packages/agent-runtime/src/__tests__/fast-rewrite.test.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { afterAll, beforeEach, describe, expect, it } from 'bun:test'
 import { createPatch } from 'diff'
 
diff --git a/packages/agent-runtime/src/__tests__/generate-diffs-prompt.test.ts b/packages/agent-runtime/src/__tests__/generate-diffs-prompt.test.ts
@@ -1,4 +1,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { expect, describe, it } from 'bun:test'
 
 import { parseAndGetDiffBlocksSingleFile } from '../generate-diffs-prompt'
diff --git a/packages/agent-runtime/src/__tests__/live-user-inputs.test.ts b/packages/agent-runtime/src/__tests__/live-user-inputs.test.ts
@@ -1,4 +1,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { describe, it, expect, beforeEach } from 'bun:test'
 
 import {
diff --git a/packages/agent-runtime/src/__tests__/loop-agent-steps.test.ts b/packages/agent-runtime/src/__tests__/loop-agent-steps.test.ts
@@ -4,7 +4,7 @@ import {
   mockBigQuery,
   mockRandomUUID,
 } from '@codebuff/common/testing/fixtures'
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { getInitialSessionState } from '@codebuff/common/types/session-state'
 import { assistantMessage, userMessage } from '@codebuff/common/util/messages'
 import * as bigquery from '@codebuff/bigquery'
diff --git a/packages/agent-runtime/src/__tests__/main-prompt.test.ts b/packages/agent-runtime/src/__tests__/main-prompt.test.ts
@@ -4,7 +4,7 @@ import {
   mockAnalytics,
   mockBigQuery,
 } from '@codebuff/common/testing/fixtures'
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import {
   AgentTemplateTypes,
   getInitialSessionState,
diff --git a/packages/agent-runtime/src/__tests__/n-parameter.test.ts b/packages/agent-runtime/src/__tests__/n-parameter.test.ts
@@ -3,7 +3,7 @@ import {
   mockAnalytics,
   mockRandomUUID,
 } from '@codebuff/common/testing/fixtures'
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { getInitialSessionState } from '@codebuff/common/types/session-state'
 import { assistantMessage, userMessage } from '@codebuff/common/util/messages'
 import {
diff --git a/packages/agent-runtime/src/__tests__/process-file-block.test.ts b/packages/agent-runtime/src/__tests__/process-file-block.test.ts
@@ -1,4 +1,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { cleanMarkdownCodeBlock } from '@codebuff/common/util/file'
 import { beforeEach, describe, expect, it } from 'bun:test'
 import { applyPatch } from 'diff'
diff --git a/packages/agent-runtime/src/__tests__/prompt-caching-subagents.test.ts b/packages/agent-runtime/src/__tests__/prompt-caching-subagents.test.ts
@@ -1,4 +1,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { getInitialSessionState } from '@codebuff/common/types/session-state'
 import { assistantMessage, userMessage } from '@codebuff/common/util/messages'
 import { beforeEach, describe, expect, it, beforeAll } from 'bun:test'
diff --git a/packages/agent-runtime/src/__tests__/propose-tools.test.ts b/packages/agent-runtime/src/__tests__/propose-tools.test.ts
@@ -1,4 +1,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { getInitialSessionState } from '@codebuff/common/types/session-state'
 import {
   assistantMessage,
diff --git a/packages/agent-runtime/src/__tests__/read-docs-tool.test.ts b/packages/agent-runtime/src/__tests__/read-docs-tool.test.ts
@@ -4,7 +4,7 @@ import {
   mockAnalytics,
   mockBigQuery,
 } from '@codebuff/common/testing/fixtures'
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { getInitialSessionState } from '@codebuff/common/types/session-state'
 import {
   afterEach,
diff --git a/packages/agent-runtime/src/__tests__/run-agent-step-tools.test.ts b/packages/agent-runtime/src/__tests__/run-agent-step-tools.test.ts
@@ -4,7 +4,7 @@ import {
   mockAnalytics,
   mockBigQuery,
 } from '@codebuff/common/testing/fixtures'
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { getInitialSessionState } from '@codebuff/common/types/session-state'
 import { assistantMessage, userMessage } from '@codebuff/common/util/messages'
 import {
diff --git a/packages/agent-runtime/src/__tests__/run-programmatic-step.test.ts b/packages/agent-runtime/src/__tests__/run-programmatic-step.test.ts
@@ -3,7 +3,7 @@ import {
   mockAnalytics,
   mockRandomUUID,
 } from '@codebuff/common/testing/fixtures'
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { getInitialSessionState } from '@codebuff/common/types/session-state'
 import {
   assistantMessage,
diff --git a/packages/agent-runtime/src/__tests__/sandbox-generator.test.ts b/packages/agent-runtime/src/__tests__/sandbox-generator.test.ts
@@ -1,4 +1,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import {
   getInitialAgentState,
   type AgentState,
diff --git a/packages/agent-runtime/src/__tests__/spawn-agents-image-content.test.ts b/packages/agent-runtime/src/__tests__/spawn-agents-image-content.test.ts
@@ -1,4 +1,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { getInitialSessionState } from '@codebuff/common/types/session-state'
 import {
   assistantMessage,
diff --git a/packages/agent-runtime/src/__tests__/spawn-agents-message-history.test.ts b/packages/agent-runtime/src/__tests__/spawn-agents-message-history.test.ts
@@ -1,4 +1,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { getInitialSessionState } from '@codebuff/common/types/session-state'
 import {
   assistantMessage,
diff --git a/packages/agent-runtime/src/__tests__/spawn-agents-permissions.test.ts b/packages/agent-runtime/src/__tests__/spawn-agents-permissions.test.ts
@@ -1,4 +1,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { getInitialSessionState } from '@codebuff/common/types/session-state'
 import { assistantMessage } from '@codebuff/common/util/messages'
 import {
diff --git a/packages/agent-runtime/src/__tests__/subagent-streaming.test.ts b/packages/agent-runtime/src/__tests__/subagent-streaming.test.ts
@@ -1,4 +1,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { getInitialSessionState } from '@codebuff/common/types/session-state'
 import { assistantMessage } from '@codebuff/common/util/messages'
 import {
diff --git a/packages/agent-runtime/src/__tests__/tool-stream-parser.test.ts b/packages/agent-runtime/src/__tests__/tool-stream-parser.test.ts
@@ -1,4 +1,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { beforeEach, describe, expect, it } from 'bun:test'
 
 import { processStreamWithTools } from '../tool-stream-parser'
diff --git a/packages/agent-runtime/src/__tests__/web-search-tool.test.ts b/packages/agent-runtime/src/__tests__/web-search-tool.test.ts
@@ -4,7 +4,7 @@ import {
   mockAnalytics,
   mockBigQuery,
 } from '@codebuff/common/testing/fixtures'
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { getInitialSessionState } from '@codebuff/common/types/session-state'
 import { success } from '@codebuff/common/util/error'
 import {
diff --git a/packages/agent-runtime/src/__tests__/xml-tool-result-ordering.test.ts b/packages/agent-runtime/src/__tests__/xml-tool-result-ordering.test.ts
@@ -1,4 +1,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { beforeEach, describe, expect, it } from 'bun:test'
 
 import { processStreamWithTools } from '../tool-stream-parser'
diff --git a/packages/agent-runtime/src/find-files/__tests__/request-files-prompt.test.ts b/packages/agent-runtime/src/find-files/__tests__/request-files-prompt.test.ts
@@ -1,5 +1,5 @@
 import { finetunedVertexModels } from '@codebuff/common/old-constants'
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { userMessage } from '@codebuff/common/util/messages'
 import { beforeEach, describe, expect, it, mock } from 'bun:test'
 
diff --git a/packages/agent-runtime/src/llm-api/__tests__/linkup-api.test.ts b/packages/agent-runtime/src/llm-api/__tests__/linkup-api.test.ts
@@ -1,4 +1,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import {
   createMockFetch,
   createMockFetchError,
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,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { getStubProjectFileContext } from '@codebuff/common/util/file'
 import {
   describe,
diff --git a/sdk/testing/env.ts b/sdk/testing/env.ts
@@ -2,7 +2,7 @@
  * Test-only SDK env fixtures.
  */
 
-import { createTestBaseEnv } from '@codebuff/common/testing/env-process'
+import { createTestBaseEnv } from '@codebuff/common/testing/fixtures'
 
 import type { SdkEnv } from '../src/types/env'
 
diff --git a/web/src/app/api/v1/me/__tests__/me.test.ts b/web/src/app/api/v1/me/__tests__/me.test.ts
@@ -1,4 +1,4 @@
-import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/impl/agent-runtime'
+import { TEST_AGENT_RUNTIME_IMPL } from '@codebuff/common/testing/fixtures'
 import { describe, test, expect, beforeEach } from 'bun:test'
 import { NextRequest } from 'next/server'
 
diff --git a/web/src/app/orgs/[slug]/billing/purchase/page.tsx b/web/src/app/orgs/[slug]/billing/purchase/page.tsx
@@ -78,7 +78,7 @@ export default function OrganizationBillingPurchasePage() {
       localStorage.setItem('pendingCreditPurchase', credits.toString())
 
       // Redirect to Stripe Checkout
-      const stripe = await loadStripe(env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY!)
+      const stripe = await loadStripe(env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY)
 
       if (stripe) {
         const { error } = await stripe.redirectToCheckout({
diff --git a/web/src/app/orgs/[slug]/billing/setup/page.tsx b/web/src/app/orgs/[slug]/billing/setup/page.tsx
@@ -60,7 +60,7 @@ export default function BillingSetupPage() {
 
       // Redirect to Stripe Checkout
       const stripe = (await import('@stripe/stripe-js')).loadStripe(
-        env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY!,
+        env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY,
       )
 
       const stripeInstance = await stripe
diff --git a/web/src/app/orgs/[slug]/page.tsx b/web/src/app/orgs/[slug]/page.tsx
@@ -93,7 +93,7 @@ export default function OrganizationPage() {
       const { sessionId } = await response.json()
 
       // Redirect to Stripe Checkout
-      const stripe = await loadStripe(env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY!)
+      const stripe = await loadStripe(env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY)
 
       if (stripe) {
         const { error } = await stripe.redirectToCheckout({
diff --git a/web/src/app/profile/components/usage-section.tsx b/web/src/app/profile/components/usage-section.tsx
@@ -38,15 +38,6 @@ const ManageCreditsCard = ({ isLoading = false }: { isLoading?: boolean }) => {
     },
     onSuccess: async (data) => {
       if (data.sessionId) {
-        if (!env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY) {
-          toast({
-            title: 'Error',
-            description: 'Stripe publishable key is not configured.',
-            variant: 'destructive',
-          })
-          return
-        }
-
         const stripePromise = loadStripe(env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY)
         const stripe = await stripePromise
         if (!stripe) {
