refactor(env): separate test-only env helpers

Author: brandonkachen

cli/src/__tests__/utils/env.test.ts

@@ -1,6 +1,7 @@
 import { describe, test, expect, afterEach } from 'bun:test'
 
-import { getCliEnv, createTestCliEnv } from '../../utils/env'
+import { createTestCliEnv } from '../../testing/env'
+import { getCliEnv } from '../../utils/env'
 
 describe('cli/utils/env', () => {
   describe('getCliEnv', () => {

cli/src/testing/env.ts

@@ -0,0 +1,48 @@
+/**
+ * Test-only CLI env fixtures.
+ */
+
+import { createTestBaseEnv } from '@codebuff/common/testing/env-process'
+
+import type { CliEnv } from '../types/env'
+
+/**
+ * Create a test CliEnv with optional overrides.
+ * Composes from createTestBaseEnv for DRY.
+ */
+export const createTestCliEnv = (overrides: Partial<CliEnv> = {}): CliEnv => ({
+  ...createTestBaseEnv(),
+
+  // CLI-specific defaults
+  KITTY_WINDOW_ID: undefined,
+  SIXEL_SUPPORT: undefined,
+  ZED_NODE_ENV: undefined,
+  ZED_TERM: undefined,
+  ZED_SHELL: undefined,
+  COLORTERM: undefined,
+  VSCODE_THEME_KIND: undefined,
+  VSCODE_COLOR_THEME_KIND: undefined,
+  VSCODE_GIT_IPC_HANDLE: undefined,
+  VSCODE_PID: undefined,
+  VSCODE_CWD: undefined,
+  VSCODE_NLS_CONFIG: undefined,
+  CURSOR_PORT: undefined,
+  CURSOR: undefined,
+  JETBRAINS_REMOTE_RUN: undefined,
+  IDEA_INITIAL_DIRECTORY: undefined,
+  IDE_CONFIG_DIR: undefined,
+  JB_IDE_CONFIG_DIR: undefined,
+  VISUAL: undefined,
+  EDITOR: undefined,
+  CODEBUFF_CLI_EDITOR: undefined,
+  CODEBUFF_EDITOR: undefined,
+  OPEN_TUI_THEME: undefined,
+  OPENTUI_THEME: undefined,
+  CODEBUFF_IS_BINARY: undefined,
+  CODEBUFF_CLI_VERSION: undefined,
+  CODEBUFF_CLI_TARGET: undefined,
+  CODEBUFF_RG_PATH: undefined,
+  CODEBUFF_SCROLL_MULTIPLIER: undefined,
+  ...overrides,
+})
+

cli/src/utils/env.ts

@@ -5,7 +5,7 @@
  * process env with CLI-specific vars for terminal/IDE detection.
  */
 
-import { getBaseEnv, createTestBaseEnv } from '@codebuff/common/env-process'
+import { getBaseEnv } from '@codebuff/common/env-process'
 
 import type { CliEnv } from '../types/env'
 
@@ -66,43 +66,3 @@ export const getCliEnv = (): CliEnv => ({
  * or when you need to set environment variables at runtime.
  */
 export const getSystemProcessEnv = (): NodeJS.ProcessEnv => process.env
-
-/**
- * Create a test CliEnv with optional overrides.
- * Composes from createTestBaseEnv() for DRY.
- */
-export const createTestCliEnv = (overrides: Partial<CliEnv> = {}): CliEnv => ({
-  ...createTestBaseEnv(),
-
-  // CLI-specific defaults
-  KITTY_WINDOW_ID: undefined,
-  SIXEL_SUPPORT: undefined,
-  ZED_NODE_ENV: undefined,
-  ZED_TERM: undefined,
-  ZED_SHELL: undefined,
-  COLORTERM: undefined,
-  VSCODE_THEME_KIND: undefined,
-  VSCODE_COLOR_THEME_KIND: undefined,
-  VSCODE_GIT_IPC_HANDLE: undefined,
-  VSCODE_PID: undefined,
-  VSCODE_CWD: undefined,
-  VSCODE_NLS_CONFIG: undefined,
-  CURSOR_PORT: undefined,
-  CURSOR: undefined,
-  JETBRAINS_REMOTE_RUN: undefined,
-  IDEA_INITIAL_DIRECTORY: undefined,
-  IDE_CONFIG_DIR: undefined,
-  JB_IDE_CONFIG_DIR: undefined,
-  VISUAL: undefined,
-  EDITOR: undefined,
-  CODEBUFF_CLI_EDITOR: undefined,
-  CODEBUFF_EDITOR: undefined,
-  OPEN_TUI_THEME: undefined,
-  OPENTUI_THEME: undefined,
-  CODEBUFF_IS_BINARY: undefined,
-  CODEBUFF_CLI_VERSION: undefined,
-  CODEBUFF_CLI_TARGET: undefined,
-  CODEBUFF_RG_PATH: undefined,
-  CODEBUFF_SCROLL_MULTIPLIER: undefined,
-  ...overrides,
-})

common/src/__tests__/env-ci.test.ts

@@ -1,6 +1,7 @@
 import { describe, test, expect, afterEach } from 'bun:test'
 
-import { getCiEnv, ciEnv, isCI, createTestCiEnv } from '../env-ci'
+import { getCiEnv, ciEnv, isCI } from '../env-ci'
+import { createTestCiEnv } from '../testing/env-ci'
 
 describe('env-ci', () => {
   describe('getCiEnv', () => {

common/src/__tests__/env-process.test.ts

@@ -1,10 +1,7 @@
-import { describe, test, expect, beforeEach, afterEach } from 'bun:test'
+import { describe, test, expect, afterEach } from 'bun:test'
 
-import {
-  getProcessEnv,
-  processEnv,
-  createTestProcessEnv,
-} from '../env-process'
+import { getProcessEnv, processEnv } from '../env-process'
+import { createTestProcessEnv } from '../testing/env-process'
 
 describe('env-process', () => {
   describe('getProcessEnv', () => {

common/src/env-ci.ts

@@ -33,16 +33,3 @@ export const isCI = (): boolean => {
   const env = getCiEnv()
   return env.CI === 'true' || env.CI === '1' || env.GITHUB_ACTIONS === 'true'
 }
-
-/**
- * Create a test CiEnv with optional overrides.
- */
-export const createTestCiEnv = (overrides: Partial<CiEnv> = {}): CiEnv => ({
-  CI: undefined,
-  GITHUB_ACTIONS: undefined,
-  RENDER: undefined,
-  IS_PULL_REQUEST: undefined,
-  CODEBUFF_GITHUB_TOKEN: undefined,
-  CODEBUFF_API_KEY: 'test-api-key',
-  ...overrides,
-})

common/src/env-process.ts

@@ -6,9 +6,8 @@
  * environment variables like SHELL, HOME, TERM, etc.
  *
  * Usage:
- * - Import `getBaseProcessEnv` for base OS-level vars only
+ * - Import `getBaseEnv` for base OS-level vars only
  * - Import `getProcessEnv` for the full ProcessEnv (base + extensions)
- * - In tests, use `createTestBaseProcessEnv` or `createTestProcessEnv`
  */
 
 import type { BaseEnv, ProcessEnv } from './types/contracts/env'
@@ -34,30 +33,6 @@ export const getBaseEnv = (): BaseEnv => ({
   PATH: process.env.PATH,
 })
 
-/**
- * Create test defaults for BaseEnv.
- * Package-specific test helpers should spread this.
- */
-export const createTestBaseEnv = (
-  overrides: Partial<BaseEnv> = {},
-): BaseEnv => ({
-  SHELL: undefined,
-  COMSPEC: undefined,
-  HOME: '/home/test',
-  USERPROFILE: undefined,
-  APPDATA: undefined,
-  XDG_CONFIG_HOME: undefined,
-  TERM: 'xterm-256color',
-  TERM_PROGRAM: undefined,
-  TERM_BACKGROUND: undefined,
-  TERMINAL_EMULATOR: undefined,
-  COLORFGBG: undefined,
-  NODE_ENV: 'test',
-  NODE_PATH: undefined,
-  PATH: '/usr/bin',
-  ...overrides,
-})
-
 /**
  * Get full process environment values (base + all extensions).
  * Returns a snapshot of the current process.env values for the ProcessEnv type.
@@ -117,60 +92,3 @@ export const getProcessEnv = (): ProcessEnv => ({
  * Use this for production code, inject mocks in tests.
  */
 export const processEnv: ProcessEnv = getProcessEnv()
-
-/**
- * Create a test ProcessEnv with optional overrides.
- * Composes from createTestBaseProcessEnv for DRY.
- */
-export const createTestProcessEnv = (
-  overrides: Partial<ProcessEnv> = {},
-): ProcessEnv => ({
-  ...createTestBaseEnv(),
-
-  // Terminal-specific
-  KITTY_WINDOW_ID: undefined,
-  SIXEL_SUPPORT: undefined,
-  ZED_NODE_ENV: undefined,
-
-  // VS Code family detection
-  VSCODE_THEME_KIND: undefined,
-  VSCODE_COLOR_THEME_KIND: undefined,
-  VSCODE_GIT_IPC_HANDLE: undefined,
-  VSCODE_PID: undefined,
-  VSCODE_CWD: undefined,
-  VSCODE_NLS_CONFIG: undefined,
-
-  // Cursor editor detection
-  CURSOR_PORT: undefined,
-  CURSOR: undefined,
-
-  // JetBrains IDE detection
-  JETBRAINS_REMOTE_RUN: undefined,
-  IDEA_INITIAL_DIRECTORY: undefined,
-  IDE_CONFIG_DIR: undefined,
-  JB_IDE_CONFIG_DIR: undefined,
-
-  // Editor preferences
-  VISUAL: undefined,
-  EDITOR: undefined,
-  CODEBUFF_CLI_EDITOR: undefined,
-  CODEBUFF_EDITOR: undefined,
-
-  // Theme preferences
-  OPEN_TUI_THEME: undefined,
-  OPENTUI_THEME: undefined,
-
-  // Codebuff CLI-specific
-  CODEBUFF_IS_BINARY: undefined,
-  CODEBUFF_CLI_VERSION: undefined,
-  CODEBUFF_CLI_TARGET: undefined,
-  CODEBUFF_RG_PATH: undefined,
-  CODEBUFF_WASM_DIR: undefined,
-
-  // Build/CI flags
-  VERBOSE: undefined,
-  OVERRIDE_TARGET: undefined,
-  OVERRIDE_PLATFORM: undefined,
-  OVERRIDE_ARCH: undefined,
-  ...overrides,
-})

common/src/env.ts

@@ -1,45 +1,12 @@
-import {
-  clientEnvSchema,
-  clientProcessEnv,
-  type ClientInput,
-} from './env-schema'
+import { clientEnvSchema, clientProcessEnv } from './env-schema'
 
-const isTestRuntime =
-  process.env.NODE_ENV === 'test' || process.env.BUN_ENV === 'test'
-
-const TEST_ENV_DEFAULTS: ClientInput = {
-  NEXT_PUBLIC_CB_ENVIRONMENT: 'test',
-  NEXT_PUBLIC_CODEBUFF_APP_URL: 'http://localhost:3000',
-  NEXT_PUBLIC_SUPPORT_EMAIL: 'support@codebuff.com',
-  NEXT_PUBLIC_POSTHOG_API_KEY: 'test-posthog-key',
-  NEXT_PUBLIC_POSTHOG_HOST_URL: 'https://us.i.posthog.com',
-  NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: 'pk_test_placeholder',
-  NEXT_PUBLIC_STRIPE_CUSTOMER_PORTAL:
-    'https://billing.stripe.com/p/login/test_placeholder',
-  NEXT_PUBLIC_GOOGLE_SITE_VERIFICATION_ID: 'test-verification',
-  NEXT_PUBLIC_WEB_PORT: '3000',
-}
-
-const envInput = isTestRuntime
-  ? { ...TEST_ENV_DEFAULTS, ...clientProcessEnv }
-  : clientProcessEnv
-
-const parsedEnv = clientEnvSchema.safeParse(envInput)
+const parsedEnv = clientEnvSchema.safeParse(clientProcessEnv)
 if (!parsedEnv.success) {
   throw parsedEnv.error
 }
 
 export const env = parsedEnv.data
 
-// Populate process.env with defaults during tests so direct access works
-if (isTestRuntime) {
-  for (const [key, value] of Object.entries(TEST_ENV_DEFAULTS)) {
-    if (!process.env[key] && typeof value === 'string') {
-      process.env[key] = value
-    }
-  }
-}
-
 // Only log environment in non-production
 if (env.NEXT_PUBLIC_CB_ENVIRONMENT !== 'prod') {
   console.log('Using environment:', env.NEXT_PUBLIC_CB_ENVIRONMENT)

common/src/testing/env-ci.ts

@@ -0,0 +1,19 @@
+/**
+ * Test-only CiEnv fixtures.
+ */
+
+import type { CiEnv } from '../types/contracts/env'
+
+/**
+ * Create a test CiEnv with optional overrides.
+ */
+export const createTestCiEnv = (overrides: Partial<CiEnv> = {}): CiEnv => ({
+  CI: undefined,
+  GITHUB_ACTIONS: undefined,
+  RENDER: undefined,
+  IS_PULL_REQUEST: undefined,
+  CODEBUFF_GITHUB_TOKEN: undefined,
+  CODEBUFF_API_KEY: 'test-api-key',
+  ...overrides,
+})
+