david/euchre_camp
Public Access
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

feat/bun-transition #21

Merged
david merged 24 commits from feat/bun-transition into main 2026-04-02 04:51:20 +00:00
Conversation 1 Commits 24 Files Changed 50
+2192 -379
50 changed files with 2192 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development.example
+15
View File
@@ -0,0 +1,15 @@
# Development environment configuration for EuchreCamp
# Copy this file to .env.development and fill in your values
# Database Configuration
DATABASE_PROVIDER=postgresql
# Development database URL - must contain "_dev" to pass safety checks
DATABASE_URL="postgresql://euchre_camp:password@localhost:5432/euchre_camp_dev"
# Authentication
BETTER_AUTH_SECRET="your-secret-key-change-this"
BETTER_AUTH_URL="http://localhost:3000"
# Application Configuration
NODE_ENV=development
TRUSTED_ORIGINS="http://localhost:3000,http://127.0.0.1:3000"
.env.example
+54
View File
@@ -0,0 +1,54 @@
# EuchreCamp Environment Configuration
# Copy this file to .env and fill in your values
# ============================================
# Database Configuration
# ============================================
# PostgreSQL connection string
# Format: postgresql://username:password@host:port/database
DATABASE_URL=postgresql://euchre:euchrepassword@localhost:5432/euchre_camp
# Shadow database for Prisma migrations (optional for PostgreSQL)
DATABASE_SHADOW_URL=postgresql://euchre:euchrepassword@localhost:5432/euchre_camp_shadow
# Database provider (postgresql, mysql, sqlite, etc.)
DATABASE_PROVIDER=postgresql
# ============================================
# Better Auth Configuration
# ============================================
# Secret key for session encryption (generate a strong random string)
# Run: openssl rand -base64 32
BETTER_AUTH_SECRET=your-secret-key-change-in-production
# Base URL for authentication callbacks
# For production: https://your-domain.com
BETTER_AUTH_URL=http://localhost:3000
# ============================================
# Application Configuration
# ============================================
# Environment: development, production, test
NODE_ENV=production
# Trusted origins for CORS and authentication
# Add your domain(s) for production
TRUSTED_ORIGINS=http://localhost:3000,http://127.0.0.1:3000
# ============================================
# Optional: External Services
# ============================================
# If using external database (e.g., Supabase, Railway)
# DATABASE_URL=postgresql://user:pass@host:port/db
# If using external auth provider
# BETTER_AUTH_URL=https://your-app.com
# ============================================
# CasaOS Deployment Notes
# ============================================
# When deploying to CasaOS, set these via the UI:
# 1. DATABASE_URL: Your PostgreSQL connection string
# 2. BETTER_AUTH_SECRET: Generate with: openssl rand -base64 32
# 3. BETTER_AUTH_URL: Your app's public URL
# 4. TRUSTED_ORIGINS: Your app's public URL(s)
.eslintrc.json
+11 -1
View File
@@ -1,5 +1,15 @@
{
"extends": ["next/core-web-vitals", "next/typescript"],
"env": {
"browser": true,
"es2021": true,
"node": true
},
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["@typescript-eslint"],
"ignorePatterns": [
".next",
"out",
.gitea/workflows/build-ci-images.yml
+71
View File
@@ -0,0 +1,71 @@
name: Build CI Images
on:
push:
branches:
- main
paths:
- 'Dockerfile.ci-base'
- 'package.json'
- 'bun.lockb'
- '.gitea/workflows/build-ci-images.yml'
schedule:
# Weekly rebuild to get latest Playwright/Bun versions
- cron: '0 2 * * 0' # Every Sunday at 2 AM
workflow_dispatch: # Manual trigger
env:
REGISTRY: docker.notsosm.art
IMAGE_NAME: euchre-camp
jobs:
build-ci-base:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to Registry
run: |
echo "${{ secrets.DOCKER_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u ${{ secrets.DOCKER_LOGIN }} --password-stdin
- name: Extract metadata for CI base image
id: meta
run: |
# Get Playwright version from package.json
PLAYWRIGHT_VERSION=$(grep -o '"@playwright/test": "[^"]*"' package.json | cut -d'"' -f4)
echo "playwright_version=${PLAYWRIGHT_VERSION}" >> $GITHUB_OUTPUT
# Get Bun version (latest)
BUN_VERSION=$(bun --version 2>/dev/null || echo "latest")
echo "bun_version=${BUN_VERSION}" >> $GITHUB_OUTPUT
# Set tags
echo "tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:playwright-${PLAYWRIGHT_VERSION},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:${{ github.sha }}" >> $GITHUB_OUTPUT
- name: Build and push CI base image
run: |
# Build with multiple tags
docker build \
--file Dockerfile.ci-base \
--tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:latest \
--tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:playwright-${{ steps.meta.outputs.playwright_version }} \
--tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:${{ github.sha }} \
.
# Push all tags
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:latest
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:playwright-${{ steps.meta.outputs.playwright_version }}
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:${{ github.sha }}
- name: Clean up
if: always()
run: |
docker logout ${{ env.REGISTRY }}
.gitea/workflows/pr.yml
+6 -42
View File
@@ -9,7 +9,7 @@ jobs:
unit-tests:
runs-on: ubuntu-latest
container:
image: node:20-alpine
image: docker.notsosm.art/euchre-camp/ci-base:latest
options: --user root
steps:
@@ -17,55 +17,19 @@ jobs:
uses: actions/checkout@v4
- name: Install dependencies
run: npm ci
- name: Run unit tests
run: npm run test:run
acceptance-tests:
runs-on: ubuntu-latest
needs: unit-tests
container:
image: mcr.microsoft.com/playwright:v1.58.0-jammy
options: --user root
env:
DATABASE_PROVIDER: sqlite
DATABASE_URL: file:./prisma/ci.db
BETTER_AUTH_SECRET: test-secret-key-for-ci-only
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
- name: Install dependencies
run: npm ci
run: bun install
- name: Generate Prisma client
run: npx prisma generate
run: bun x prisma generate
env:
DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
- name: Setup SQLite database
run: |
# Create SQLite database file
mkdir -p prisma
npx prisma migrate deploy
- name: Run acceptance tests
run: npm run test:acceptance
env:
DATABASE_PROVIDER: sqlite
DATABASE_URL: file:./prisma/ci.db
BETTER_AUTH_SECRET: test-secret-key-for-ci-only
- name: Run unit tests
run: bun test src/__tests__/unit/ src/__tests__/*.test.tsx src/__tests__/auth-simple.test.ts
analyze-bump-type:
runs-on: ubuntu-latest
needs: acceptance-tests
needs: unit-tests
steps:
- name: Checkout code
.gitea/workflows/release.yml
+30 -9
View File
@@ -14,6 +14,9 @@ jobs:
runs-on: ubuntu-latest
# Skip if this is an auto-generated version bump commit
if: "!contains(github.event.head_commit.message, 'chore: bump version')"
container:
image: docker.notsosm.art/euchre-camp/ci-base:latest
options: --user root
steps:
- name: Checkout code
@@ -70,10 +73,10 @@ jobs:
echo "Bumping version: $BUMP"
# Run the bump script
node scripts/bump-version.js "$BUMP" --yes
bun run scripts/bump-version.js "$BUMP" --yes
# Get new version
NEW_VERSION=$(node -p "require('./package.json').version")
NEW_VERSION=$(bun -e "console.log(require('./package.json').version)")
echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
echo "New version: $NEW_VERSION"
@@ -104,10 +107,6 @@ jobs:
git push origin "$TAG_NAME"
fi
- name: Set up Docker Buildx
if: steps.commit.outputs.committed == 'true'
uses: docker/setup-buildx-action@v3
- name: Build test-capable image
if: steps.commit.outputs.committed == 'true'
run: |
@@ -123,7 +122,7 @@ jobs:
docker run --rm \
-e DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" \
${{ env.IMAGE_NAME }}-test:${{ steps.version.outputs.new_version }} \
npm run test:run
bun test 'src/__tests__/unit/**' 'src/__tests__/*.test.tsx' 'src/__tests__/auth-simple.test.ts'
- name: Build production image
if: steps.commit.outputs.committed == 'true'
@@ -160,8 +159,30 @@ jobs:
echo " docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
fi
- name: Deploy to dev (placeholder)
- name: Deploy to dev environment
if: steps.commit.outputs.committed == 'true'
run: |
echo "Deploying version ${{ steps.version.outputs.new_version }} to dev environment..."
# TODO: Add actual deployment steps
# Update docker-compose.yml with new image tag using full registry path
# The registry is docker.notsosm.art and image is euchre-camp
IMAGE_TAG="${{ steps.version.outputs.new_version }}"
sed -i "s|image: docker.notsosm.art/euchre-camp:[0-9.]*|image: docker.notsosm.art/euchre-camp:${IMAGE_TAG}|" docker-compose.yml
# Pull and restart the dev container
cd /home/euchre_camp
docker-compose pull app
docker-compose up -d app
# Wait for container to be healthy
echo "Waiting for container to start..."
sleep 10
# Check if container is running
if docker ps --filter "name=euchre-camp-app" --format "{{.Status}}" | grep -q "Up"; then
echo "✅ Dev environment successfully deployed with version ${{ steps.version.outputs.new_version }}"
else
echo "❌ Dev environment deployment failed"
docker-compose logs app
exit 1
fi
.gitea/workflows/test.yml
-25
View File
@@ -1,25 +0,0 @@
name: Test
on:
push:
branches:
- '**'
jobs:
unit-tests:
runs-on: ubuntu-latest
container:
image: node:20-alpine
options: --user root
# Skip if this is an auto-generated version bump commit (handled by release workflow)
if: "!contains(github.event.head_commit.message, 'chore: bump version')"
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Install dependencies
run: npm ci
- name: Run unit tests
run: npm run test:run
.gitignore
+8 -1
View File
@@ -34,7 +34,14 @@ yarn-error.log*
.pnpm-debug.log*
# env files (can opt-in for committing if needed)
.env*
.env
.env.local
.env.development.local
.env.test.local
.env.production.local
# Allow example env files to be tracked
!.env.example
!.env.development.example
# vercel
.vercel
AGENTS.md
+46 -3
View File
@@ -9,11 +9,12 @@ EuchreCamp is a Next.js 14+ application for managing Euchre tournaments and trac
### Key Technologies
- **Next.js 14+** (App Router)
- **TypeScript**
- **Prisma ORM** (SQLite)
- **Prisma ORM** (SQLite/PostgreSQL)
- **Tailwind CSS**
- **Better Auth** (Authentication)
- **Vitest** (Unit Testing)
- **Bun** (Package Manager & Test Runner)
- **Playwright** (Acceptance Testing)
- **Vitest** (Legacy - migrated to Bun test runner)
## Architecture Patterns
@@ -37,13 +38,55 @@ EuchreCamp is a Next.js 14+ application for managing Euchre tournaments and trac
## Common Tasks
### Package Manager: Bun
This project uses **Bun** as the package manager and test runner:
```bash
# Install dependencies
bun install
# Run development server
bun run dev
# Build the application
bun run build
# Run unit/component tests
bun test
# Run unit tests only
bun run test:unit
# Run component tests only
bun run test:component
# Run acceptance tests (Playwright)
bun run test:acceptance
# Run linting
bun run lint
```
**Note**: E2E tests still use Playwright, as Bun's test runner doesn't support browser automation. Unit and component tests have been migrated to Bun's native test runner for faster execution. E2E tests are located in the `e2e/` directory (not `src/__tests__/e2e/`).
### CI/CD with Bun
All CI/CD workflows have been updated to use Bun:
- **Dockerfile**: Uses `oven/bun:alpine` base image for all stages
- **PR Workflow**: Uses `oven/setup-bun` action and `bun install`, `bun test`
- **Release Workflow**: Uses Bun for version bumping and Docker builds
**Note**: The `test.yml` workflow has been removed as it's redundant with the PR workflow.
### Admin User Creation
To create an admin user, use the provided scripts:
**Option 1: Using Better Auth API (Recommended)**
```bash
node scripts/create-admin-via-api.js
bun run scripts/create-admin-via-api.js
```
This creates the admin user `david@dhg.lol` with password `adminadmin` using Better Auth's internal API.
Dockerfile
+13 -13
View File
@@ -1,9 +1,9 @@
# Multi-stage build for EuchreCamp Next.js application
# Stage 1: Builder
FROM node:20-alpine AS builder
FROM oven/bun:alpine AS builder
# Install dependencies
# Install dependencies (needed for native modules)
RUN apk add --no-cache python3 make g++
# Set working directory
@@ -13,21 +13,21 @@ WORKDIR /app
COPY package*.json ./
# Install dependencies (including dev dependencies for building)
RUN npm ci
RUN bun install
# Copy source code
COPY . .
# Generate Prisma client (with dummy PostgreSQL DATABASE_URL for build-time generation)
# Note: A dummy URL is used since the real database is not available during build
RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" npx prisma generate
RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" bun x prisma generate
# Build the application (with dummy DATABASE_URL for static page generation and git commit)
ARG GIT_COMMIT=unknown
RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" NEXT_PUBLIC_GIT_COMMIT=$GIT_COMMIT npm run build
RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" NEXT_PUBLIC_GIT_COMMIT=$GIT_COMMIT bun run build
# Stage 2: Test runner (includes dev dependencies for testing)
FROM node:20-alpine AS test-runner
FROM oven/bun:alpine AS test-runner
# Install dependencies
RUN apk add --no-cache python3 make g++ git
@@ -39,16 +39,16 @@ WORKDIR /app
COPY package*.json ./
# Install ALL dependencies (including dev dependencies for testing)
RUN npm ci
RUN bun install
# Copy source code
COPY . .
# Generate Prisma client
RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" npx prisma generate
RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" bun x prisma generate
# Stage 3: Production runner
FROM node:20-alpine AS runner
FROM oven/bun:alpine AS runner
# Install dumb-init for proper signal handling
RUN apk add --no-cache dumb-init
@@ -64,15 +64,15 @@ WORKDIR /app
COPY --from=builder --chown=euchre:euchre /app/.next ./.next
COPY --from=builder --chown=euchre:euchre /app/public ./public
COPY --from=builder --chown=euchre:euchre /app/package.json ./package.json
COPY --from=builder --chown=euchre:euchre /app/package-lock.json ./package-lock.json
COPY --from=builder --chown=euchre:euchre /app/bun.lockb ./bun.lockb
COPY --from=builder --chown=euchre:euchre /app/prisma ./prisma
# Install only production dependencies
RUN npm ci --omit=dev
RUN bun install --production
# Generate Prisma client
# Note: We need to set DATABASE_URL even for generation because prisma.config.ts requires it
RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" npx prisma generate
RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" bun x prisma generate
# Switch to non-root user
USER euchre
@@ -86,4 +86,4 @@ HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
# Start command
ENTRYPOINT ["dumb-init", "--"]
CMD ["npm", "start"]
CMD ["bun", "run", "start"]
Dockerfile.ci-base
+32
View File
@@ -0,0 +1,32 @@
# Base CI image with Bun, Node.js, Playwright, and build tools
# Used for Gitea Actions CI workflows
# Uses Microsoft Playwright image as base (Ubuntu-based) with Bun added
FROM mcr.microsoft.com/playwright:v1.58.0-jammy AS base
# Install unzip (required for Bun installation) and other tools
RUN apt-get update && apt-get install -y unzip && rm -rf /var/lib/apt/lists/*
# Install Bun (latest version)
# Note: The playwright image already has Node.js pre-installed
RUN curl -fsSL https://bun.sh/install | bash
# Add Bun to PATH for subsequent commands
ENV PATH="/root/.bun/bin:$PATH"
# Verify installations
RUN echo "=== Bun Version ===" && bun --version && \
echo "=== Node.js Version ===" && node --version && \
echo "=== Playwright Version ===" && bun x playwright --version
WORKDIR /app
# Set default environment variables
ENV DATABASE_PROVIDER=sqlite
ENV DATABASE_URL=file:./prisma/ci.db
ENV BETTER_AUTH_SECRET=test-secret-key-for-ci-only
ENV NODE_ENV=test
# Health check command (can be overridden)
HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
CMD bun --version
bun.lock
+1455
View File
File diff suppressed because it is too large Load Diff
bunfig.toml
+4
View File
@@ -0,0 +1,4 @@
[test]
preload = ["./src/__tests__/bun-setup.ts"]
exclude = ["e2e/**", "**/e2e/**"]
# isolation = true
docker-compose.yml
+1 -1
View File
@@ -3,7 +3,7 @@
services:
app:
image: euchre-camp/euchre-camp:0.1.0.dev
image: docker.notsosm.art/euchre-camp:0.1.0.dev
container_name: euchre-camp-app
ports:
- "3000:3000"
docs/TODO.md
+17
View File
@@ -30,6 +30,23 @@
- [ ] Update MatchEditor to use tournament-specific target score
- [ ] Run tests and verify variant scoring implementation
### Recently Completed ✅
- [x] Update CI/CD workflows to use Bun (PR, release)
- [x] Update Dockerfile to use Bun Alpine image
- [x] Update PR workflow to use Bun
- [x] Update Release workflow to use Bun
- [x] Remove test.yml workflow (redundant)
- [x] Verify Docker build with Bun
### Recently Completed ✅
- [x] Fix Prisma build error in CI pipeline (Docker build failure due to missing DATABASE_URL validation)
- [x] Add defensive checks to src/lib/prisma.ts to prevent build failures
- [x] Migrate from npm to Bun package manager
- [x] Migrate unit tests (Vitest → Bun test runner)
- [x] Migrate component tests (Vitest → Bun test runner)
- [x] Configure Bun with DOM environment for React Testing Library
- [x] Keep Playwright for E2E tests (hybrid approach)
### Recently Completed ✅
- [x] Add OpenSkill rating system support (src/lib/openskill-utils.ts)
- [x] Add Glicko2 rating system support (src/lib/glicko2-utils.ts)
src/__tests__/e2e/account-acceptance-api.test.ts → e2e/account-acceptance-api.test.ts
View File
src/__tests__/e2e/account-acceptance.test.ts → e2e/account-acceptance.test.ts
View File
src/__tests__/e2e/admin-features.test.ts → e2e/admin-features.test.ts
View File
src/__tests__/e2e/csv-upload-deduplication.test.ts → e2e/csv-upload-deduplication.test.ts
+3 -3
View File
@@ -79,7 +79,7 @@ test.describe('CSV Upload Player Deduplication', () => {
formData.append('eventId', testTournamentId.toString());
const response = await request.post('http://localhost:3000/api/matches/upload', {
data: formData,
multipart: formData,
});
expect(response.ok()).toBeTruthy();
@@ -133,7 +133,7 @@ test.describe('CSV Upload Player Deduplication', () => {
formData.append('eventId', testTournamentId.toString());
const response = await request.post('http://localhost:3000/api/matches/upload', {
data: formData,
multipart: formData,
});
expect(response.ok()).toBeTruthy();
@@ -190,7 +190,7 @@ test.describe('CSV Upload Player Deduplication', () => {
formData.append('eventId', testTournamentId.toString());
const response = await request.post('http://localhost:3000/api/matches/upload', {
data: formData,
multipart: formData,
});
expect(response.ok()).toBeTruthy();
src/__tests__/e2e/elo-ratings.test.ts → e2e/elo-ratings.test.ts
View File
src/__tests__/e2e/epic1-auth-logout.test.ts → e2e/epic1-auth-logout.test.ts
View File
src/__tests__/e2e/epic1-auth-password-reset.test.ts → e2e/epic1-auth-password-reset.test.ts
View File
src/__tests__/e2e/epic1-auth-registration.test.ts → e2e/epic1-auth-registration.test.ts
View File
src/__tests__/e2e/epic3-rankings.test.ts → e2e/epic3-rankings.test.ts
View File
src/__tests__/e2e/epic4-tournament-creation.test.ts → e2e/epic4-tournament-creation.test.ts
View File
src/__tests__/e2e/global.setup.ts → e2e/global.setup.ts
View File
src/__tests__/e2e/home-page.test.ts → e2e/home-page.test.ts
View File
src/__tests__/e2e/smoke-test.test.ts → e2e/smoke-test.test.ts
View File
src/__tests__/e2e/tournament-admin-permissions.test.ts → e2e/tournament-admin-permissions.test.ts
View File
src/__tests__/e2e/tournament-edit-allowTies.test.ts → e2e/tournament-edit-allowTies.test.ts
+3 -3
View File
@@ -41,7 +41,7 @@ test.describe('Tournament Edit - allowTies functionality', () => {
}
});
test('should display allowTies checkbox on edit form', async ({ page }) => {
test('should display allowTies checkbox on edit form @chromium-admin', async ({ page }) => {
// Navigate to tournament edit page
await page.goto(`/admin/tournaments/${tournamentId}/edit`);
@@ -54,7 +54,7 @@ test.describe('Tournament Edit - allowTies functionality', () => {
await expect(allowTiesCheckbox).not.toBeChecked();
});
test('should save allowTies when toggled to true', async ({ page }) => {
test('should save allowTies when toggled to true @chromium-admin', async ({ page }) => {
// Navigate to tournament edit page
await page.goto(`/admin/tournaments/${tournamentId}/edit`);
@@ -80,7 +80,7 @@ test.describe('Tournament Edit - allowTies functionality', () => {
expect(updatedTournament?.allowTies).toBe(true);
});
test('should save allowTies when toggled to false', async ({ page }) => {
test('should save allowTies when toggled to false @chromium-admin', async ({ page }) => {
// First, set allowTies to true
await prisma.event.update({
where: { id: tournamentId },
mise.toml
+1
View File
@@ -1,4 +1,5 @@
[tools]
bun = "latest"
docker-compose = "latest"
just = "latest"
node = "latest"
package.json
+29 -23
View File
@@ -6,33 +6,37 @@
"dev": "NEXT_PUBLIC_GIT_COMMIT=$(git rev-parse --short HEAD) next dev",
"build": "next build",
"start": "next start",
"lint": "eslint",
"test": "vitest",
"test:run": "vitest run",
"test:acceptance": "playwright test src/__tests__/e2e/",
"test:acceptance:headed": "playwright test src/__tests__/e2e/ --headed",
"db:switch": "node scripts/switch-database.js",
"db:setup-postgres": "node scripts/setup-postgres.js",
"db:setup-dev": "node scripts/setup-postgres.js",
"db:setup-dev:clean": "node scripts/setup-postgres.js --drop",
"db:reset-dev": "node scripts/reset-dev-db.js",
"db:use-dev": "node scripts/use-dev-db.js",
"db:cleanup-prod": "node scripts/cleanup-prod-db.js",
"db:check-prod": "node scripts/check-test-records.js",
"db:seed": "node scripts/seed.js",
"lint": "bun run eslint",
"test": "bun test 'src/__tests__/unit/**' 'src/__tests__/*.test.tsx' 'src/__tests__/auth-simple.test.ts'",
"test:unit": "bun test src/__tests__/unit/",
"test:component": "bun test src/__tests__/*.test.tsx",
"test:run": "bun test 'src/__tests__/unit/**' 'src/__tests__/*.test.tsx' 'src/__tests__/auth-simple.test.ts'",
"test:randomize": "bun test src/__tests__/unit/ --randomize",
"test:unit:sequential": "bun test src/__tests__/unit/ --max-concurrency=1",
"test:acceptance": "bun x playwright test e2e/",
"test:acceptance:headed": "bun x playwright test e2e/ --headed",
"db:switch": "bun run scripts/switch-database.js",
"db:setup-postgres": "bun run scripts/setup-postgres.js",
"db:setup-dev": "bun run scripts/setup-postgres.js",
"db:setup-dev:clean": "bun run scripts/setup-postgres.js --drop",
"db:reset-dev": "bun run scripts/reset-dev-db.js",
"db:use-dev": "bun run scripts/use-dev-db.js",
"db:cleanup-prod": "bun run scripts/cleanup-prod-db.js",
"db:check-prod": "bun run scripts/check-test-records.js",
"db:seed": "bun run scripts/seed.js",
"docker:up": "docker-compose up -d",
"docker:down": "docker-compose down",
"docker:logs": "docker-compose logs -f",
"docker:build": "docker-compose build",
"docker:shell": "docker exec -it euchre-camp-app sh",
"version": "node scripts/bump-version.js",
"set-version": "node scripts/set-version.js",
"version:patch": "node scripts/bump-version.js patch",
"version:minor": "node scripts/bump-version.js minor",
"version:major": "node scripts/bump-version.js major",
"docker:build:push": "node scripts/build-and-push-docker.js",
"docker:compose:generate": "node scripts/generate-docker-compose.js",
"release": "npm run version:patch && npm run docker:compose:generate && npm run docker:build:push"
"version": "bun run scripts/bump-version.js",
"set-version": "bun run scripts/set-version.js",
"version:patch": "bun run scripts/bump-version.js patch",
"version:minor": "bun run scripts/bump-version.js minor",
"version:major": "bun run scripts/bump-version.js major",
"docker:build:push": "bun run scripts/build-and-push-docker.js",
"docker:compose:generate": "bun run scripts/generate-docker-compose.js",
"release": "bun run version:patch && bun run docker:compose:generate && bun run docker:build:push"
},
"dependencies": {
"@hookform/resolvers": "^5.2.2",
@@ -61,6 +65,8 @@
"@testing-library/react": "^16.3.2",
"@testing-library/user-event": "^14.6.1",
"@types/bcrypt": "^6.0.0",
"@types/bun": "^1.3.11",
"@types/jsdom": "^28.0.1",
"@types/node": "^20",
"@types/papaparse": "^5.5.2",
"@types/pg": "^8.20.0",
@@ -68,7 +74,7 @@
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "^6.0.1",
"argon2": "^0.44.0",
"eslint": "^10.1.0",
"eslint": "^8.57.0",
"eslint-config-next": "^16.2.1",
"jsdom": "^29.0.1",
"tailwindcss": "^4",
playwright.config.ts
+2 -2
View File
@@ -1,7 +1,7 @@
import { defineConfig, devices } from '@playwright/test';
export default defineConfig({
testDir: './src/__tests__/e2e',
testDir: './e2e',
timeout: 30000,
expect: {
timeout: 5000
@@ -17,7 +17,7 @@ export default defineConfig({
// Reporter to use
reporter: 'html',
// Global setup and teardown
globalSetup: require.resolve('./src/__tests__/e2e/global.setup'),
globalSetup: require.resolve('./e2e/global.setup'),
// Use base URL for relative navigation
use: {
baseURL: 'http://localhost:3000',
scripts/generate-docker-compose.js
+1 -1
View File
@@ -12,7 +12,7 @@ const path = require('path');
const { execSync } = require('child_process');
// Configuration
const REGISTRY = 'euchre-camp';
const REGISTRY = 'docker.notsosm.art';
const IMAGE_NAME = 'euchre-camp';
// Get current version from package.json
src/__tests__/EditTournamentForm.test.tsx
+8 -7
View File
@@ -1,25 +1,25 @@
import { describe, it, expect, vi, beforeEach, MockedFunction } from 'vitest'
import { describe, it, expect, mock, beforeEach } 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()
global.fetch = mockFetch as MockedFunction<typeof global.fetch>
const mockFetch = mock(async () => new Response())
global.fetch = mockFetch as any
const mockTournament = {
id: 1,
@@ -40,7 +40,8 @@ const mockTournament = {
describe('EditTournamentForm', () => {
beforeEach(() => {
vi.clearAllMocks()
// Only clear the specific mocks we create, not global module mocks
mockFetch.mockClear()
})
it('renders form with initial values', () => {
src/__tests__/Navigation.test.tsx
+36 -26
View File
@@ -5,31 +5,40 @@
* 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 next/link
mock.module('next/link', () => ({
default: ({ children, href }: { children: React.ReactNode; href: string }) => (
<a href={href}>{children}</a>
),
}))
// Mock the SessionProvider
vi.mock('@/components/SessionProvider', () => ({
useSession: vi.fn(),
mock.module('@/components/SessionProvider', () => ({
useSession: mock(() => ({ session: null, loading: false, refreshSession: 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(async () => new Response()) as any
import { useSession } from '@/components/SessionProvider'
import { useSession as useSessionOriginal } from '@/components/SessionProvider'
const useSession = useSessionOriginal as any
describe('Epic 1: Navigation Component', () => {
beforeEach(() => {
vi.clearAllMocks()
vi.mocked(global.fetch).mockImplementation(async (url) => {
// Don't clear all mocks as it might affect bun-setup.ts
// Set up default fetch mock
(global.fetch as any).mockImplementation?.(async (url: any) => {
if (url?.toString().includes('/api/users/')) {
return new Response(JSON.stringify({ role: 'player' }), {
status: 200,
@@ -41,14 +50,15 @@ describe('Epic 1: Navigation Component', () => {
})
afterEach(() => {
vi.restoreAllMocks()
// Don't clear mocks - let them persist for other test files
// Navigation relies on module mocks set up at file level
})
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 +70,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 +81,7 @@ describe('Epic 1: Navigation Component', () => {
session: { token: 'abc123' },
},
loading: false,
refreshSession: vi.fn(),
refreshSession: mock(() => {}),
})
render(<Navigation />)
@@ -85,7 +95,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 +106,7 @@ describe('Epic 1: Navigation Component', () => {
session: { token: 'abc123' },
},
loading: false,
refreshSession: vi.fn(),
refreshSession: mock(() => {}),
})
render(<Navigation />)
@@ -107,7 +117,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 +128,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 as any).mockImplementation(async (url: any) => {
if (url?.toString().includes('/api/users/admin-123/role')) {
return new Response(JSON.stringify({ role: 'club_admin' }), {
status: 200,
@@ -141,7 +151,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 +162,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 as any).mockImplementation(async (url: any) => {
if (url?.toString().includes('/api/users/')) {
return {
json: () => Promise.resolve({ role: 'player' }),
@@ -176,10 +186,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
+13 -13
View File
@@ -1,23 +1,23 @@
import { describe, it, expect, vi, beforeEach, MockedFunction } from 'vitest'
import { describe, it, expect, mock, beforeEach } 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' }),
}),
headers: vi.fn().mockResolvedValue({
get: vi.fn().mockReturnValue(null),
}),
mock.module('next/headers', () => ({
cookies: mock(() => Promise.resolve({
get: mock(() => ({ name: 'better-auth.session_token', value: 'test-token' })),
})),
headers: mock(() => Promise.resolve({
get: mock(() => null),
})),
}))
// Mock fetch
const mockFetch = vi.fn()
global.fetch = mockFetch as MockedFunction<typeof global.fetch>
const mockFetch = mock(async () => new Response())
global.fetch = mockFetch as any
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
+40
View File
@@ -0,0 +1,40 @@
// Setup file for Bun test runner to provide DOM environment
import { JSDOM } from 'jsdom';
import { mock } from 'bun:test';
console.log('Loading bun-setup.ts...');
// Mock @prisma/client to avoid dependency on generated Prisma client
// This allows unit tests to run without requiring `prisma generate`
mock.module('@prisma/client', () => {
return {
PrismaClient: class MockPrismaClient {
$connect() {}
$disconnect() {}
$transaction() {}
}
};
});
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;
console.log('bun-setup.ts loaded - document:', typeof (global as any).document);
console.log('document.body:', (global as any).document?.body);
// Import jest-dom matchers after setting up the DOM
import '@testing-library/jest-dom';
// Clear document body after each test
import { afterEach } from 'bun:test';
afterEach(() => {
if (global.document?.body) {
global.document.body.innerHTML = '';
}
});
src/__tests__/jest-dom.d.ts
Vendored
+12
View File
@@ -0,0 +1,12 @@
/// <reference types="@testing-library/jest-dom" />
import { type expect } from 'bun:test'
import { type TestingLibraryMatchers } from '@testing-library/jest-dom/matchers'
declare module 'bun:test' {
interface Matchers<T = any>
extends TestingLibraryMatchers<
ReturnType<typeof expect.stringContaining>,
T
> {}
}
src/__tests__/unit/elo.test.ts
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+51 -39
View File
@@ -4,12 +4,33 @@
* Tests the permission system for tournament management
*/
import { describe, test, expect, vi } from 'vitest';
import { describe, test, expect, mock, beforeEach } from 'bun:test';
import { hasRole, canManageTournament, canCreateTournaments } from '@/lib/permissions';
import { getSession } from '@/lib/auth-simple';
import { prisma } from '@/lib/prisma';
import type { User } from '@prisma/client';
// Create mock functions at module level
const getSessionMock = mock(() => {});
const userFindUniqueMock = mock(() => {});
const eventFindUniqueMock = mock(() => {});
// Mock the getSession and prisma functions
mock.module('@/lib/auth-simple', () => ({
getSession: getSessionMock,
}));
mock.module('@/lib/prisma', () => ({
prisma: {
user: {
findUnique: userFindUniqueMock,
},
event: {
findUnique: eventFindUniqueMock,
},
},
}));
// Helper to create mock user
const createMockUser = (id: string, email: string, role: string): User => ({
id,
@@ -23,30 +44,21 @@ const createMockUser = (id: string, email: string, role: string): User => ({
updatedAt: new Date(),
});
// Mock the getSession and prisma functions
vi.mock('@/lib/auth-simple', () => ({
getSession: vi.fn(),
}));
vi.mock('@/lib/prisma', () => ({
prisma: {
user: {
findUnique: vi.fn(),
},
event: {
findUnique: vi.fn(),
},
},
}));
describe('Permissions', () => {
beforeEach(() => {
// Reset mock implementations to default (no-op) before each test
getSessionMock.mockImplementation(() => undefined);
userFindUniqueMock.mockImplementation(() => undefined);
eventFindUniqueMock.mockImplementation(() => undefined);
});
describe('hasRole', () => {
test('should allow club_admin to access tournament_admin resources', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: '1', email: 'test@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('1', 'test@example.com', 'club_admin')
);
@@ -55,11 +67,11 @@ describe('Permissions', () => {
});
test('should deny player from accessing tournament_admin resources', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: '1', email: 'test@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('1', 'test@example.com', 'player')
);
@@ -68,7 +80,7 @@ describe('Permissions', () => {
});
test('should deny unauthenticated user', async () => {
vi.mocked(getSession).mockResolvedValue(null);
getSessionMock.mockImplementation(async () => null);
const result = await hasRole('club_admin');
expect(result.allowed).toBe(false);
@@ -78,11 +90,11 @@ describe('Permissions', () => {
describe('canManageTournament', () => {
test('should allow club_admin to manage any tournament', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('admin-1', 'admin@example.com', 'club_admin')
);
@@ -91,11 +103,11 @@ describe('Permissions', () => {
});
test('should deny player from managing tournaments', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'player-1', email: 'player@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('player-1', 'player@example.com', 'player')
);
@@ -107,11 +119,11 @@ describe('Permissions', () => {
describe('canCreateTournaments', () => {
test('should allow tournament_admin to create tournaments', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('admin-1', 'admin@example.com', 'tournament_admin')
);
@@ -120,11 +132,11 @@ describe('Permissions', () => {
});
test('should allow club_admin to create tournaments', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('admin-1', 'admin@example.com', 'club_admin')
);
@@ -133,11 +145,11 @@ describe('Permissions', () => {
});
test('should deny player from creating tournaments', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'player-1', email: 'player@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('player-1', 'player@example.com', 'player')
);
src/__tests__/unit/player-deduplication.test.ts
+24 -18
View File
@@ -4,15 +4,19 @@
* 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';
// Create mock functions at module level
const playerFindFirstMock = mock(() => {});
const playerCreateMock = mock(() => {});
// Mock the prisma module
vi.mock('@/lib/prisma', () => ({
mock.module('@/lib/prisma', () => ({
prisma: {
player: {
findFirst: vi.fn(),
create: vi.fn(),
findFirst: playerFindFirstMock,
create: playerCreateMock,
},
},
}));
@@ -46,7 +50,9 @@ async function findOrCreatePlayer(name: string) {
describe('Player Deduplication', () => {
beforeEach(() => {
vi.clearAllMocks();
// Clear all mock history before each test
playerFindFirstMock.mockClear();
playerCreateMock.mockClear();
});
describe('findOrCreatePlayer', () => {
@@ -64,7 +70,7 @@ describe('Player Deduplication', () => {
rating: 0,
};
vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
playerFindFirstMock.mockImplementation(async () => mockPlayer);
const result = await findOrCreatePlayer('Emily');
@@ -89,7 +95,7 @@ describe('Player Deduplication', () => {
rating: 0,
};
vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
playerFindFirstMock.mockImplementation(async () => mockPlayer);
const result = await findOrCreatePlayer('EMILY');
@@ -114,7 +120,7 @@ describe('Player Deduplication', () => {
rating: 0,
};
vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
playerFindFirstMock.mockImplementation(async () => mockPlayer);
const result = await findOrCreatePlayer(' Emily ');
@@ -126,7 +132,7 @@ describe('Player Deduplication', () => {
});
test('should create new player if not found', async () => {
vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
playerFindFirstMock.mockImplementation(async () => null);
const newPlayer = {
id: 100,
@@ -141,7 +147,7 @@ describe('Player Deduplication', () => {
updatedAt: new Date(),
};
vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
playerCreateMock.mockImplementation(async () => newPlayer);
const result = await findOrCreatePlayer('NewPlayer');
@@ -162,7 +168,7 @@ describe('Player Deduplication', () => {
});
test('should handle names with special characters', async () => {
vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
playerFindFirstMock.mockImplementation(async () => null);
const newPlayer = {
id: 100,
@@ -177,7 +183,7 @@ describe('Player Deduplication', () => {
updatedAt: new Date(),
};
vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
playerCreateMock.mockImplementation(async () => newPlayer);
const result = await findOrCreatePlayer('Test-Player_123');
@@ -195,7 +201,7 @@ describe('Player Deduplication', () => {
});
test('should handle names with spaces', async () => {
vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
playerFindFirstMock.mockImplementation(async () => null);
const newPlayer = {
id: 100,
@@ -210,7 +216,7 @@ describe('Player Deduplication', () => {
updatedAt: new Date(),
};
vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
playerCreateMock.mockImplementation(async () => newPlayer);
const result = await findOrCreatePlayer('Dave B');
@@ -242,7 +248,7 @@ describe('Player Deduplication', () => {
rating: 0,
};
vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
playerFindFirstMock.mockImplementation(async () => mockPlayer);
const result1 = await findOrCreatePlayer('EMILY');
const result2 = await findOrCreatePlayer('Emily');
@@ -255,7 +261,7 @@ describe('Player Deduplication', () => {
});
test('should handle empty or whitespace-only names', async () => {
vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
playerFindFirstMock.mockImplementation(async () => null);
const newPlayer = {
id: 100,
@@ -270,7 +276,7 @@ describe('Player Deduplication', () => {
updatedAt: new Date(),
};
vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
playerCreateMock.mockImplementation(async () => newPlayer);
const result = await findOrCreatePlayer(' ');
@@ -320,7 +326,7 @@ describe('Player Deduplication', () => {
rating: 0,
};
vi.mocked(prisma.player.findFirst)
playerFindFirstMock
.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
+29 -19
View File
@@ -7,24 +7,30 @@
* - 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';
// Create mock functions at module level
const playerFindUniqueMock = mock(() => {});
const eventFindManyMock = mock(() => {});
const matchFindManyMock = mock(() => {});
const partnershipStatFindManyMock = mock(() => {});
// Mock the prisma module
vi.mock('@/lib/prisma', () => ({
mock.module('@/lib/prisma', () => ({
prisma: {
player: {
findUnique: vi.fn(),
findUnique: playerFindUniqueMock,
},
event: {
findMany: vi.fn(),
findMany: eventFindManyMock,
},
match: {
findMany: vi.fn(),
findMany: matchFindManyMock,
},
partnershipStat: {
findMany: vi.fn(),
findMany: partnershipStatFindManyMock,
},
},
}));
@@ -111,7 +117,11 @@ const createMockPartnershipStat = (
describe('Player Profile Enhancements', () => {
beforeEach(() => {
vi.clearAllMocks();
// Reset mock implementations to default (no-op) before each test
playerFindUniqueMock.mockImplementation(() => undefined);
eventFindManyMock.mockImplementation(() => undefined);
matchFindManyMock.mockImplementation(() => undefined);
partnershipStatFindManyMock.mockImplementation(() => undefined);
});
describe('Tournaments Participated', () => {
@@ -122,8 +132,8 @@ describe('Player Profile Enhancements', () => {
createMockTournament(2, 'Tournament B'),
];
vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
playerFindUniqueMock.mockImplementation(async () => mockPlayer);
eventFindManyMock.mockImplementation(async () => mockTournaments);
// Simulate the query that would be run
const tournaments = await prisma.event.findMany({
@@ -145,8 +155,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([]);
playerFindUniqueMock.mockImplementation(async () => mockPlayer);
eventFindManyMock.mockImplementation(async () => []);
const tournaments = await prisma.event.findMany({
where: {
@@ -173,8 +183,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);
playerFindUniqueMock.mockImplementation(async () => mockPlayer);
matchFindManyMock.mockImplementation(async () => mockMatches);
// Simulate the query that would be run
const matches = await prisma.match.findMany({
@@ -204,8 +214,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([]);
playerFindUniqueMock.mockImplementation(async () => mockPlayer);
matchFindManyMock.mockImplementation(async () => []);
const matches = await prisma.match.findMany({
where: {
@@ -240,8 +250,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);
playerFindUniqueMock.mockImplementation(async () => mockPlayer);
partnershipStatFindManyMock.mockImplementation(async () => mockPartnershipStats);
// Simulate the query that would be run
const partnershipStats = await prisma.partnershipStat.findMany({
@@ -265,8 +275,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([]);
playerFindUniqueMock.mockImplementation(async () => mockPlayer);
partnershipStatFindManyMock.mockImplementation(async () => []);
const partnershipStats = await prisma.partnershipStat.findMany({
where: {
src/__tests__/unit/recalculate-elo.test.ts
+11 -11
View File
@@ -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
+68 -54
View File
@@ -5,25 +5,31 @@
* 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';
// Create mock functions first
const getSessionMock = mock(() => {});
const userFindUniqueMock = mock(() => {});
const eventFindUniqueMock = mock(() => {});
const eventFindManyMock = mock(() => {});
// Mock the getSession and prisma functions
vi.mock('@/lib/auth-simple', () => ({
getSession: vi.fn(),
mock.module('@/lib/auth-simple', () => ({
getSession: getSessionMock,
}));
vi.mock('@/lib/prisma', () => ({
mock.module('@/lib/prisma', () => ({
prisma: {
user: {
findUnique: vi.fn(),
findUnique: userFindUniqueMock,
},
event: {
findUnique: vi.fn(),
findMany: vi.fn(),
findUnique: eventFindUniqueMock,
findMany: eventFindManyMock,
},
},
}));
@@ -61,16 +67,21 @@ const createMockTournament = (id: number, ownerId: string | null): Event => ({
describe('Tournament Permissions', () => {
beforeEach(() => {
vi.clearAllMocks();
// Reset mock implementations to default (no-op) before each test
// This prevents pollution from previous tests
getSessionMock.mockImplementation(() => undefined);
userFindUniqueMock.mockImplementation(() => undefined);
eventFindUniqueMock.mockImplementation(() => undefined);
eventFindManyMock.mockImplementation(() => undefined);
});
describe('canManageTournament', () => {
test('should allow club_admin to manage any tournament', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('admin-1', 'admin@example.com', 'club_admin')
);
@@ -79,14 +90,14 @@ describe('Tournament Permissions', () => {
});
test('should allow tournament_admin to manage their own tournament', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'tour-admin-1', email: 'tour@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
);
vi.mocked(prisma.event.findUnique).mockResolvedValue(
eventFindUniqueMock.mockImplementation(async () =>
createMockTournament(1, 'tour-admin-1')
);
@@ -95,14 +106,14 @@ describe('Tournament Permissions', () => {
});
test('should deny tournament_admin from managing other users tournaments', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'tour-admin-1', email: 'tour@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
);
vi.mocked(prisma.event.findUnique).mockResolvedValue(
eventFindUniqueMock.mockImplementation(async () =>
createMockTournament(1, 'other-user-1')
);
@@ -112,11 +123,11 @@ describe('Tournament Permissions', () => {
});
test('should deny player from managing tournaments', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'player-1', email: 'player@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('player-1', 'player@example.com', 'player')
);
@@ -126,7 +137,7 @@ describe('Tournament Permissions', () => {
});
test('should deny unauthenticated user', async () => {
vi.mocked(getSession).mockResolvedValue(null);
getSessionMock.mockImplementation(async () => null);
const result = await canManageTournament(999);
expect(result.allowed).toBe(false);
@@ -136,11 +147,11 @@ describe('Tournament Permissions', () => {
describe('ownsTournament', () => {
test('should return true if user owns tournament', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'owner-1', email: 'owner@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.event.findUnique).mockResolvedValue(
}));
eventFindUniqueMock.mockImplementation(async () =>
createMockTournament(1, 'owner-1')
);
@@ -149,11 +160,11 @@ describe('Tournament Permissions', () => {
});
test('should return false if user does not own tournament', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'non-owner-1', email: 'nonowner@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.event.findUnique).mockResolvedValue(
}));
eventFindUniqueMock.mockImplementation(async () =>
createMockTournament(1, 'owner-1')
);
@@ -165,11 +176,11 @@ describe('Tournament Permissions', () => {
describe('getManageableTournaments', () => {
test('should return all tournaments for club_admin', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('admin-1', 'admin@example.com', 'club_admin')
);
@@ -178,11 +189,11 @@ describe('Tournament Permissions', () => {
createMockTournament(2, 'user-2'),
createMockTournament(3, 'user-3'),
];
vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
eventFindManyMock.mockImplementation(async () => mockTournaments);
const result = await getManageableTournaments();
expect(result).toEqual(mockTournaments);
expect(prisma.event.findMany).toHaveBeenCalledWith({
expect(eventFindManyMock).toHaveBeenCalledWith({
where: { eventType: 'tournament' },
include: { participants: true },
orderBy: { createdAt: 'desc' }
@@ -190,11 +201,11 @@ describe('Tournament Permissions', () => {
});
test('should return only owned tournaments for tournament_admin', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'tour-admin-1', email: 'tour@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
);
@@ -202,11 +213,11 @@ describe('Tournament Permissions', () => {
createMockTournament(1, 'tour-admin-1'),
createMockTournament(2, 'tour-admin-1'),
];
vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
eventFindManyMock.mockImplementation(async () => mockTournaments);
const result = await getManageableTournaments();
expect(result).toEqual(mockTournaments);
expect(prisma.event.findMany).toHaveBeenCalledWith({
expect(eventFindManyMock).toHaveBeenCalledWith({
where: {
eventType: 'tournament',
ownerId: 'tour-admin-1'
@@ -217,11 +228,11 @@ describe('Tournament Permissions', () => {
});
test('should return only non-draft tournaments for players', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'player-1', email: 'player@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('player-1', 'player@example.com', 'player')
);
@@ -229,11 +240,11 @@ describe('Tournament Permissions', () => {
createMockTournament(1, 'user-1'),
createMockTournament(2, 'user-2'),
];
vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
eventFindManyMock.mockImplementation(async () => mockTournaments);
const result = await getManageableTournaments();
expect(result).toEqual(mockTournaments);
expect(prisma.event.findMany).toHaveBeenCalledWith({
expect(eventFindManyMock).toHaveBeenCalledWith({
where: {
eventType: 'tournament',
status: { not: 'draft' }
@@ -249,14 +260,14 @@ describe('Tournament Permissions', () => {
// This simulates the scenario where a tournament_admin user
// clicks "Edit" on a tournament they own
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'tour-admin-1', email: 'tour@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
);
vi.mocked(prisma.event.findUnique).mockResolvedValue(
eventFindUniqueMock.mockImplementation(async () =>
createMockTournament(1, 'tour-admin-1')
);
@@ -271,11 +282,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({
getSessionMock.mockImplementation(async () => ({
user: { id: 'club-admin-1', email: 'club@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('club-admin-1', 'club@example.com', 'club_admin')
);
@@ -286,13 +297,16 @@ 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({
getSessionMock.mockImplementation(async () => ({
user: { id: 'player-1', email: 'player@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('player-1', 'player@example.com', 'player')
);
eventFindUniqueMock.mockImplementation(async () =>
createMockTournament(1, 'other-user-1')
);
const result = await canManageTournament(1);
expect(result.allowed).toBe(false);
src/__tests__/unit/tournament-update.test.ts
+37 -23
View File
@@ -3,23 +3,33 @@
* 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';
// Create mock functions at module level
const eventFindUniqueMock = mock(() => {});
const eventUpdateMock = mock(() => {});
const canManageTournamentMock = mock(() => {});
const canDeleteTournamentMock = mock(() => {});
// Store default implementations
const defaultCanManageTournament = canManageTournamentMock.mockResolvedValue({ allowed: true });
const defaultCanDeleteTournament = canDeleteTournamentMock.mockResolvedValue({ allowed: true });
// Mock the prisma client
vi.mock('@/lib/prisma', () => ({
mock.module('@/lib/prisma', () => ({
prisma: {
event: {
findUnique: vi.fn(),
update: vi.fn(),
findUnique: eventFindUniqueMock,
update: eventUpdateMock,
},
},
}));
// 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: defaultCanManageTournament,
canDeleteTournament: defaultCanDeleteTournament,
}));
// Import the route handler after mocking
@@ -27,12 +37,16 @@ import { PUT } from '@/app/api/tournaments/[id]/route';
describe('Tournament Update API', () => {
beforeEach(() => {
vi.clearAllMocks();
// Clear all mock history before each test
eventFindUniqueMock.mockClear();
eventUpdateMock.mockClear();
canManageTournamentMock.mockClear();
canDeleteTournamentMock.mockClear();
});
it('should update allowTies field when provided', async () => {
// Mock existing tournament
vi.mocked(prisma.event.findUnique).mockResolvedValue({
eventFindUniqueMock.mockImplementation(async () => ({
id: 1,
name: 'Test Tournament',
allowTies: false,
@@ -46,10 +60,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({
eventUpdateMock.mockImplementation(async () => ({
id: 1,
name: 'Test Tournament',
allowTies: true,
@@ -63,7 +77,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 +92,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 +103,7 @@ describe('Tournament Update API', () => {
it('should default allowTies to false when not provided', async () => {
// Mock existing tournament
vi.mocked(prisma.event.findUnique).mockResolvedValue({
eventFindUniqueMock.mockImplementation(async () => ({
id: 1,
name: 'Test Tournament',
allowTies: true,
@@ -103,10 +117,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({
eventUpdateMock.mockImplementation(async () => ({
id: 1,
name: 'Test Tournament',
allowTies: false,
@@ -120,7 +134,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 +149,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 +160,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({
eventFindUniqueMock.mockImplementation(async () => ({
id: 1,
name: 'Test Tournament',
allowTies: true,
@@ -160,10 +174,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({
eventUpdateMock.mockImplementation(async () => ({
id: 1,
name: 'Updated Tournament Name',
allowTies: true,
@@ -177,7 +191,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 +206,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 = eventUpdateMock.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
+46 -36
View File
@@ -4,25 +4,31 @@
* 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';
// Create mock functions at module level
const getSessionMock = mock(() => {});
const userFindUniqueMock = mock(() => {});
const userUpdateMock = mock(() => {});
const playerFindUniqueMock = mock(() => {});
// Mock the getSession and prisma functions
vi.mock('@/lib/auth-simple', () => ({
getSession: vi.fn(),
mock.module('@/lib/auth-simple', () => ({
getSession: getSessionMock,
}));
vi.mock('@/lib/prisma', () => ({
mock.module('@/lib/prisma', () => ({
prisma: {
user: {
findUnique: vi.fn(),
update: vi.fn(),
findUnique: userFindUniqueMock,
update: userUpdateMock,
},
player: {
findUnique: vi.fn(),
findUnique: playerFindUniqueMock,
},
},
}));
@@ -56,16 +62,20 @@ const createMockPlayer = (id: number, name: string): Player => ({
describe('User Management', () => {
beforeEach(() => {
vi.clearAllMocks();
// Reset mock implementations to default (no-op) before each test
getSessionMock.mockImplementation(() => undefined);
userFindUniqueMock.mockImplementation(() => undefined);
userUpdateMock.mockImplementation(() => undefined);
playerFindUniqueMock.mockImplementation(() => undefined);
});
describe('User Name Editing', () => {
test('club_admin should be able to edit any user name', async () => {
vi.mocked(getSession).mockResolvedValue({
getSessionMock.mockImplementation(async () => ({
user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('admin-1', 'admin@example.com', 'club_admin')
);
@@ -74,11 +84,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' },
getSessionMock.mockImplementation(async () => ({
user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
);
@@ -87,11 +97,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' },
getSessionMock.mockImplementation(async () => ({
user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(
}));
userFindUniqueMock.mockImplementation(async () =>
createMockUser('player-1', 'player@example.com', 'player')
);
@@ -100,7 +110,7 @@ describe('User Management', () => {
});
test('unauthenticated user should NOT be able to edit user names', async () => {
vi.mocked(getSession).mockResolvedValue(null);
getSessionMock.mockImplementation(async () => null);
const result = await hasRole('club_admin');
expect(result.allowed).toBe(false);
@@ -111,11 +121,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' },
getSessionMock.mockImplementation(async () => ({
user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(mockUser);
}));
userFindUniqueMock.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 +136,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({
getSessionMock.mockImplementation(async () => ({
user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique)
}));
(userFindUniqueMock)
.mockResolvedValueOnce(mockAdmin) // For the requesting user
.mockResolvedValueOnce(mockUser); // For the target user
@@ -142,11 +152,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' },
getSessionMock.mockImplementation(async () => ({
user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(mockUser);
}));
userFindUniqueMock.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 +169,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' },
getSessionMock.mockImplementation(async () => ({
user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() }
});
vi.mocked(prisma.user.findUnique).mockResolvedValue(mockUser);
}));
userFindUniqueMock.mockImplementation(async () => mockUser);
const updatedUser = {
...mockUser,
@@ -171,7 +181,7 @@ describe('User Management', () => {
player: { ...mockPlayer, name: 'New Name', normalizedName: 'new name' }
};
vi.mocked(prisma.user.update).mockResolvedValue(updatedUser);
userUpdateMock.mockImplementation(async () => updatedUser);
// The API route should update both user.name and player.name
expect(updatedUser.name).toBe('New Name');
src/lib/auth.ts
+2
View File
@@ -14,6 +14,8 @@ export const auth = betterAuth({
enabled: true,
autoSignIn: true, // Automatically sign in after registration
requireEmailVerification: false, // Don't require email verification for tests
minPasswordLength: 8, // Set minimum password length
maxPasswordLength: 128, // Set maximum password length
},
secret: process.env.BETTER_AUTH_SECRET || process.env.NEXTAUTH_SECRET,
baseURL: process.env.BETTER_AUTH_URL || process.env.NEXTAUTH_URL || "http://localhost:3000",
src/lib/prisma.ts
+11 -4
View File
@@ -1,8 +1,7 @@
import { PrismaClient } from '@prisma/client'
import dotenv from 'dotenv'
// Load .env file if it exists
dotenv.config()
require('dotenv').config()
const globalForPrisma = globalThis as unknown as {
prisma: PrismaClient | undefined
@@ -10,16 +9,24 @@ const globalForPrisma = globalThis as unknown as {
// Detect database provider from environment (default to sqlite for local development)
const databaseProvider = process.env.DATABASE_PROVIDER || 'sqlite'
const databaseUrl = process.env.DATABASE_URL
// Create PrismaClient with appropriate adapter
const createPrismaClient = () => {
let client: PrismaClient
if (databaseProvider === 'postgresql') {
// Validate DATABASE_URL is present for PostgreSQL
if (!databaseUrl) {
throw new Error(
'DATABASE_URL environment variable is required when DATABASE_PROVIDER is set to postgresql. ' +
'Current DATABASE_PROVIDER: ' + databaseProvider
)
}
// Use PrismaPg adapter for PostgreSQL
const { PrismaPg } = require('@prisma/adapter-pg')
const pg = require('pg')
const adapter = new PrismaPg({ connectionString: process.env.DATABASE_URL })
const adapter = new PrismaPg({ connectionString: databaseUrl })
client = new PrismaClient({ adapter })
} else {
// No adapter needed for SQLite