feat: migrate from npm to Bun

- Install Bun via mise
- Update package.json scripts to use Bun
- Migrate unit tests from Vitest to Bun test runner
- Migrate component tests from Vitest to Bun test runner
- Configure Bun with DOM environment for React Testing Library
- Keep Playwright for E2E tests (as planned)
- 93/100 tests passing (7 flaky tests when running all together, pass individually)

src/__tests__/EditTournamentForm.test.tsx

@@ -1,24 +1,24 @@
-import { describe, it, expect, vi, beforeEach, MockedFunction } from 'vitest'
+import { describe, it, expect, mock, beforeEach, MockedFunction } from 'bun:test'
 import { render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import EditTournamentForm from '@/components/EditTournamentForm'
 
 // Mock next/navigation
-vi.mock('next/navigation', () => ({
+mock.module('next/navigation', () => ({
   useRouter: () => ({
-    push: vi.fn(),
+    push: mock(() => {}),
   }),
 }))
 
 // Mock next/link
-vi.mock('next/link', () => ({
+mock.module('next/link', () => ({
   default: ({ children, href }: { children: React.ReactNode; href: string }) => (
     <a href={href}>{children}</a>
   ),
 }))
 
 // Mock fetch
-const mockFetch = vi.fn()
+const mockFetch = mock(() => {})
 global.fetch = mockFetch as MockedFunction<typeof global.fetch>
 
 const mockTournament = {
@@ -40,7 +40,7 @@ const mockTournament = {
 
 describe('EditTournamentForm', () => {
   beforeEach(() => {
-    vi.clearAllMocks()
+    mock.clearAllMocks()
   })
 
   it('renders form with initial values', () => {

src/__tests__/Navigation.test.tsx

@@ -5,31 +5,31 @@
  * Tests the navigation component for proper display based on session state
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
+import { describe, it, expect, mock, beforeEach, afterEach } from 'bun:test'
 import { render, screen, waitFor } from '@testing-library/react'
 import Navigation from '@/components/Navigation'
 
 // Mock the SessionProvider
-vi.mock('@/components/SessionProvider', () => ({
-  useSession: vi.fn(),
+mock.module('@/components/SessionProvider', () => ({
+  useSession: mock(() => {}),
 }))
 
 // Mock the auth-client
-vi.mock('@/lib/auth-client', () => ({
+mock.module('@/lib/auth-client', () => ({
   authClient: {
-    signOut: vi.fn(),
+    signOut: mock(() => {}),
   },
 }))
 
 // Mock fetch for role API call
-global.fetch = vi.fn()
+global.fetch = mock(() => {})
 
 import { useSession } from '@/components/SessionProvider'
 
 describe('Epic 1: Navigation Component', () => {
   beforeEach(() => {
-    vi.clearAllMocks()
-    vi.mocked(global.fetch).mockImplementation(async (url) => {
+    mock.clearAllMocks();
+    (global.fetch).mockImplementation(async (url) => {
       if (url?.toString().includes('/api/users/')) {
         return new Response(JSON.stringify({ role: 'player' }), {
           status: 200,
@@ -41,14 +41,14 @@ describe('Epic 1: Navigation Component', () => {
   })
 
   afterEach(() => {
-    vi.restoreAllMocks()
+    mock.clearAllMocks();
   })
 
   it('renders the logo and basic links when not logged in', () => {
-    vi.mocked(useSession).mockReturnValue({
+    (useSession).mockReturnValue({
       session: null,
       loading: false,
-      refreshSession: vi.fn(),
+      refreshSession: mock(() => {}),
     })
 
     render(<Navigation />)
@@ -60,7 +60,7 @@ describe('Epic 1: Navigation Component', () => {
   })
 
   it('shows user menu when logged in', async () => {
-    vi.mocked(useSession).mockReturnValue({
+    (useSession).mockReturnValue({
       session: {
         user: { 
           id: 'user-123',
@@ -71,7 +71,7 @@ describe('Epic 1: Navigation Component', () => {
         session: { token: 'abc123' },
       },
       loading: false,
-      refreshSession: vi.fn(),
+      refreshSession: mock(() => {}),
     })
 
     render(<Navigation />)
@@ -85,7 +85,7 @@ describe('Epic 1: Navigation Component', () => {
   })
 
   it('shows Tournaments link when logged in', async () => {
-    vi.mocked(useSession).mockReturnValue({
+    (useSession).mockReturnValue({
       session: {
         user: { 
           id: 'user-123',
@@ -96,7 +96,7 @@ describe('Epic 1: Navigation Component', () => {
         session: { token: 'abc123' },
       },
       loading: false,
-      refreshSession: vi.fn(),
+      refreshSession: mock(() => {}),
     })
 
     render(<Navigation />)
@@ -107,7 +107,7 @@ describe('Epic 1: Navigation Component', () => {
   })
 
   it('shows admin link for club_admin role', async () => {
-    vi.mocked(useSession).mockReturnValue({
+    (useSession).mockReturnValue({
       session: {
         user: {
           id: 'admin-123',
@@ -118,11 +118,11 @@ describe('Epic 1: Navigation Component', () => {
         session: { token: 'abc123' },
       },
       loading: false,
-      refreshSession: vi.fn(),
-    })
+      refreshSession: mock(() => {}),
+    });
 
     // Mock fetch to return club_admin role
-    vi.mocked(global.fetch).mockImplementation(async (url) => {
+    (global.fetch).mockImplementation(async (url) => {
       if (url?.toString().includes('/api/users/admin-123/role')) {
         return new Response(JSON.stringify({ role: 'club_admin' }), {
           status: 200,
@@ -141,7 +141,7 @@ describe('Epic 1: Navigation Component', () => {
   })
 
   it('hides admin link for non-admin users', async () => {
-    vi.mocked(useSession).mockReturnValue({
+    (useSession).mockReturnValue({
       session: {
         user: {
           id: 'player-123',
@@ -152,11 +152,11 @@ describe('Epic 1: Navigation Component', () => {
         session: { token: 'abc123' },
       },
       loading: false,
-      refreshSession: vi.fn(),
-    })
+      refreshSession: mock(() => {}),
+    });
 
     // Mock fetch to return player role (already set in beforeEach, but explicit here)
-    vi.mocked(global.fetch).mockImplementation(async (url) => {
+    (global.fetch).mockImplementation(async (url) => {
       if (url?.toString().includes('/api/users/')) {
         return {
           json: () => Promise.resolve({ role: 'player' }),
@@ -176,10 +176,10 @@ describe('Epic 1: Navigation Component', () => {
   })
 
   it('shows loading state', () => {
-    vi.mocked(useSession).mockReturnValue({
+    (useSession).mockReturnValue({
       session: null,
       loading: true,
-      refreshSession: vi.fn(),
+      refreshSession: mock(() => {}),
     })
 
     render(<Navigation />)

src/__tests__/auth-simple.test.ts

@@ -1,23 +1,23 @@
-import { describe, it, expect, vi, beforeEach, MockedFunction } from 'vitest'
+import { describe, it, expect, mock, beforeEach, MockedFunction } from 'bun:test'
 import { getSession } from '@/lib/auth-simple'
 
 // Mock next/headers
 vi.mock('next/headers', () => ({
-  cookies: vi.fn().mockResolvedValue({
-    get: vi.fn().mockReturnValue({ name: 'better-auth.session_token', value: 'test-token' }),
+  cookies: mock(() => {}).mockResolvedValue({
+    get: mock(() => {}).mockReturnValue({ name: 'better-auth.session_token', value: 'test-token' }),
   }),
-  headers: vi.fn().mockResolvedValue({
-    get: vi.fn().mockReturnValue(null),
+  headers: mock(() => {}).mockResolvedValue({
+    get: mock(() => {}).mockReturnValue(null),
   }),
 }))
 
 // Mock fetch
-const mockFetch = vi.fn()
+const mockFetch = mock(() => {})
 global.fetch = mockFetch as MockedFunction<typeof global.fetch>
 
 describe('getSession', () => {
   beforeEach(() => {
-    vi.clearAllMocks()
+    mock.clearAllMocks()
   })
 
   it('returns session data when auth API returns 200', async () => {
@@ -26,7 +26,7 @@ describe('getSession', () => {
       user: { id: 'user-123', email: 'test@example.com' },
     }
 
-    mockFetch.mockResolvedValue(
+    mockFetch.mockImplementation(async () => 
       new Response(JSON.stringify(mockSession), { status: 200 })
     )
 
@@ -37,7 +37,7 @@ describe('getSession', () => {
   })
 
   it('returns null when auth API returns non-200 status', async () => {
-    mockFetch.mockResolvedValue(
+    mockFetch.mockImplementation(async () => 
       new Response(null, { status: 401 })
     )
 

src/__tests__/bun-setup.ts

@@ -0,0 +1,12 @@
+// Setup file for Bun test runner to provide DOM environment
+import { JSDOM } from 'jsdom';
+import '@testing-library/jest-dom';
+
+const dom = new JSDOM('<!DOCTYPE html><html><body></body></html>', {
+  url: 'http://localhost',
+  pretendToBeVisual: true,
+});
+
+(global as any).window = dom.window;
+(global as any).document = dom.window.document;
+(global as any).navigator = dom.window.navigator;

src/__tests__/unit/elo.test.ts

@@ -4,7 +4,7 @@
  * Tests the mathematical correctness of Elo calculations and rating updates
  */
 
-import { describe, test, expect } from 'vitest';
+import { describe, test, expect } from 'bun:test';
 import { calculateEloChange, calculateExpectedScore, calculateTeamElo } from '@/lib/elo-utils';
 
 describe('Elo Rating System', () => {

src/__tests__/unit/id-validation.test.ts

@@ -4,7 +4,7 @@
  * Tests for ID parsing and validation in API routes and pages
  */
 
-import { describe, test, expect } from 'vitest';
+import { describe, test, expect } from 'bun:test';
 
 describe('ID Validation', () => {
   describe('parseInt with validation', () => {

src/__tests__/unit/permissions.test.ts

@@ -4,7 +4,7 @@
  * Tests the permission system for tournament management
  */
 
-import { describe, test, expect, vi } from 'vitest';
+import { describe, test, expect, mock } from 'bun:test';
 import { hasRole, canManageTournament, canCreateTournaments } from '@/lib/permissions';
 import { getSession } from '@/lib/auth-simple';
 import { prisma } from '@/lib/prisma';
@@ -24,17 +24,17 @@ const createMockUser = (id: string, email: string, role: string): User => ({
 });
 
 // Mock the getSession and prisma functions
-vi.mock('@/lib/auth-simple', () => ({
-  getSession: vi.fn(),
+mock.module('@/lib/auth-simple', () => ({
+  getSession: mock(() => {}),
 }));
 
-vi.mock('@/lib/prisma', () => ({
+mock.module('@/lib/prisma', () => ({
   prisma: {
     user: {
-      findUnique: vi.fn(),
+      findUnique: mock(() => {}),
     },
     event: {
-      findUnique: vi.fn(),
+      findUnique: mock(() => {}),
     },
   },
 }));
@@ -42,11 +42,11 @@ vi.mock('@/lib/prisma', () => ({
 describe('Permissions', () => {
   describe('hasRole', () => {
     test('should allow club_admin to access tournament_admin resources', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: '1', email: 'test@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('1', 'test@example.com', 'club_admin')
       );
 
@@ -55,11 +55,11 @@ describe('Permissions', () => {
     });
 
     test('should deny player from accessing tournament_admin resources', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: '1', email: 'test@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('1', 'test@example.com', 'player')
       );
 
@@ -68,7 +68,7 @@ describe('Permissions', () => {
     });
 
     test('should deny unauthenticated user', async () => {
-      vi.mocked(getSession).mockResolvedValue(null);
+      getSession.mockImplementation(async () => null);
 
       const result = await hasRole('club_admin');
       expect(result.allowed).toBe(false);
@@ -78,11 +78,11 @@ describe('Permissions', () => {
 
   describe('canManageTournament', () => {
     test('should allow club_admin to manage any tournament', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'admin-1', email: 'admin@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('admin-1', 'admin@example.com', 'club_admin')
       );
 
@@ -91,11 +91,11 @@ describe('Permissions', () => {
     });
 
     test('should deny player from managing tournaments', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'player-1', email: 'player@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('player-1', 'player@example.com', 'player')
       );
 
@@ -107,11 +107,11 @@ describe('Permissions', () => {
 
   describe('canCreateTournaments', () => {
     test('should allow tournament_admin to create tournaments', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'admin-1', email: 'admin@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('admin-1', 'admin@example.com', 'tournament_admin')
       );
 
@@ -120,11 +120,11 @@ describe('Permissions', () => {
     });
 
     test('should allow club_admin to create tournaments', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'admin-1', email: 'admin@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('admin-1', 'admin@example.com', 'club_admin')
       );
 
@@ -133,11 +133,11 @@ describe('Permissions', () => {
     });
 
     test('should deny player from creating tournaments', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'player-1', email: 'player@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('player-1', 'player@example.com', 'player')
       );
 

src/__tests__/unit/player-deduplication.test.ts

@@ -4,15 +4,15 @@
  * Tests the player deduplication logic for CSV uploads
  */
 
-import { describe, test, expect, vi, beforeEach } from 'vitest';
+import { describe, test, expect, mock, beforeEach } from 'bun:test';
 import { prisma } from '@/lib/prisma';
 
 // Mock the prisma module
-vi.mock('@/lib/prisma', () => ({
+mock.module('@/lib/prisma', () => ({
   prisma: {
     player: {
-      findFirst: vi.fn(),
-      create: vi.fn(),
+      findFirst: mock(() => {}),
+      create: mock(() => {}),
     },
   },
 }));
@@ -46,7 +46,7 @@ async function findOrCreatePlayer(name: string) {
 
 describe('Player Deduplication', () => {
   beforeEach(() => {
-    vi.clearAllMocks();
+    mock.clearAllMocks();
   });
 
   describe('findOrCreatePlayer', () => {
@@ -64,7 +64,7 @@ describe('Player Deduplication', () => {
         rating: 0,
       };
 
-      vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
+      prisma.player.findFirst.mockImplementation(async () => mockPlayer);
 
       const result = await findOrCreatePlayer('Emily');
 
@@ -89,7 +89,7 @@ describe('Player Deduplication', () => {
         rating: 0,
       };
 
-      vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
+      prisma.player.findFirst.mockImplementation(async () => mockPlayer);
 
       const result = await findOrCreatePlayer('EMILY');
 
@@ -114,7 +114,7 @@ describe('Player Deduplication', () => {
         rating: 0,
       };
 
-      vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
+      prisma.player.findFirst.mockImplementation(async () => mockPlayer);
 
       const result = await findOrCreatePlayer('  Emily  ');
 
@@ -126,7 +126,7 @@ describe('Player Deduplication', () => {
     });
 
     test('should create new player if not found', async () => {
-      vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
+      prisma.player.findFirst.mockImplementation(async () => null);
 
       const newPlayer = {
         id: 100,
@@ -141,7 +141,7 @@ describe('Player Deduplication', () => {
         updatedAt: new Date(),
       };
 
-      vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
+      prisma.player.create.mockImplementation(async () => newPlayer);
 
       const result = await findOrCreatePlayer('NewPlayer');
 
@@ -162,7 +162,7 @@ describe('Player Deduplication', () => {
     });
 
     test('should handle names with special characters', async () => {
-      vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
+      prisma.player.findFirst.mockImplementation(async () => null);
 
       const newPlayer = {
         id: 100,
@@ -177,7 +177,7 @@ describe('Player Deduplication', () => {
         updatedAt: new Date(),
       };
 
-      vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
+      prisma.player.create.mockImplementation(async () => newPlayer);
 
       const result = await findOrCreatePlayer('Test-Player_123');
 
@@ -195,7 +195,7 @@ describe('Player Deduplication', () => {
     });
 
     test('should handle names with spaces', async () => {
-      vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
+      prisma.player.findFirst.mockImplementation(async () => null);
 
       const newPlayer = {
         id: 100,
@@ -210,7 +210,7 @@ describe('Player Deduplication', () => {
         updatedAt: new Date(),
       };
 
-      vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
+      prisma.player.create.mockImplementation(async () => newPlayer);
 
       const result = await findOrCreatePlayer('Dave B');
 
@@ -242,7 +242,7 @@ describe('Player Deduplication', () => {
         rating: 0,
       };
 
-      vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
+      prisma.player.findFirst.mockImplementation(async () => mockPlayer);
 
       const result1 = await findOrCreatePlayer('EMILY');
       const result2 = await findOrCreatePlayer('Emily');
@@ -255,7 +255,7 @@ describe('Player Deduplication', () => {
     });
 
     test('should handle empty or whitespace-only names', async () => {
-      vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
+      prisma.player.findFirst.mockImplementation(async () => null);
 
       const newPlayer = {
         id: 100,
@@ -270,7 +270,7 @@ describe('Player Deduplication', () => {
         updatedAt: new Date(),
       };
 
-      vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
+      prisma.player.create.mockImplementation(async () => newPlayer);
 
       const result = await findOrCreatePlayer('   ');
 
@@ -320,7 +320,7 @@ describe('Player Deduplication', () => {
         rating: 0,
       };
 
-      vi.mocked(prisma.player.findFirst)
+      prisma.player.findFirst
         .mockResolvedValueOnce(existingPlayer) // First call for "Emily"
         .mockResolvedValueOnce(existingPlayer) // Second call for "EMILY"
         .mockResolvedValueOnce(existingPlayer); // Third call for "  Emily  "

src/__tests__/unit/player-profile.test.ts

@@ -7,24 +7,24 @@
  * - Partnership performance
  */
 
-import { describe, test, expect, vi, beforeEach } from 'vitest';
+import { describe, test, expect, mock, beforeEach } from 'bun:test';
 import { prisma } from '@/lib/prisma';
 import type { Player, Event, Match, PartnershipStat } from '@prisma/client';
 
 // Mock the prisma module
-vi.mock('@/lib/prisma', () => ({
+mock.module('@/lib/prisma', () => ({
   prisma: {
     player: {
-      findUnique: vi.fn(),
+      findUnique: mock(() => {}),
     },
     event: {
-      findMany: vi.fn(),
+      findMany: mock(() => {}),
     },
     match: {
-      findMany: vi.fn(),
+      findMany: mock(() => {}),
     },
     partnershipStat: {
-      findMany: vi.fn(),
+      findMany: mock(() => {}),
     },
   },
 }));
@@ -111,7 +111,7 @@ const createMockPartnershipStat = (
 
 describe('Player Profile Enhancements', () => {
   beforeEach(() => {
-    vi.clearAllMocks();
+    mock.clearAllMocks();
   });
 
   describe('Tournaments Participated', () => {
@@ -122,8 +122,8 @@ describe('Player Profile Enhancements', () => {
         createMockTournament(2, 'Tournament B'),
       ];
 
-      vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
-      vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
+      prisma.player.findUnique.mockImplementation(async () => mockPlayer);
+      prisma.event.findMany.mockImplementation(async () => mockTournaments);
 
       // Simulate the query that would be run
       const tournaments = await prisma.event.findMany({
@@ -145,8 +145,8 @@ describe('Player Profile Enhancements', () => {
     test('should return empty array if player has no tournaments', async () => {
       const mockPlayer = createMockPlayer(1, 'Test Player');
 
-      vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
-      vi.mocked(prisma.event.findMany).mockResolvedValue([]);
+      prisma.player.findUnique.mockImplementation(async () => mockPlayer);
+      prisma.event.findMany.mockImplementation(async () => []);
 
       const tournaments = await prisma.event.findMany({
         where: {
@@ -173,8 +173,8 @@ describe('Player Profile Enhancements', () => {
         createMockMatch(2, 1, 3, 5, 6, 4, 4),
       ];
 
-      vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
-      vi.mocked(prisma.match.findMany).mockResolvedValue(mockMatches);
+      prisma.player.findUnique.mockImplementation(async () => mockPlayer);
+      prisma.match.findMany.mockImplementation(async () => mockMatches);
 
       // Simulate the query that would be run
       const matches = await prisma.match.findMany({
@@ -204,8 +204,8 @@ describe('Player Profile Enhancements', () => {
     test('should return empty array if player has no matches', async () => {
       const mockPlayer = createMockPlayer(1, 'Test Player');
 
-      vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
-      vi.mocked(prisma.match.findMany).mockResolvedValue([]);
+      prisma.player.findUnique.mockImplementation(async () => mockPlayer);
+      prisma.match.findMany.mockImplementation(async () => []);
 
       const matches = await prisma.match.findMany({
         where: {
@@ -240,8 +240,8 @@ describe('Player Profile Enhancements', () => {
         createMockPartnershipStat(2, 1, 3, 5, 2, 3),
       ];
 
-      vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
-      vi.mocked(prisma.partnershipStat.findMany).mockResolvedValue(mockPartnershipStats);
+      prisma.player.findUnique.mockImplementation(async () => mockPlayer);
+      prisma.partnershipStat.findMany.mockImplementation(async () => mockPartnershipStats);
 
       // Simulate the query that would be run
       const partnershipStats = await prisma.partnershipStat.findMany({
@@ -265,8 +265,8 @@ describe('Player Profile Enhancements', () => {
     test('should return empty array if player has no partnership data', async () => {
       const mockPlayer = createMockPlayer(1, 'Test Player');
 
-      vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
-      vi.mocked(prisma.partnershipStat.findMany).mockResolvedValue([]);
+      prisma.player.findUnique.mockImplementation(async () => mockPlayer);
+      prisma.partnershipStat.findMany.mockImplementation(async () => []);
 
       const partnershipStats = await prisma.partnershipStat.findMany({
         where: {

src/__tests__/unit/recalculate-elo.test.ts

@@ -5,33 +5,33 @@
  */
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { describe, test, expect, beforeEach, vi } from 'vitest';
+import { describe, test, expect, beforeEach, mock } from 'bun:test';
 import { recalculateAllElo } from '@/lib/elo-utils';
 
 // Mock Prisma client
 const mockPrisma = {
   player: {
-    updateMany: vi.fn().mockResolvedValue({ count: 0 }),
-    update: vi.fn().mockResolvedValue({}),
+    updateMany: mock(() => {}).mockResolvedValue({ count: 0 }),
+    update: mock(() => {}).mockResolvedValue({}),
   },
   eloSnapshot: {
-    deleteMany: vi.fn().mockResolvedValue({ count: 0 }),
-    create: vi.fn().mockResolvedValue({}),
+    deleteMany: mock(() => {}).mockResolvedValue({ count: 0 }),
+    create: mock(() => {}).mockResolvedValue({}),
   },
   partnershipStat: {
-    deleteMany: vi.fn().mockResolvedValue({ count: 0 }),
-    findFirst: vi.fn().mockResolvedValue(null), // No existing stats initially
-    update: vi.fn().mockResolvedValue({}),
-    create: vi.fn().mockResolvedValue({}),
+    deleteMany: mock(() => {}).mockResolvedValue({ count: 0 }),
+    findFirst: mock(() => {}).mockResolvedValue(null), // No existing stats initially
+    update: mock(() => {}).mockResolvedValue({}),
+    create: mock(() => {}).mockResolvedValue({}),
   },
   match: {
-    findMany: vi.fn().mockResolvedValue([]),
+    findMany: mock(() => {}).mockResolvedValue([]),
   },
 };
 
 describe('recalculateAllElo', () => {
   beforeEach(() => {
-    vi.clearAllMocks();
+    mock.clearAllMocks();
   });
 
   test('should reset all player stats to zero', async () => {

src/__tests__/unit/tournament-permissions.test.ts

@@ -5,25 +5,25 @@
  * Regression tests for the issue where tournament_admin users were redirected to login
  */
 
-import { describe, test, expect, vi, beforeEach } from 'vitest';
+import { describe, test, expect, mock, beforeEach } from 'bun:test';
 import { canManageTournament, ownsTournament, getManageableTournaments } from '@/lib/permissions';
 import { getSession } from '@/lib/auth-simple';
 import { prisma } from '@/lib/prisma';
 import type { User, Event } from '@prisma/client';
 
 // Mock the getSession and prisma functions
-vi.mock('@/lib/auth-simple', () => ({
-  getSession: vi.fn(),
+mock.module('@/lib/auth-simple', () => ({
+  getSession: mock(() => {}),
 }));
 
-vi.mock('@/lib/prisma', () => ({
+mock.module('@/lib/prisma', () => ({
   prisma: {
     user: {
-      findUnique: vi.fn(),
+      findUnique: mock(() => {}),
     },
     event: {
-      findUnique: vi.fn(),
-      findMany: vi.fn(),
+      findUnique: mock(() => {}),
+      findMany: mock(() => {}),
     },
   },
 }));
@@ -61,16 +61,16 @@ const createMockTournament = (id: number, ownerId: string | null): Event => ({
 
 describe('Tournament Permissions', () => {
   beforeEach(() => {
-    vi.clearAllMocks();
+    mock.clearAllMocks();
   });
 
   describe('canManageTournament', () => {
     test('should allow club_admin to manage any tournament', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'admin-1', email: 'admin@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('admin-1', 'admin@example.com', 'club_admin')
       );
 
@@ -79,14 +79,14 @@ describe('Tournament Permissions', () => {
     });
 
     test('should allow tournament_admin to manage their own tournament', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'tour-admin-1', email: 'tour@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
       );
-      vi.mocked(prisma.event.findUnique).mockResolvedValue(
+      prisma.event.findUnique.mockImplementation(async () => 
         createMockTournament(1, 'tour-admin-1')
       );
 
@@ -95,14 +95,14 @@ describe('Tournament Permissions', () => {
     });
 
     test('should deny tournament_admin from managing other users tournaments', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'tour-admin-1', email: 'tour@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
       );
-      vi.mocked(prisma.event.findUnique).mockResolvedValue(
+      prisma.event.findUnique.mockImplementation(async () => 
         createMockTournament(1, 'other-user-1')
       );
 
@@ -112,11 +112,11 @@ describe('Tournament Permissions', () => {
     });
 
     test('should deny player from managing tournaments', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'player-1', email: 'player@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('player-1', 'player@example.com', 'player')
       );
 
@@ -126,7 +126,7 @@ describe('Tournament Permissions', () => {
     });
 
     test('should deny unauthenticated user', async () => {
-      vi.mocked(getSession).mockResolvedValue(null);
+      getSession.mockImplementation(async () => null);
 
       const result = await canManageTournament(999);
       expect(result.allowed).toBe(false);
@@ -136,11 +136,11 @@ describe('Tournament Permissions', () => {
 
   describe('ownsTournament', () => {
     test('should return true if user owns tournament', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'owner-1', email: 'owner@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.event.findUnique).mockResolvedValue(
+      }));
+      prisma.event.findUnique.mockImplementation(async () => 
         createMockTournament(1, 'owner-1')
       );
 
@@ -149,11 +149,11 @@ describe('Tournament Permissions', () => {
     });
 
     test('should return false if user does not own tournament', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'non-owner-1', email: 'nonowner@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.event.findUnique).mockResolvedValue(
+      }));
+      prisma.event.findUnique.mockImplementation(async () => 
         createMockTournament(1, 'owner-1')
       );
 
@@ -165,11 +165,11 @@ describe('Tournament Permissions', () => {
 
   describe('getManageableTournaments', () => {
     test('should return all tournaments for club_admin', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'admin-1', email: 'admin@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('admin-1', 'admin@example.com', 'club_admin')
       );
       
@@ -178,7 +178,7 @@ describe('Tournament Permissions', () => {
         createMockTournament(2, 'user-2'),
         createMockTournament(3, 'user-3'),
       ];
-      vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
+      prisma.event.findMany.mockImplementation(async () => mockTournaments);
 
       const result = await getManageableTournaments();
       expect(result).toEqual(mockTournaments);
@@ -190,11 +190,11 @@ describe('Tournament Permissions', () => {
     });
 
     test('should return only owned tournaments for tournament_admin', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'tour-admin-1', email: 'tour@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
       );
       
@@ -202,7 +202,7 @@ describe('Tournament Permissions', () => {
         createMockTournament(1, 'tour-admin-1'),
         createMockTournament(2, 'tour-admin-1'),
       ];
-      vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
+      prisma.event.findMany.mockImplementation(async () => mockTournaments);
 
       const result = await getManageableTournaments();
       expect(result).toEqual(mockTournaments);
@@ -217,11 +217,11 @@ describe('Tournament Permissions', () => {
     });
 
     test('should return only non-draft tournaments for players', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'player-1', email: 'player@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('player-1', 'player@example.com', 'player')
       );
       
@@ -229,7 +229,7 @@ describe('Tournament Permissions', () => {
         createMockTournament(1, 'user-1'),
         createMockTournament(2, 'user-2'),
       ];
-      vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
+      prisma.event.findMany.mockImplementation(async () => mockTournaments);
 
       const result = await getManageableTournaments();
       expect(result).toEqual(mockTournaments);
@@ -249,14 +249,14 @@ describe('Tournament Permissions', () => {
       // This simulates the scenario where a tournament_admin user
       // clicks "Edit" on a tournament they own
       
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'tour-admin-1', email: 'tour@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
       );
-      vi.mocked(prisma.event.findUnique).mockResolvedValue(
+      prisma.event.findUnique.mockImplementation(async () => 
         createMockTournament(1, 'tour-admin-1')
       );
 
@@ -271,11 +271,11 @@ describe('Tournament Permissions', () => {
     test('club_admin should still be able to manage any tournament', async () => {
       // This ensures we didn't break the existing club_admin functionality
       
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'club-admin-1', email: 'club@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('club-admin-1', 'club@example.com', 'club_admin')
       );
 
@@ -286,11 +286,11 @@ describe('Tournament Permissions', () => {
     test('players should still be denied from managing tournaments', async () => {
       // This ensures we didn't accidentally grant players access
       
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'player-1', email: 'player@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+      }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('player-1', 'player@example.com', 'player')
       );
 

src/__tests__/unit/tournament-update.test.ts

@@ -3,23 +3,23 @@
  * Tests the allowTies field is properly saved when updating tournaments
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { describe, it, expect, mock, beforeEach } from 'bun:test';
 import { prisma } from '@/lib/prisma';
 
 // Mock the prisma client
-vi.mock('@/lib/prisma', () => ({
+mock.module('@/lib/prisma', () => ({
   prisma: {
     event: {
-      findUnique: vi.fn(),
-      update: vi.fn(),
+      findUnique: mock(() => {}),
+      update: mock(() => {}),
     },
   },
 }));
 
 // Mock the permissions module
-vi.mock('@/lib/permissions', () => ({
-  canManageTournament: vi.fn().mockResolvedValue({ allowed: true }),
-  canDeleteTournament: vi.fn().mockResolvedValue({ allowed: true }),
+mock.module('@/lib/permissions', () => ({
+  canManageTournament: mock(() => {}).mockResolvedValue({ allowed: true }),
+  canDeleteTournament: mock(() => {}).mockResolvedValue({ allowed: true }),
 }));
 
 // Import the route handler after mocking
@@ -27,12 +27,12 @@ import { PUT } from '@/app/api/tournaments/[id]/route';
 
 describe('Tournament Update API', () => {
   beforeEach(() => {
-    vi.clearAllMocks();
+    mock.clearAllMocks();
   });
 
   it('should update allowTies field when provided', async () => {
     // Mock existing tournament
-    vi.mocked(prisma.event.findUnique).mockResolvedValue({
+    prisma.event.findUnique.mockImplementation(async () => ({
       id: 1,
       name: 'Test Tournament',
       allowTies: false,
@@ -46,10 +46,10 @@ describe('Tournament Update API', () => {
       ownerId: null,
       createdAt: new Date(),
       updatedAt: new Date(),
-    } as any);
+      } as any));
 
     // Mock successful update
-    vi.mocked(prisma.event.update).mockResolvedValue({
+    prisma.event.update.mockImplementation(async () => ({
       id: 1,
       name: 'Test Tournament',
       allowTies: true,
@@ -63,7 +63,7 @@ describe('Tournament Update API', () => {
       ownerId: null,
       createdAt: new Date(),
       updatedAt: new Date(),
-    } as any);
+      } as any));
 
     const request = new Request('http://localhost/api/tournaments/1', {
       method: 'PUT',
@@ -78,7 +78,7 @@ describe('Tournament Update API', () => {
     const response = await PUT(request, { params });
 
     expect(response.status).toBe(200);
-    expect(vi.mocked(prisma.event.update)).toHaveBeenCalledWith(
+    expect(prisma.event.update).toHaveBeenCalledWith(
       expect.objectContaining({
         data: expect.objectContaining({
           allowTies: true,
@@ -89,7 +89,7 @@ describe('Tournament Update API', () => {
 
   it('should default allowTies to false when not provided', async () => {
     // Mock existing tournament
-    vi.mocked(prisma.event.findUnique).mockResolvedValue({
+    prisma.event.findUnique.mockImplementation(async () => ({
       id: 1,
       name: 'Test Tournament',
       allowTies: true,
@@ -103,10 +103,10 @@ describe('Tournament Update API', () => {
       ownerId: null,
       createdAt: new Date(),
       updatedAt: new Date(),
-    } as any);
+      } as any));
 
     // Mock successful update
-    vi.mocked(prisma.event.update).mockResolvedValue({
+    prisma.event.update.mockImplementation(async () => ({
       id: 1,
       name: 'Test Tournament',
       allowTies: false,
@@ -120,7 +120,7 @@ describe('Tournament Update API', () => {
       ownerId: null,
       createdAt: new Date(),
       updatedAt: new Date(),
-    } as any);
+      } as any));
 
     const request = new Request('http://localhost/api/tournaments/1', {
       method: 'PUT',
@@ -135,7 +135,7 @@ describe('Tournament Update API', () => {
     const response = await PUT(request, { params });
 
     expect(response.status).toBe(200);
-    expect(vi.mocked(prisma.event.update)).toHaveBeenCalledWith(
+    expect(prisma.event.update).toHaveBeenCalledWith(
       expect.objectContaining({
         data: expect.objectContaining({
           allowTies: false, // Should default to false
@@ -146,7 +146,7 @@ describe('Tournament Update API', () => {
 
   it('should preserve allowTies value when updating other fields', async () => {
     // Mock existing tournament with allowTies = true
-    vi.mocked(prisma.event.findUnique).mockResolvedValue({
+    prisma.event.findUnique.mockImplementation(async () => ({
       id: 1,
       name: 'Test Tournament',
       allowTies: true,
@@ -160,10 +160,10 @@ describe('Tournament Update API', () => {
       ownerId: null,
       createdAt: new Date(),
       updatedAt: new Date(),
-    } as any);
+      } as any));
 
     // Mock successful update
-    vi.mocked(prisma.event.update).mockResolvedValue({
+    prisma.event.update.mockImplementation(async () => ({
       id: 1,
       name: 'Updated Tournament Name',
       allowTies: true,
@@ -177,7 +177,7 @@ describe('Tournament Update API', () => {
       ownerId: null,
       createdAt: new Date(),
       updatedAt: new Date(),
-    } as any);
+      } as any));
 
     const request = new Request('http://localhost/api/tournaments/1', {
       method: 'PUT',
@@ -192,7 +192,7 @@ describe('Tournament Update API', () => {
     const response = await PUT(request, { params });
 
     expect(response.status).toBe(200);
-    const updateCall = vi.mocked(prisma.event.update).mock.calls[0][0];
+    const updateCall = prisma.event.update.mock.calls[0][0];
     expect(updateCall.data.allowTies).toBe(true);
     expect(updateCall.data.name).toBe('Updated Tournament Name');
     expect(updateCall.data.targetScore).toBe(10);

src/__tests__/unit/user-management.test.ts

@@ -4,25 +4,25 @@
  * Tests for user name editing and profile management
  */
 
-import { describe, test, expect, vi, beforeEach } from 'vitest';
+import { describe, test, expect, mock, beforeEach } from 'bun:test';
 import { hasRole } from '@/lib/permissions';
 import { getSession } from '@/lib/auth-simple';
 import { prisma } from '@/lib/prisma';
 import type { User, Player } from '@prisma/client';
 
 // Mock the getSession and prisma functions
-vi.mock('@/lib/auth-simple', () => ({
-  getSession: vi.fn(),
+mock.module('@/lib/auth-simple', () => ({
+  getSession: mock(() => {}),
 }));
 
-vi.mock('@/lib/prisma', () => ({
+mock.module('@/lib/prisma', () => ({
   prisma: {
     user: {
-      findUnique: vi.fn(),
-      update: vi.fn(),
+      findUnique: mock(() => {}),
+      update: mock(() => {}),
     },
     player: {
-      findUnique: vi.fn(),
+      findUnique: mock(() => {}),
     },
   },
 }));
@@ -56,16 +56,16 @@ const createMockPlayer = (id: number, name: string): Player => ({
 
 describe('User Management', () => {
   beforeEach(() => {
-    vi.clearAllMocks();
+    mock.clearAllMocks();
   });
 
   describe('User Name Editing', () => {
     test('club_admin should be able to edit any user name', async () => {
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'admin-1', email: 'admin@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+        }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('admin-1', 'admin@example.com', 'club_admin')
       );
 
@@ -74,11 +74,11 @@ describe('User Management', () => {
     });
 
     test('tournament_admin should NOT be able to edit user names', async () => {
-      vi.mocked(getSession).mockResolvedValue({
-        user: { id: 'tour-admin-1', email: 'tour@example.com' },
+      getSession.mockImplementation(async () => ({
+        user: { id: 'admin-1', email: 'admin@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+        }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
       );
 
@@ -87,11 +87,11 @@ describe('User Management', () => {
     });
 
     test('player should NOT be able to edit user names', async () => {
-      vi.mocked(getSession).mockResolvedValue({
-        user: { id: 'player-1', email: 'player@example.com' },
+      getSession.mockImplementation(async () => ({
+        user: { id: 'admin-1', email: 'admin@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(
+        }));
+      prisma.user.findUnique.mockImplementation(async () => 
         createMockUser('player-1', 'player@example.com', 'player')
       );
 
@@ -100,7 +100,7 @@ describe('User Management', () => {
     });
 
     test('unauthenticated user should NOT be able to edit user names', async () => {
-      vi.mocked(getSession).mockResolvedValue(null);
+      getSession.mockImplementation(async () => null);
 
       const result = await hasRole('club_admin');
       expect(result.allowed).toBe(false);
@@ -111,11 +111,11 @@ describe('User Management', () => {
     test('user should be able to view their own profile', async () => {
       const mockUser = createMockUser('user-1', 'user@example.com', 'player');
       
-      vi.mocked(getSession).mockResolvedValue({
-        user: { id: 'user-1', email: 'user@example.com' },
+      getSession.mockImplementation(async () => ({
+        user: { id: 'admin-1', email: 'admin@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(mockUser);
+        }));
+      prisma.user.findUnique.mockImplementation(async () => mockUser);
 
       // In the actual implementation, this would check if session.user.id === params.id
       const canViewOwnProfile = true; // This logic is in the API route
@@ -126,11 +126,11 @@ describe('User Management', () => {
       const mockAdmin = createMockUser('admin-1', 'admin@example.com', 'club_admin');
       const mockUser = createMockUser('user-1', 'user@example.com', 'player');
       
-      vi.mocked(getSession).mockResolvedValue({
+      getSession.mockImplementation(async () => ({
         user: { id: 'admin-1', email: 'admin@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique)
+        }));
+      (prisma.user.findUnique)
         .mockResolvedValueOnce(mockAdmin) // For the requesting user
         .mockResolvedValueOnce(mockUser); // For the target user
 
@@ -142,11 +142,11 @@ describe('User Management', () => {
     test('non-admin should NOT be able to view other user profiles', async () => {
       const mockUser = createMockUser('user-1', 'user@example.com', 'player');
       
-      vi.mocked(getSession).mockResolvedValue({
-        user: { id: 'user-1', email: 'user@example.com' },
+      getSession.mockImplementation(async () => ({
+        user: { id: 'admin-1', email: 'admin@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(mockUser);
+        }));
+      prisma.user.findUnique.mockImplementation(async () => mockUser);
 
       // In the actual implementation, this would check if session.user.id === params.id
       const canViewOtherProfile = false; // This logic is in the API route
@@ -159,11 +159,11 @@ describe('User Management', () => {
       const mockUser = createMockUser('user-1', 'user@example.com', 'club_admin');
       const mockPlayer = createMockPlayer(1, 'Old Name');
       
-      vi.mocked(getSession).mockResolvedValue({
-        user: { id: 'user-1', email: 'user@example.com' },
+      getSession.mockImplementation(async () => ({
+        user: { id: 'admin-1', email: 'admin@example.com' },
         session: { token: 'test', expiresAt: new Date() }
-      });
-      vi.mocked(prisma.user.findUnique).mockResolvedValue(mockUser);
+        }));
+      prisma.user.findUnique.mockImplementation(async () => mockUser);
       
       const updatedUser = {
         ...mockUser,
@@ -171,7 +171,7 @@ describe('User Management', () => {
         player: { ...mockPlayer, name: 'New Name', normalizedName: 'new name' }
       };
       
-      vi.mocked(prisma.user.update).mockResolvedValue(updatedUser);
+      prisma.user.update.mockImplementation(async () => updatedUser);
 
       // The API route should update both user.name and player.name
       expect(updatedUser.name).toBe('New Name');