Phase 4: Consolidate test setup patterns and complete consolidation

Co-authored-by: chrisreddington <[email protected]>

Author: Copilot

mcp-server/vitest.setup.ts

@@ -1,28 +1,10 @@
 /**
  * Vitest setup for mcp-server package tests
  * 
- * Sets up test database before all tests and cleans up after
+ * Uses shared test setup utilities to ensure consistent database setup
  */
 
-import { setupTestDatabase, teardownTestDatabase } from '@turn-based-mcp/shared'
-import { beforeAll, afterAll } from 'vitest'
+import { setupStandardTestDatabase } from '@turn-based-mcp/shared'
 
-// Setup test database before all tests
-beforeAll(async () => {
-  try {
-    await setupTestDatabase(true) // Use in-memory database for speed
-  } catch (error) {
-    console.error('Failed to setup test database:', error)
-    throw error
-  }
-})
-
-// Cleanup test database after all tests
-afterAll(async () => {
-  try {
-    await teardownTestDatabase()
-  } catch (error) {
-    console.error('Failed to teardown test database:', error)
-    // Don't throw here to avoid masking other test failures
-  }
-})
+// Setup standard test database using shared utility
+setupStandardTestDatabase()

shared/src/testing/index.ts

@@ -23,3 +23,7 @@ export {
   createStorageMocks,
   TEST_MOVES
 } from './api-test-utils'
+
+export {
+  setupStandardTestDatabase
+} from './vitest-setup'

shared/src/testing/vitest-setup.ts

@@ -0,0 +1,35 @@
+/**
+ * Shared Vitest Setup Functions
+ * 
+ * Provides standardized test setup and teardown functions to reduce
+ * duplication across package vitest setup files.
+ */
+
+import { beforeAll, afterAll } from 'vitest'
+import { setupTestDatabase, teardownTestDatabase } from './test-database'
+
+/**
+ * Standard database setup for all packages
+ * Call this in vitest.setup.ts files to ensure consistent database setup
+ */
+export function setupStandardTestDatabase() {
+  // Setup test database before all tests
+  beforeAll(async () => {
+    try {
+      await setupTestDatabase(true) // Use in-memory database for speed
+    } catch (error) {
+      console.error('Failed to setup test database:', error)
+      throw error
+    }
+  })
+
+  // Cleanup test database after all tests
+  afterAll(async () => {
+    try {
+      await teardownTestDatabase()
+    } catch (error) {
+      console.error('Failed to teardown test database:', error)
+      // Don't throw here to avoid masking other test failures
+    }
+  })
+}

shared/vitest.setup.ts

@@ -1,28 +1,10 @@
 /**
  * Vitest setup for shared package tests
  * 
- * Sets up test database before all tests and cleans up after
+ * Uses local test setup utilities since this is the package that defines them
  */
 
-import { setupTestDatabase, teardownTestDatabase } from './dist/testing/test-database.js'
-import { beforeAll, afterAll } from 'vitest'
+import { setupStandardTestDatabase } from './src/testing/vitest-setup'
 
-// Setup test database before all tests
-beforeAll(async () => {
-  try {
-    await setupTestDatabase(true) // Use in-memory database for speed
-  } catch (error) {
-    console.error('Failed to setup test database:', error)
-    throw error
-  }
-})
-
-// Cleanup test database after all tests
-afterAll(async () => {
-  try {
-    await teardownTestDatabase()
-  } catch (error) {
-    console.error('Failed to teardown test database:', error)
-    // Don't throw here to avoid masking other test failures
-  }
-})
+// Setup standard test database using local utility
+setupStandardTestDatabase()

web/src/test-utils/api-route-mocks.ts

@@ -6,6 +6,7 @@
  */
 
 import { vi } from 'vitest'
+import { NextRequest } from 'next/server'
 import { 
   createSharedGameMocks, 
   createStorageMocks,
@@ -95,12 +96,12 @@ export function createTestGameSessions() {
 /**
  * Helper to create NextRequest mock for testing
  */
-export function createMockNextRequest(url: string, init?: { method?: string; body?: any }) {
+export function createMockNextRequest(url: string, init?: { method?: string; body?: unknown }) {
   const mockRequest = {
     url,
     method: init?.method || 'GET',
     json: vi.fn().mockResolvedValue(init?.body || {})
   }
 
-  return mockRequest as any
+  return mockRequest as unknown as NextRequest
 }

web/vitest.setup.ts

@@ -1,29 +1,12 @@
 // Vitest setup for web package tests
-import { vi, beforeAll, afterAll } from 'vitest'
+import { vi } from 'vitest'
 import '@testing-library/jest-dom'
 
-// Set up test database for all tests
-import { setupTestDatabase, teardownTestDatabase } from '@turn-based-mcp/shared'
+// Use shared test database setup
+import { setupStandardTestDatabase } from '@turn-based-mcp/shared'
 
-// Setup test database before all tests
-beforeAll(async () => {
-  try {
-    await setupTestDatabase(true) // Use in-memory database for speed
-  } catch (error) {
-    console.error('Failed to setup test database:', error)
-    throw error
-  }
-})
-
-// Cleanup test database after all tests
-afterAll(async () => {
-  try {
-    await teardownTestDatabase()
-  } catch (error) {
-    console.error('Failed to teardown test database:', error)
-    // Don't throw here to avoid masking other test failures
-  }
-})
+// Setup standard test database using shared utility
+setupStandardTestDatabase()
 
 // Mock Next.js Request and Response for API route testing
 class MockRequest {