5 Commits

Author SHA1 Message Date
david ff7461973a fix: optimize workflows to avoid redundant test runs
Pull Request / analyze-bump-type (pull_request) Successful in 21s
Test / unit-tests (push) Has been cancelled
2026-03-31 20:05:48 -07:00
david 9b69cb84e3 docs: add workflow architecture documentation
Test / unit-tests (push) Has been cancelled
Test / safe-acceptance-tests (push) Has been cancelled
Pull Request / unit-tests (pull_request) Successful in 13m14s
Test / unit-tests (pull_request) Successful in 13m11s
Pull Request / analyze-bump-type (pull_request) Successful in 10s
Test / safe-acceptance-tests (pull_request) Has been cancelled
2026-03-31 20:02:34 -07:00
david 5c9b98a926 feat: add PR workflow with bump type analysis
Test / unit-tests (push) Has been cancelled
Test / safe-acceptance-tests (push) Has been cancelled
Test / unit-tests (pull_request) Failing after 11m39s
Pull Request / unit-tests (pull_request) Failing after 16m27s
Pull Request / analyze-bump-type (pull_request) Has been cancelled
Test / safe-acceptance-tests (pull_request) Has been cancelled
2026-03-31 20:01:41 -07:00
david 73ba929e36 fix: update release workflow to bump version on PR merge 2026-03-31 20:01:24 -07:00
david c9cd00a055 fix: handle existing git tags and use DOCKER_LOGIN/DOCKER_PASSWORD secrets 2026-03-31 19:58:43 -07:00
77 changed files with 615 additions and 4760 deletions
-15
View File
@@ -1,15 +0,0 @@
# 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"
-54
View File
@@ -1,54 +0,0 @@
# 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)
+1 -11
View File
@@ -1,15 +1,5 @@
{ {
"env": { "extends": ["next/core-web-vitals", "next/typescript"],
"browser": true,
"es2021": true,
"node": true
},
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["@typescript-eslint"],
"ignorePatterns": [ "ignorePatterns": [
".next", ".next",
"out", "out",
+7 -50
View File
@@ -1,13 +1,12 @@
# Gitea Actions Workflow Architecture # Gitea Actions Workflow Architecture
This document describes the workflow architecture for version bumping, testing, and releases. This document describes the workflow architecture for version bumping and releases.
## Overview ## Overview
The workflow architecture uses a three-step process: The workflow architecture uses a two-step process:
1. **PR Workflow**: Runs tests on PRs and analyzes commits for bump type 1. **PR Workflow**: Analyzes commits and suggests bump type
2. **Test Workflow**: Runs unit tests on all branch pushes (except version bumps) 2. **Release Workflow**: Bumps version, creates tags, and builds Docker images on merge
3. **Release Workflow**: Bumps version, creates tags, builds Docker images, and deploys on main branch pushes
## Workflow Files ## Workflow Files
@@ -16,36 +15,16 @@ The workflow architecture uses a three-step process:
**Trigger**: Pull requests to `main` branch **Trigger**: Pull requests to `main` branch
**Purpose**: **Purpose**:
- Run unit tests on every PR (fast feedback) - Run unit tests on every PR
- Run acceptance tests with SQLite database
- Analyze commits to determine bump type (major/minor/patch) - Analyze commits to determine bump type (major/minor/patch)
- Comment the suggested bump type on the PR - Comment the suggested bump type on the PR
**Test Execution**:
- **Unit Tests**: Run first, fast execution
- **Acceptance Tests**: Run after unit tests pass, uses SQLite database
- **Database**: SQLite with `DATABASE_URL=file:./prisma/ci.db`
- **Secrets**: Uses `BETTER_AUTH_SECRET` for authentication
**Bump Type Detection**: **Bump Type Detection**:
- **Major**: Breaking changes detected (`BREAKING CHANGE` or `!:` in commit messages) - **Major**: Breaking changes detected (`BREAKING CHANGE` or `!:` in commit messages)
- **Minor**: Feature commits detected (`feat:` prefix) - **Minor**: Feature commits detected (`feat:` prefix)
- **Patch**: Default for fixes and other changes - **Patch**: Default for fixes and other changes
### 2. `.gitea/workflows/test.yml` (Test Workflow) ### 2. `.gitea/workflows/release.yml` (Release Workflow)
**Trigger**: Pushes to any branch (including main)
**Purpose**:
- Run unit tests on all branch pushes
- Skip auto-generated version bump commits (handled by release workflow)
**Key Features**:
- Runs on all branches including main
- Skips commits with "chore: bump version" message
- Fast execution for quick feedback
### 3. `.gitea/workflows/release.yml` (Release Workflow)
**Trigger**: Pushes to `main` branch (after PR merge) **Trigger**: Pushes to `main` branch (after PR merge)
@@ -54,7 +33,7 @@ The workflow architecture uses a three-step process:
- Bump version in `package.json` and `CHANGELOG.md` - Bump version in `package.json` and `CHANGELOG.md`
- Commit the version bump - Commit the version bump
- Create git tag for the release - Create git tag for the release
- Run tests inside Docker container (with PostgreSQL) - Run tests inside Docker container
- Build production Docker image - Build production Docker image
- Push images to registry - Push images to registry
- Deploy to dev environment - Deploy to dev environment
@@ -63,7 +42,6 @@ The workflow architecture uses a three-step process:
- Skips commits that are auto-generated version bumps - Skips commits that are auto-generated version bumps
- Uses `DOCKER_LOGIN` and `DOCKER_PASSWORD` secrets for registry auth - Uses `DOCKER_LOGIN` and `DOCKER_PASSWORD` secrets for registry auth
- Handles existing git tags gracefully - Handles existing git tags gracefully
- Runs comprehensive tests in production-like environment
## Version Bump Logic ## Version Bump Logic
@@ -130,25 +108,6 @@ When a PR is merged to `main`:
- Creates tag v1.0.0 - Creates tag v1.0.0
- Proceeds with build and deploy - Proceeds with build and deploy
## Database Configuration for CI
### SQLite for CI Acceptance Tests
- **Why SQLite**: No database server required, perfect for CI environments
- **Usage**: PR workflow runs acceptance tests with SQLite database
- **Configuration**: `DATABASE_PROVIDER=sqlite`, `DATABASE_URL=file:./prisma/ci.db`
- **Benefits**: Fast, isolated, no external dependencies
### PostgreSQL for Production
- **Usage**: Release workflow runs tests in Docker with PostgreSQL
- **Configuration**: Uses dummy PostgreSQL URL for Docker builds
- **Benefits**: Production-like environment, catches PostgreSQL-specific issues
### Database Provider Detection
The application automatically detects the database provider:
- `DATABASE_PROVIDER` environment variable (defaults to `sqlite`)
- `prisma.ts` conditionally uses PrismaPg adapter for PostgreSQL
- Better Auth configured with appropriate provider
## Benefits ## Benefits
1. **No CI Loops**: Version bump commits are detected and skipped 1. **No CI Loops**: Version bump commits are detected and skipped
@@ -156,8 +115,6 @@ The application automatically detects the database provider:
3. **Semantic Versioning**: Automated adherence to semver rules 3. **Semantic Versioning**: Automated adherence to semver rules
4. **Traceability**: Git tags and changelog reflect all changes 4. **Traceability**: Git tags and changelog reflect all changes
5. **Safe Releases**: Tests run before version bump and deployment 5. **Safe Releases**: Tests run before version bump and deployment
6. **Fast CI**: SQLite tests run quickly without database server setup
7. **Comprehensive Testing**: Both unit and acceptance tests in PR workflow
## Future Enhancements ## Future Enhancements
-71
View File
@@ -1,71 +0,0 @@
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 }}
-22
View File
@@ -6,30 +6,8 @@ on:
- main - main
jobs: jobs:
unit-tests:
runs-on: ubuntu-latest
container:
image: docker.notsosm.art/euchre-camp/ci-base:latest
options: --user root
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Install dependencies
run: bun install
- name: Generate Prisma client
run: bun x prisma generate
env:
DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
- name: Run unit tests
run: bun test src/__tests__/unit/ src/__tests__/*.test.tsx src/__tests__/auth-simple.test.ts
analyze-bump-type: analyze-bump-type:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: unit-tests
steps: steps:
- name: Checkout code - name: Checkout code
+8 -55
View File
@@ -14,9 +14,6 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
# Skip if this is an auto-generated version bump commit # Skip if this is an auto-generated version bump commit
if: "!contains(github.event.head_commit.message, 'chore: bump version')" if: "!contains(github.event.head_commit.message, 'chore: bump version')"
container:
image: docker.notsosm.art/euchre-camp/ci-base:latest
options: --user root
steps: steps:
- name: Checkout code - name: Checkout code
@@ -73,42 +70,30 @@ jobs:
echo "Bumping version: $BUMP" echo "Bumping version: $BUMP"
# Run the bump script # Run the bump script
bun run scripts/bump-version.js "$BUMP" --yes node scripts/bump-version.js "$BUMP" --yes
# Get new version # Get new version
NEW_VERSION=$(bun -e "console.log(require('./package.json').version)") NEW_VERSION=$(node -p "require('./package.json').version")
echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
echo "New version: $NEW_VERSION" echo "New version: $NEW_VERSION"
- name: Commit version bump - name: Commit version bump
id: commit
run: | run: |
git add package.json CHANGELOG.md git add package.json CHANGELOG.md
if git diff --cached --quiet; then
echo "No changes to commit (version may already be at target version)"
echo "committed=false" >> $GITHUB_OUTPUT
else
git commit -m "chore: bump version to v${{ steps.version.outputs.new_version }}" git commit -m "chore: bump version to v${{ steps.version.outputs.new_version }}"
git push origin main git push origin main
echo "committed=true" >> $GITHUB_OUTPUT
fi
- name: Create git tag for release - name: Create git tag for release
if: steps.commit.outputs.committed == 'true'
run: | run: |
TAG_NAME="v${{ steps.version.outputs.new_version }}" TAG_NAME="v${{ steps.version.outputs.new_version }}"
echo "Creating tag $TAG_NAME" echo "Creating tag $TAG_NAME"
# Check if tag already exists
if git rev-parse "$TAG_NAME" >/dev/null 2>&1; then
echo "Tag $TAG_NAME already exists, skipping tag creation"
else
git tag -a "$TAG_NAME" -m "Release $TAG_NAME" git tag -a "$TAG_NAME" -m "Release $TAG_NAME"
git push origin "$TAG_NAME" git push origin "$TAG_NAME"
fi
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build test-capable image - name: Build test-capable image
if: steps.commit.outputs.committed == 'true'
run: | run: |
docker build \ docker build \
--target test-runner \ --target test-runner \
@@ -117,15 +102,13 @@ jobs:
. .
- name: Run tests inside test-capable container - name: Run tests inside test-capable container
if: steps.commit.outputs.committed == 'true'
run: | run: |
docker run --rm \ docker run --rm \
-e DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" \ -e DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" \
${{ env.IMAGE_NAME }}-test:${{ steps.version.outputs.new_version }} \ ${{ env.IMAGE_NAME }}-test:${{ steps.version.outputs.new_version }} \
bun test 'src/__tests__/unit/**' 'src/__tests__/*.test.tsx' 'src/__tests__/auth-simple.test.ts' npm run test:run
- name: Build production image - name: Build production image
if: steps.commit.outputs.committed == 'true'
run: | run: |
docker build \ docker build \
--target runner \ --target runner \
@@ -135,7 +118,6 @@ jobs:
. .
- name: Push Docker images - name: Push Docker images
if: steps.commit.outputs.committed == 'true'
run: | run: |
echo "Pushing to ${{ env.REGISTRY }}..." echo "Pushing to ${{ env.REGISTRY }}..."
# Check if we can authenticate to the registry using DOCKER_LOGIN and DOCKER_PASSWORD secrets # Check if we can authenticate to the registry using DOCKER_LOGIN and DOCKER_PASSWORD secrets
@@ -159,36 +141,7 @@ jobs:
echo " docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest" echo " docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
fi fi
- name: Deploy to dev environment - name: Deploy to dev (placeholder)
if: steps.commit.outputs.committed == 'true'
run: | run: |
echo "Deploying version ${{ steps.version.outputs.new_version }} to dev environment..." 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
# Copy the updated docker-compose.yml to the deployment location
# The runners are on the same Docker server where the container is running
sudo mkdir -p /home/euchre_camp
sudo cp docker-compose.yml /home/euchre_camp/
sudo chown -R euchre:euchre /home/euchre_camp
# 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
+27
View File
@@ -0,0 +1,27 @@
name: Test
on:
push:
branches:
- '**'
- '!main' # Skip main branch (release workflow handles that)
jobs:
unit-tests:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'npm'
- name: Install dependencies
run: npm ci
- name: Run unit tests
run: npm run test:run
+1 -8
View File
@@ -34,14 +34,7 @@ yarn-error.log*
.pnpm-debug.log* .pnpm-debug.log*
# env files (can opt-in for committing if needed) # 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
.vercel .vercel
+3 -113
View File
@@ -9,12 +9,11 @@ EuchreCamp is a Next.js 14+ application for managing Euchre tournaments and trac
### Key Technologies ### Key Technologies
- **Next.js 14+** (App Router) - **Next.js 14+** (App Router)
- **TypeScript** - **TypeScript**
- **Prisma ORM** (SQLite/PostgreSQL) - **Prisma ORM** (SQLite)
- **Tailwind CSS** - **Tailwind CSS**
- **Better Auth** (Authentication) - **Better Auth** (Authentication)
- **Bun** (Package Manager & Test Runner) - **Vitest** (Unit Testing)
- **Playwright** (Acceptance Testing) - **Playwright** (Acceptance Testing)
- **Vitest** (Legacy - migrated to Bun test runner)
## Architecture Patterns ## Architecture Patterns
@@ -38,55 +37,13 @@ EuchreCamp is a Next.js 14+ application for managing Euchre tournaments and trac
## Common Tasks ## 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 ### Admin User Creation
To create an admin user, use the provided scripts: To create an admin user, use the provided scripts:
**Option 1: Using Better Auth API (Recommended)** **Option 1: Using Better Auth API (Recommended)**
```bash ```bash
bun run scripts/create-admin-via-api.js node scripts/create-admin-via-api.js
``` ```
This creates the admin user `david@dhg.lol` with password `adminadmin` using Better Auth's internal API. This creates the admin user `david@dhg.lol` with password `adminadmin` using Better Auth's internal API.
@@ -152,73 +109,10 @@ npm run db:setup-postgres
**Note:** The database provider is automatically detected by Better Auth and Prisma. **Note:** The database provider is automatically detected by Better Auth and Prisma.
### Running Tests ### Running Tests
**Using just (recommended):**
- **All tests**: `just test` (unit + acceptance with SQLite)
- **Unit tests**: `just test-unit`
- **Acceptance tests (SQLite)**: `just test-acceptance-sqlite`
- **Acceptance tests (PostgreSQL)**: `just test-acceptance-postgres`
- **PR validation**: `just pr-validate` (what runs on pull requests)
**Using npm scripts:**
- **Unit tests**: `npm run test` - **Unit tests**: `npm run test`
- **Acceptance tests**: `npm run test:acceptance` - **Acceptance tests**: `npm run test:acceptance`
- **Specific test**: `npm run test:acceptance -- --grep "test name"` - **Specific test**: `npm run test:acceptance -- --grep "test name"`
**CI-style acceptance tests with SQLite:**
```bash
DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db npm run test:acceptance
```
### CI Runner Image
**Note:** The CI runner image approach has been deprecated for Gitea Actions workflows.
The original attempt to use a pre-built CI runner image with pre-installed dependencies encountered fundamental issues with how Gitea Actions handles workspace mounting. When Gitea Actions runs a container job, it mounts the workspace at a specific path (e.g., `/workspace/david/euchre_camp`), which hides the container's `/app` directory where dependencies were installed.
**Current Approach:**
- Workflows use standard `node:20-alpine` or `mcr.microsoft.com/playwright` containers
- Dependencies are installed via `npm ci` in each workflow run
- This is the recommended approach for Gitea Actions
**Why the CI image approach doesn't work:**
1. Dockerfile.ci installs dependencies in `/app`
2. Gitea Actions mounts workspace at `/workspace/david/euchre_camp`
3. Workspace mount hides the `/app` directory
4. Symlinks from `/app/node_modules` don't work because `/app` is hidden
**Alternative for performance:**
If CI performance becomes an issue, consider:
- Using GitHub Actions cache for node_modules
- Using a self-hosted runner with persistent workspace
- Using the main Dockerfile's `test-runner` target for release workflows (which works because it builds a complete image)
### CI/CD Pipeline
The project uses Gitea Actions for continuous integration:
**PR Workflow** (`.gitea/workflows/pr.yml`):
- Runs on pull requests to main
- Executes unit tests and acceptance tests with SQLite
- Analyzes commits for semantic versioning
- Comments suggested bump type on PRs
**Test Workflow** (`.gitea/workflows/test.yml`):
- Runs on all branch pushes
- Executes unit tests for quick feedback
- Skips auto-generated version bump commits
**Release Workflow** (`.gitea/workflows/release.yml`):
- Runs on main branch pushes
- Determines version bump type
- Bumps version and creates git tags
- Builds Docker images and runs tests
- Pushes to registry and deploys
**Database Strategy**:
- CI tests use SQLite (fast, no server required)
- Production uses PostgreSQL
- Switch with `DATABASE_PROVIDER` environment variable
## Key Files ## Key Files
### Configuration ### Configuration
@@ -276,10 +170,6 @@ The project uses Gitea Actions for continuous integration:
- Utilities: camelCase (e.g., `elo-utils.ts`) - Utilities: camelCase (e.g., `elo-utils.ts`)
- Tests: `.test.ts` or `.test.tsx` suffix - Tests: `.test.ts` or `.test.tsx` suffix
## File Organization
See [docs/FILE_ORGANIZATION.md](docs/FILE_ORGANIZATION.md) for detailed file organization and structure.
## Resources ## Resources
- **Better Auth Docs**: https://better-auth.com/docs - **Better Auth Docs**: https://better-auth.com/docs
-73
View File
@@ -1,76 +1,3 @@
## [0.1.6] - 2026-04-26
### Patch Changes
- fix: update Cucumber config and hooks to properly load test infrastructure
- feat: add feature summary documentation
- docs: update README with feature files and issue tracking
- feat: add tournament schedule feature test (issue #7)
- feat: add player schedule feature test (issue #9)
- feat: add password reset feature test (issue #10)
- feat: add wordmark navigation feature test (issue #24)
- docs: add README for Cucumber test framework
- feat: add cucumber gherkin-style E2E test framework
## [0.1.5] - 2026-04-26
### Patch Changes
- ci: fix deployment directory path in release workflow
## [0.1.4] - 2026-04-02
### Patch Changes
- ci: remove acceptance tests and add dev deployment
- fix(tests): resolve password validation, csv upload, and admin auth issues
- fix(ci): correct playwright config paths and add env example files
- fix(ci): use existing PostgreSQL server at dhg.lol
- fix(ci): use PostgreSQL in acceptance-tests with dev credentials
- feat(ci): build custom Docker images for Gitea Actions compatibility
- fix(tests): add @prisma/client mock for test isolation
- fix(ci): add prisma generate step to unit-tests job
- fix: downgrade ESLint to v8.57.1 for LSP compatibility
- fix: improve TypeScript types for better IDE code hinting
- feat: migrate to ESLint flat config (eslint.config.js)
- Revert "fix: downgrade ESLint to v8.x for .eslintrc.json compatibility"
- fix: downgrade ESLint to v8.x for .eslintrc.json compatibility
- fix: update PR workflow to exclude e2e tests from unit test phase
- fix: avoid global mock clearing in EditTournamentForm tests
- fix: avoid global mock clearing in Navigation tests
- fix: add DOM cleanup to bun-setup.ts
- fix: disable test isolation in bunfig.toml
- refactor: improve test structure for Bun compatibility
- feat: update CI/CD to use Bun
- feat: migrate from npm to Bun
- docs: update TODO list with recent fix
- fix: add defensive checks to prisma.ts to prevent build failures
## [0.1.3] - 2026-04-01
### Patch Changes
- fix: skip release steps if no version bump commit was made
- fix: improve error handling in getCommitsSinceLastTag
- fix: add tag existence check in release workflow
- fix: resolve release workflow version bump issues
- ci-image-improvements (#18)
- fix: version bumping and Docker registry authentication (#17)
- fix: handle Docker registry authentication gracefully in release workflow
- fix: run unit tests on branch commits, skip main branch
- feat: add test workflow for every commit
- trigger: release with test-capable image
- feat: build test-capable image, run tests, then build production image
- trigger: release workflow
- fix: release workflow should not commit, only tag
- trigger: manual workflow trigger for docker.notsosm.art
- fix: update Docker build script to use docker.notsosm.art registry
- fix: update workflow to use docker.notsosm.art registry
- trigger: manual workflow trigger
- fix: update workflow to use correct Docker registries
- feat: add Gitea Actions release workflow
- feat: add view match link to admin matches page
## [0.1.2] - 2026-04-01 ## [0.1.2] - 2026-04-01
### Patch Changes ### Patch Changes
+13 -13
View File
@@ -1,9 +1,9 @@
# Multi-stage build for EuchreCamp Next.js application # Multi-stage build for EuchreCamp Next.js application
# Stage 1: Builder # Stage 1: Builder
FROM oven/bun:alpine AS builder FROM node:20-alpine AS builder
# Install dependencies (needed for native modules) # Install dependencies
RUN apk add --no-cache python3 make g++ RUN apk add --no-cache python3 make g++
# Set working directory # Set working directory
@@ -13,21 +13,21 @@ WORKDIR /app
COPY package*.json ./ COPY package*.json ./
# Install dependencies (including dev dependencies for building) # Install dependencies (including dev dependencies for building)
RUN bun install RUN npm ci
# Copy source code # Copy source code
COPY . . COPY . .
# Generate Prisma client (with dummy PostgreSQL DATABASE_URL for build-time generation) # 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 # Note: A dummy URL is used since the real database is not available during build
RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" bun x prisma generate RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" npx prisma generate
# Build the application (with dummy DATABASE_URL for static page generation and git commit) # Build the application (with dummy DATABASE_URL for static page generation and git commit)
ARG GIT_COMMIT=unknown ARG GIT_COMMIT=unknown
RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" NEXT_PUBLIC_GIT_COMMIT=$GIT_COMMIT bun run build RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" NEXT_PUBLIC_GIT_COMMIT=$GIT_COMMIT npm run build
# Stage 2: Test runner (includes dev dependencies for testing) # Stage 2: Test runner (includes dev dependencies for testing)
FROM oven/bun:alpine AS test-runner FROM node:20-alpine AS test-runner
# Install dependencies # Install dependencies
RUN apk add --no-cache python3 make g++ git RUN apk add --no-cache python3 make g++ git
@@ -39,16 +39,16 @@ WORKDIR /app
COPY package*.json ./ COPY package*.json ./
# Install ALL dependencies (including dev dependencies for testing) # Install ALL dependencies (including dev dependencies for testing)
RUN bun install RUN npm ci
# Copy source code # Copy source code
COPY . . COPY . .
# Generate Prisma client # Generate Prisma client
RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" bun x prisma generate RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" npx prisma generate
# Stage 3: Production runner # Stage 3: Production runner
FROM oven/bun:alpine AS runner FROM node:20-alpine AS runner
# Install dumb-init for proper signal handling # Install dumb-init for proper signal handling
RUN apk add --no-cache dumb-init 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/.next ./.next
COPY --from=builder --chown=euchre:euchre /app/public ./public 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.json ./package.json
COPY --from=builder --chown=euchre:euchre /app/bun.lockb ./bun.lockb COPY --from=builder --chown=euchre:euchre /app/package-lock.json ./package-lock.json
COPY --from=builder --chown=euchre:euchre /app/prisma ./prisma COPY --from=builder --chown=euchre:euchre /app/prisma ./prisma
# Install only production dependencies # Install only production dependencies
RUN bun install --production RUN npm ci --omit=dev
# Generate Prisma client # Generate Prisma client
# Note: We need to set DATABASE_URL even for generation because prisma.config.ts requires it # Note: We need to set DATABASE_URL even for generation because prisma.config.ts requires it
RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" bun x prisma generate RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" npx prisma generate
# Switch to non-root user # Switch to non-root user
USER euchre USER euchre
@@ -86,4 +86,4 @@ HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
# Start command # Start command
ENTRYPOINT ["dumb-init", "--"] ENTRYPOINT ["dumb-init", "--"]
CMD ["bun", "run", "start"] CMD ["npm", "start"]
-32
View File
@@ -1,32 +0,0 @@
# 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
+8 -99
View File
@@ -17,29 +17,20 @@ EuchreCamp is a full-stack web application built with Next.js 14+ and TypeScript
- **Framework**: Next.js 14+ (App Router) - **Framework**: Next.js 14+ (App Router)
- **Language**: TypeScript - **Language**: TypeScript
- **Database**: Prisma ORM with SQLite (default) or PostgreSQL - **Database**: Prisma ORM with SQLite
- **Styling**: Tailwind CSS - **Styling**: Tailwind CSS
- **Authentication**: Better Auth - **Authentication**: Better Auth
- **Form Handling**: React Hook Form + Zod validation - **Form Handling**: React Hook Form + Zod validation
- **CSV Parsing**: PapaParse - **CSV Parsing**: PapaParse
- **Unit Testing**: Vitest - **Unit Testing**: Vitest
- **Acceptance Testing**: Playwright - **Acceptance Testing**: Playwright
- **CI/CD**: Gitea Actions with SQLite for CI tests
## Project Structure ## Project Structure
``` ```
euchre_camp/ euchre_camp/
├── .gitea/workflows/ # CI/CD workflows (Gitea Actions) ├── src/
├── docs/ # Documentation │ ├── app/
│ ├── deployment/ # Deployment guides
│ └── planning/ # Planning documents
├── prisma/ # Prisma schema and migrations
├── public/ # Static assets
├── scripts/ # Utility scripts
│ └── python/ # Python scripts (legacy)
├── src/ # Source code
│ ├── app/ # Next.js app directory
│ │ ├── api/ # API routes │ │ ├── api/ # API routes
│ │ ├── auth/ # Authentication pages │ │ ├── auth/ # Authentication pages
│ │ ├── admin/ # Admin pages │ │ ├── admin/ # Admin pages
@@ -48,15 +39,16 @@ euchre_camp/
│ │ └── components/ # Shared components │ │ └── components/ # Shared components
│ ├── lib/ # Utilities and configuration │ ├── lib/ # Utilities and configuration
│ │ ├── auth.ts # Better Auth configuration │ │ ├── auth.ts # Better Auth configuration
│ │ ├── prisma.ts # Prisma client (SQLite/PostgreSQL) │ │ ├── prisma.ts # Prisma client
│ │ ├── permissions.ts # Authorization functions │ │ ├── permissions.ts # Authorization functions
│ │ └── elo-utils.ts # Elo calculation utilities │ │ └── elo-utils.ts # Elo calculation utilities
│ └── __tests__/ # Vitest and Playwright tests │ └── __tests__/ # Vitest and Playwright tests
── ... # Configuration files in root ── prisma/ # Prisma schema and migrations
├── docs/ # Documentation
├── scripts/ # Utility scripts
└── public/ # Static assets
``` ```
See [docs/FILE_ORGANIZATION.md](docs/FILE_ORGANIZATION.md) for detailed file organization.
## Features Implemented ## Features Implemented
### Epic 1: Authentication & User Management ### Epic 1: Authentication & User Management
@@ -250,36 +242,6 @@ Visit `/` to see:
## Development ## Development
### Using just (recommended)
The project includes a `justfile` with common development tasks:
```bash
# Show all available tasks
just help
# Development mode
just dev
# Run all tests (unit + acceptance with SQLite)
just test
# Run PR validation (what runs on pull requests)
just pr-validate
# Run CI pipeline locally
just ci
# Switch database provider
just db-switch-sqlite
just db-switch-postgres
# Docker shortcuts
just docker-up
just docker-down
just docker-logs
```
### Using npm scripts directly
```bash ```bash
# Development mode # Development mode
npm run dev npm run dev
@@ -293,9 +255,6 @@ npm run test
# Run acceptance tests # Run acceptance tests
npm run test:acceptance npm run test:acceptance
# Run acceptance tests with SQLite (CI-style)
DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db npm run test:acceptance
``` ```
### Database Commands ### Database Commands
@@ -354,56 +313,6 @@ User stories are organized into epics in `docs/USER_STORIES.md`:
7. Mobile Responsiveness 7. Mobile Responsiveness
8. Data Management & Export 8. Data Management & Export
## CI/CD Pipeline
The application uses Gitea Actions for continuous integration and deployment:
### Workflow Architecture
1. **PR Workflow** (`.gitea/workflows/pr.yml`): Runs on pull requests
- Unit tests (fast feedback)
- Acceptance tests with SQLite database
- Semantic version bump analysis
2. **Test Workflow** (`.gitea/workflows/test.yml`): Runs on all branch pushes
- Unit tests for quick feedback
- Skips auto-generated version bumps
3. **Release Workflow** (`.gitea/workflows/release.yml`): Runs on main branch pushes
- Version bumping and tagging
- Docker image building and testing
- Registry push and deployment
### CI Runner Image
**Note:** The CI runner image approach has been deprecated for Gitea Actions workflows.
The original attempt to use a pre-built CI runner image with pre-installed dependencies encountered fundamental issues with how Gitea Actions handles workspace mounting. When Gitea Actions runs a container job, it mounts the workspace at a specific path (e.g., `/workspace/david/euchre_camp`), which hides the container's `/app` directory where dependencies were installed.
**Current Approach:**
- Workflows use standard `node:20-alpine` or `mcr.microsoft.com/playwright` containers
- Dependencies are installed via `npm ci` in each workflow run
- This is the recommended approach for Gitea Actions
**Why the CI image approach doesn't work:**
1. Dockerfile.ci installs dependencies in `/app`
2. Gitea Actions mounts workspace at `/workspace/david/euchre_camp`
3. Workspace mount hides the `/app` directory
4. Symlinks from `/app/node_modules` don't work because `/app` is hidden
### Database Strategy for CI
- **CI Tests**: SQLite database (fast, no server required)
- **Production**: PostgreSQL (production-like environment)
- **Configuration**: `DATABASE_PROVIDER` environment variable
### Running CI Locally
```bash
# Run unit tests (same as CI)
npm run test:run
# Run acceptance tests with SQLite
DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db npm run test:acceptance
```
## Docker Deployment ## Docker Deployment
This application can be run using Docker and Docker Compose. See [DOCKER.md](DOCKER.md) for detailed instructions. This application can be run using Docker and Docker Compose. See [DOCKER.md](DOCKER.md) for detailed instructions.
+102
View File
@@ -0,0 +1,102 @@
# EuchreCamp - Todo List
## Current Tasks
### Completed ✅
- [x] Add `site_admin` role to database schema and permissions system
- [x] Add `isCasual` boolean field to Match model (already existed)
- [x] Update match upload API to support casual matches
- [x] Update match upload UI to include casual checkbox
- [x] Add tournament deletion API endpoint with delete/orphan options
- [x] Add delete tournament button and modal to tournament detail page
- [x] Run tests and verify implementation (84 tests passing)
- [x] Fix session issues with tournament admin access
- [x] Fix Elo recalculation error for player merge (delete elo snapshots before deleting players)
- [x] Add admin player management page
- [x] Add player name editing functionality in admin UI
- [x] Add admin panel links to navigation header
- [x] Add tournament update API endpoint (PUT /api/tournaments/[id])
- [x] Consolidate delete endpoint from admin API to main tournaments API
- [x] Update database schema to add variant scoring fields (targetScore, allowTies)
- [x] Fix tie handling logic in partnership stats (ties now correctly tracked)
- [x] Fix test files for normalizedName field in Player model
- [x] Fix auth.ts to include normalizedName in Player creation
- [x] Write TODO list to repository file
- [x] Auto-create tournament when uploading matches without selecting one
### In Progress 🔄
- [ ] Update API routes to handle new variant scoring fields
- [ ] Update EditTournamentForm to add variant scoring controls
- [ ] Update MatchEditor to use tournament-specific target score
- [ ] Run tests and verify variant scoring implementation
### Recently Completed ✅
- [x] Add OpenSkill rating system support (src/lib/openskill-utils.ts)
- [x] Add Glicko2 rating system support (src/lib/glicko2-utils.ts)
- [x] Reset database and run all migrations from scratch
- [x] Regenerate Prisma client with new rating models
- [x] Update match upload page to auto-create tournament if none selected
- [x] Update all admin scripts to use PrismaPg adapter and dotenv
- [x] Fix match diagram player positioning
- [x] Add CasaOS deployment configuration and documentation
- [x] Create migration to add rating system tables (elo_ratings, glicko2_ratings, open_skill_ratings)
- [x] Add tabbed rankings page to display Elo, OpenSkill, and Glicko2 ratings
### Backlog 📋
- [ ] Add UI controls for variant scoring in tournament creation/edit
- [ ] Test variant tournament functionality end-to-end
- [ ] Add validation for tie scores based on tournament configuration
- [ ] Document variant tournament features
## Recently Completed (Detailed)
### Variant Euchre Scoring Support
- Added `targetScore` and `allowTies` fields to Event model
- Created database migration for new fields
- Fixed partnership stats tie handling (ties now increment neither wins nor losses)
- Updated Elo calculation functions to handle ties correctly (0.5 points for draw)
### Tournament Deletion
- Consolidated delete endpoint to `/api/tournaments/[id]`
- Added options to delete matches or orphan them
- Updated DeleteTournamentButton to use consolidated endpoint
### Player Management
- Added admin players page at `/admin/players`
- Added player name editing functionality via PATCH endpoint
- Added player merge functionality with automatic Elo recalculation
- Fixed foreign key constraint issues with elo_snapshots
### Permissions
- Added `site_admin` role as highest privilege level
- Updated all permission functions to include site_admin support
- Fixed session cache issues by reading roles from database
## Notes
- All 84 unit tests passing
- Database migrations applied successfully
- TypeScript compilation has pre-existing errors unrelated to our changes
### Completed After Commit 1729dac
#### Next.js 16 Breaking Change Fixes
- [x] Fixed `params.id` usage in all page components (must use `await params`)
- [x] Fixed `params.id` usage in all API routes (must use `await params`)
- [x] Updated client components to use `Promise<{ id: string }>` type
- [x] Added regression tests for Next.js 16 params Promise handling
- [x] Verified all 100 unit tests pass
#### Files Updated:
- Player pages: `profile.tsx`, `schedule.tsx`
- Tournament pages: `page.tsx`, `results.tsx`, `edit.tsx`, `entry.tsx`
- API routes: `admin/players/[id]/route.ts`, `users/[id]/route.ts`, `users/[id]/role/route.ts`
- Tournament API routes: `[id]/route.ts`, `[id]/participants/route.ts`, `[id]/games/bulk/route.ts`
#### Root Cause
Next.js 16 requires `params` to be awaited in both server components and API routes:
- Before: `const { id } = params`
- After: `const { id } = await params`
This was not caught by the unit test suite because:
- Unit tests test individual functions in isolation
- E2E tests (Playwright) would catch this but weren't run after the upgrade
-1800
View File
File diff suppressed because it is too large Load Diff
-4
View File
@@ -1,4 +0,0 @@
[test]
preload = ["./src/__tests__/bun-setup.ts"]
exclude = ["e2e/**", "**/e2e/**"]
# isolation = true
+1 -1
View File
@@ -3,7 +3,7 @@
services: services:
app: app:
image: docker.notsosm.art/euchre-camp:0.1.0.dev image: euchre-camp/euchre-camp:0.1.0.dev
container_name: euchre-camp-app container_name: euchre-camp-app
ports: ports:
- "3000:3000" - "3000:3000"
-125
View File
@@ -1,125 +0,0 @@
# File Organization
This document describes the organization of files in the EuchreCamp project.
## Root Directory
### Essential Files (Keep in Root)
- `README.md` - Main project documentation
- `AGENTS.md` - AI agent guide
- `CHANGELOG.md` - Version changelog
- `package.json` - Node.js dependencies and scripts
- `package-lock.json` - Dependency lock file
- `tsconfig.json` - TypeScript configuration
- `next.config.js` - Next.js configuration
- `.gitignore` - Git ignore file
- `Dockerfile` - Docker build configuration
- `justfile` - Development task automation
### Configuration Files (Keep in Root)
- `.eslintrc.json` - ESLint configuration
- `postcss.config.mjs` - PostCSS configuration
- `playwright.config.ts` - Playwright test configuration
- `vitest.config.mts` - Vitest configuration
- `vitest.setup.ts` - Vitest setup
- `.dockerignore` - Docker ignore file
- `mise.toml` - Mise version manager config
### Docker Files (Keep in Root)
- `docker-compose.yml` - Main Docker Compose
- `docker-compose.dev.yml` - Development Docker Compose
- `docker-compose.override.yml` - Override for dev
- `docker-compose.casaos.yml` - CasaOS specific
### Environment Files (Keep in Root, Gitignored)
- `.env` - Environment variables
- `.env.development` - Development environment
## Organized Directories
### `.gitea/` - Gitea Actions Workflows
- `workflows/pr.yml` - Pull request workflow (unit + acceptance tests)
- `workflows/test.yml` - Test workflow (unit tests on branch pushes)
- `workflows/release.yml` - Release workflow (version bump + Docker build)
- `WORKFLOW_ARCHITECTURE.md` - Workflow architecture documentation
### `docs/` - Documentation
- `deployment/` - Deployment documentation
- `CASAOS_DEPLOYMENT.md` - CasaOS deployment guide
- `DOCKER.md` - Docker deployment instructions
- `TODO.md` - Project TODO list (in docs root for visibility)
- `USER_STORIES.md` - User stories organized by epic
- Other documentation files (design, implementation, testing, etc.)
### `scripts/` - Utility Scripts
- `python/` - Python scripts (legacy/old functionality)
- `generate_games.py` - Generate sample games
- `update_partnership_stats.py` - Update partnership stats
- `update_player_stats.py` - Update player stats
- `bump-version.js` - Version bumping script
- `build-and-push-docker.js` - Docker build and push script
- `switch-database.js` - Database provider switching
- `create-admin-via-api.js` - Admin user creation via API
- `create-admin-better-auth.js` - Admin user creation via database
- `list-users.js` - List all users
- `update-admin-password.js` - Update admin password
- `seed.js` - Database seeding
- And other Node.js scripts...
### `src/` - Source Code
- `app/` - Next.js app directory
- `api/` - API routes
- `auth/` - Authentication pages
- `admin/` - Admin pages
- `players/` - Player pages
- `rankings/` - Rankings page
- `components/` - Shared components
- `lib/` - Utilities and configuration
- `auth.ts` - Better Auth configuration
- `prisma.ts` - Prisma client (supports SQLite and PostgreSQL)
- `permissions.ts` - Authorization functions
- `elo-utils.ts` - Elo calculation utilities
- `__tests__/` - Vitest and Playwright tests
- `unit/` - Unit tests
- `e2e/` - End-to-end acceptance tests
### `prisma/` - Database
- `schema.prisma` - Prisma schema
- `migrations/` - Database migrations
- `dev.db` - SQLite development database (if using SQLite)
### `public/` - Static Assets
- Images, fonts, and other static files
### `playwright/` - Playwright Test Data
- Authentication state files
## Generated Directories (Gitignored)
- `.next/` - Next.js build output
- `node_modules/` - Node.js dependencies
- `playwright-report/` - Playwright test reports
- `test-results/` - Test results
## File Organization Principles
1. **Keep standard files in root**: package.json, tsconfig.json, etc.
2. **Organize by function**: Group related files in directories
3. **Separate generated from source**: Keep build outputs and dependencies separate
4. **Document organization**: Use this file to explain structure
5. **Follow conventions**: Use standard naming and organization patterns
## CI/CD File Organization
### Workflows
- `.gitea/workflows/pr.yml` - Pull request validation
- `.gitea/workflows/test.yml` - Branch testing
- `.gitea/workflows/release.yml` - Main branch release
### Database Strategy
- **CI/Testing**: SQLite (fast, no server)
- **Production**: PostgreSQL (production-like)
### Testing
- Unit tests: `npm run test:run`
- Acceptance tests (SQLite): `DATABASE_PROVIDER=sqlite npm run test:acceptance`
- Acceptance tests (PostgreSQL): `npm run test:acceptance` (with Docker)
+116 -101
View File
@@ -1,119 +1,134 @@
# EuchreCamp - Todo List # EuchreCamp - Project Todo List
## Current Tasks ## Completed Features
### Completed ✅ ### Backend
- [x] Add `site_admin` role to database schema and permissions system - [x] Database schema for matches, players, teams, events
- [x] Add `isCasual` boolean field to Match model (already existed) - [x] Elo rating calculator and job
- [x] Update match upload API to support casual matches - [x] Partnership tracking and analytics
- [x] Update match upload UI to include casual checkbox - [x] Tournament generator (round-robin, single elim, double elim, Swiss)
- [x] Add tournament deletion API endpoint with delete/orphan options - [x] ROM relations and repositories
- [x] Add delete tournament button and modal to tournament detail page - [x] Acceptance test suite (8 tests passing)
- [x] Run tests and verify implementation (84 tests passing)
- [x] Fix session issues with tournament admin access
- [x] Fix Elo recalculation error for player merge (delete elo snapshots before deleting players)
- [x] Add admin player management page
- [x] Add player name editing functionality in admin UI
- [x] Add admin panel links to navigation header
- [x] Add tournament update API endpoint (PUT /api/tournaments/[id])
- [x] Consolidate delete endpoint from admin API to main tournaments API
- [x] Update database schema to add variant scoring fields (targetScore, allowTies)
- [x] Fix tie handling logic in partnership stats (ties now correctly tracked)
- [x] Fix test files for normalizedName field in Player model
- [x] Fix auth.ts to include normalizedName in Player creation
- [x] Write TODO list to repository file
- [x] Auto-create tournament when uploading matches without selecting one
### In Progress 🔄 ### Frontend
- [ ] Update API routes to handle new variant scoring fields - [x] Basic player rankings page
- [ ] Update EditTournamentForm to add variant scoring controls - [x] Match entry form
- [ ] Update MatchEditor to use tournament-specific target score
- [ ] Run tests and verify variant scoring implementation
### Recently Completed ✅ ## In Progress - UI Development
- [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 ### Completed
- [x] Fix Prisma build error in CI pipeline (Docker build failure due to missing DATABASE_URL validation) - [x] Navigation layout (Next.js components)
- [x] Add defensive checks to src/lib/prisma.ts to prevent build failures - [x] UI Design document (UI_DESIGN.md)
- [x] Migrate from npm to Bun package manager - [x] Player Profile page (Next.js)
- [x] Migrate unit tests (Vitest → Bun test runner) - [x] Basic CSS styling (Tailwind CSS)
- [x] Migrate component tests (Vitest → Bun test runner) - [x] Player Schedule page (Next.js)
- [x] Configure Bun with DOM environment for React Testing Library - [x] Route for player schedule
- [x] Keep Playwright for E2E tests (hybrid approach)
### Recently Completed ✅ ### View Types to Implement
- [x] Add OpenSkill rating system support (src/lib/openskill-utils.ts) - [ ] Tournament Admin View (Phase 2-3)
- [x] Add Glicko2 rating system support (src/lib/glicko2-utils.ts) - Create/manage tournaments
- [x] Reset database and run all migrations from scratch - Set up brackets and matchups
- [x] Regenerate Prisma client with new rating models - Record match results
- [x] Update match upload page to auto-create tournament if none selected - View tournament standings
- [x] Update all admin scripts to use PrismaPg adapter and dotenv
- [x] Fix match diagram player positioning
- [x] Add CasaOS deployment configuration and documentation
- [x] Create migration to add rating system tables (elo_ratings, glicko2_ratings, open_skill_ratings)
- [x] Add tabbed rankings page to display Elo, OpenSkill, and Glicko2 ratings
### Backlog 📋 - [ ] Club Admin View (Superuser) (Phase 3-4)
- [ ] Add UI controls for variant scoring in tournament creation/edit - Manage all players
- [ ] Test variant tournament functionality end-to-end - View club-wide statistics
- [ ] Add validation for tie scores based on tournament configuration - Configure club settings
- [ ] Document variant tournament features - Manage tournaments
## Recently Completed (Detailed) - [ ] Player Profile View (Phase 1-2)
- Display player info and Elo rating
- Show partnership analytics
- Display match history
- Tournament participation
- Enhance existing template
### Variant Euchre Scoring Support - [ ] Player Tournament Schedule View (Phase 4)
- Added `targetScore` and `allowTies` fields to Event model - Show upcoming matches
- Created database migration for new fields - Display tournament brackets
- Fixed partnership stats tie handling (ties now increment neither wins nor losses) - Record personal match results
- Updated Elo calculation functions to handle ties correctly (0.5 points for draw)
### Tournament Deletion ### UI Components Needed
- Consolidated delete endpoint to `/api/tournaments/[id]` - [x] Navigation system (role-based) - Started
- Added options to delete matches or orphan them - [ ] Dashboard layouts
- Updated DeleteTournamentButton to use consolidated endpoint - [ ] Forms for data entry
- [ ] Tables for displaying data
- [ ] Charts for statistics
- [ ] Bracket visualization
### Player Management ### Implementation Phases
- Added admin players page at `/admin/players` - [x] Phase 1: Navigation & Layout
- Added player name editing functionality via PATCH endpoint - [x] Phase 2: Player Profile Enhancements
- Added player merge functionality with automatic Elo recalculation - [x] Phase 3: Tournament Admin View
- Fixed foreign key constraint issues with elo_snapshots - [x] Phase 4: Club Admin View
- [x] Phase 5: Player Schedule View
- [ ] Phase 6: Authentication & Authorization
- [x] Phase 7: Polish & Testing
### Permissions ## Future Enhancements
- Added `site_admin` role as highest privilege level
- Updated all permission functions to include site_admin support
- Fixed session cache issues by reading roles from database
## Notes ### Features
- All 84 unit tests passing - [ ] Real-time match updates (WebSockets)
- Database migrations applied successfully - [ ] Mobile-responsive design improvements
- TypeScript compilation has pre-existing errors unrelated to our changes - [ ] Email notifications
- [ ] Import/Export functionality
- [ ] API for third-party integrations
- [ ] Advanced analytics charts
### Completed After Commit 1729dac ### Technical
- [ ] Performance optimization
- [ ] Caching strategy
- [ ] Security hardening
- [ ] Deployment pipeline
- [ ] CI/CD setup
#### Next.js 16 Breaking Change Fixes ## AAA System (Authentication, Authorization, Accounting) - Next.js Implementation
- [x] Fixed `params.id` usage in all page components (must use `await params`)
- [x] Fixed `params.id` usage in all API routes (must use `await params`)
- [x] Updated client components to use `Promise<{ id: string }>` type
- [x] Added regression tests for Next.js 16 params Promise handling
- [x] Verified all 100 unit tests pass
#### Files Updated: ### Authentication (Better Auth + Prisma)
- Player pages: `profile.tsx`, `schedule.tsx` - [x] Set up Better Auth with Prisma
- Tournament pages: `page.tsx`, `results.tsx`, `edit.tsx`, `entry.tsx` - [x] Create users table schema
- API routes: `admin/players/[id]/route.ts`, `users/[id]/route.ts`, `users/[id]/role/route.ts` - [x] Build login page (`/auth/login`)
- Tournament API routes: `[id]/route.ts`, `[id]/participants/route.ts`, `[id]/games/bulk/route.ts` - [x] Build registration page (`/auth/register`)
- [x] Implement session management with Better Auth
- [x] Add authentication middleware
- [ ] Password reset functionality
- [ ] Email confirmation system
- [ ] OAuth providers (optional)
#### Root Cause ### Authorization (RBAC)
Next.js 16 requires `params` to be awaited in both server components and API routes: - [x] Define roles in Prisma schema (PLAYER, TOURNAMENT_ADMIN, CLUB_ADMIN)
- Before: `const { id } = params` - [x] Implement authorization helpers
- After: `const { id } = await params` - [x] Add authorization to admin dashboard
- [x] Add authorization to player management
- [x] Add authorization to tournament management
- [x] Add 5-minute match edit window (player role)
- [ ] Add role assignment UI for club admins
- [ ] Add permission checks to all API routes
This was not caught by the unit test suite because: ### Accounting (Activity Logging)
- Unit tests test individual functions in isolation - [ ] Create activity logging system (Prisma model)
- E2E tests (Playwright) would catch this but weren't run after the upgrade - [ ] Track authentication events
- [ ] Track tournament management events
- [ ] Track match recording events
- [ ] Build audit reports UI
### Security
- [x] Rate limiting (Better Auth built-in)
- [ ] IP-based lockout
- [x] Secure cookie settings (Better Auth)
- [x] CSRF protection (Next.js built-in)
- [ ] Security headers
- [ ] Session fixation prevention
## Known Issues
- [ ] Database IDs not resetting between tests (workaround: query by round_number)
- [ ] Need to clean up debug output from acceptance tests
- [ ] Password reset flow not yet implemented
## Next Steps
1. Design UI mockups for each view type
2. Implement navigation system
3. Build out Tournament Admin view
4. Add role-based access control
5. Create reusable UI components
-45
View File
@@ -1,45 +0,0 @@
/**
* Bridge file to run Cucumber tests through Playwright's test runner
*
* This allows Cucumber tests to benefit from Playwright's:
* - Dev server management
* - Browser lifecycle management
* - Test reporting
* - CI/CD integration
*/
import { test } from '@playwright/test';
import { execSync } from 'child_process';
// This test file doesn't contain actual tests
// It just runs Cucumber CLI which executes the feature files
test.describe('Cucumber E2E Tests', () => {
test('Run all Cucumber feature files', async () => {
// This test is a placeholder that triggers Cucumber execution
// In practice, Cucumber should be run directly via CLI
console.log('Cucumber tests should be run via: bun cucumber-js');
});
});
/**
* Alternative approach: Programmatic execution
*
* If you want to run Cucumber programmatically from within Playwright:
*/
/*
import { execSync } from 'child_process';
export default async function runCucumberTests() {
try {
const output = execSync(
'bun cucumber-js --config e2e/cucumber/cucumber.config.ts',
{ encoding: 'utf-8', stdio: 'inherit' }
);
console.log(output);
return true;
} catch (error) {
console.error('Cucumber tests failed:', error);
return false;
}
}
*/
-182
View File
@@ -1,182 +0,0 @@
# Gherkin-Style E2E Tests - Feature Summary
## Overview
This directory contains Gherkin-style acceptance tests for the EuchreCamp application, written in Cucumber syntax and executed via Playwright.
## Coverage Summary
### Feature Files (6 files, 16 scenarios)
| Feature File | Issue | Scenarios | Status |
|--------------|-------|-----------|--------|
| authentication.feature | - | 5 | ✅ Complete |
| password-reset.feature | #10 | 4 | ⚠️ @wip (needs UI) |
| player-schedule.feature | #9 | 3 | ⚠️ @wip (needs data) |
| tournament-schedule.feature | #7 | 4 | ⚠️ @wip (needs data) |
| user-registration.feature | - | 3 | ✅ Complete |
| wordmark-navigation.feature | #24 | 3 | ✅ Complete |
### Step Definitions
- **Total steps defined:** 75
- **Common steps:** Navigation, forms, assertions
- **Auth steps:** Registration, login, logout, schedule navigation
- **All steps verified:** ✅ Dry-run passes with no undefined steps
## Issues Covered
### Issue #24: Wordmark Navigation ✅
**Scenario:** Clicking EuchreCamp wordmark navigates to appropriate page
- Unauthenticated users → Public homepage
- Players → Their profile page
- Admins → Admin dashboard
### Issue #10: Password Reset ⚠️
**Scenarios:**
- Access password reset page
- Request reset with valid email
- Request reset with invalid email
- Submit empty email field
**Status:** Marked @wip because password reset UI is not yet implemented
### Issue #9: Player Schedule ⚠️
**Scenarios:**
- View empty schedule (no matches)
- View schedule with upcoming matches
- Navigate to match details
**Status:** Marked @wip because data setup requires tournament creation
### Issue #7: Tournament Schedule Tab ⚠️
**Scenarios:**
- View schedule page for tournament
- Generate round-robin schedule
- View schedule with bye rounds
- Click matchup to enter results
**Status:** Marked @wip because data setup requires tournament creation
## Running Tests
### Command Line
```bash
# Run all Cucumber tests
bun run test:acceptance:cucumber
# Run with pretty output
bun run test:acceptance:cucumber:pretty
# Run specific feature
bun cucumber-js e2e/cucumber/features/user-registration.feature
# Dry run (verify all steps defined)
bun cucumber-js --config e2e/cucumber/cucumber.config.ts --dry-run
```
### Tags
Filter tests by tag:
```bash
# Run only @happy-path tests
bun cucumber-js --tags "@happy-path"
# Skip @wip tests
bun cucumber-js --tags "not @wip"
# Run specific issue tests
bun cucumber-js --tags "@issue-24"
```
## Feature Examples
### Wordmark Navigation (Issue #24)
```gherkin
Scenario: Authenticated player clicks wordmark goes to their profile
Given I am logged in as a player
When I click the "EuchreCamp" wordmark
Then I should be redirected to my profile page
And I should see "Welcome"
```
### User Registration
```gherkin
Scenario: Successful registration with valid data
Given I am on the registration page
When I fill in "name" with "Test User"
And I fill in "email" with "test@example.com"
And I fill in "password" with "TestPassword123!"
And I click the "Create Account" button
Then I should be redirected to my profile page
And my user account should exist
```
### Tournament Schedule (Issue #7)
```gherkin
Scenario: Tournament admin generates round-robin schedule
Given I am logged in as a tournament admin
And a tournament exists with 4 teams
When I go to the tournament schedule page
And I click the "Generate Schedule" button
Then I should see "Schedule generated successfully"
And I should see round 1 matchups
```
## Key Principles
1. **Browser-only interactions** - Tests interact with UI only, no database access
2. **Gherkin syntax** - Plain English Given-When-Then format
3. **Happy path focus** - Tests common user workflows
4. **Issue tracking** - Each feature file linked to specific GitHub issues
5. **@wip markers** - New/incomplete features marked for development
## Next Steps
### Immediate
1. Run tests against dev server: `bun run test:acceptance:cucumber`
2. Review @wip scenarios and implement missing UI
3. Set up test data creation via API or fixtures
### Short-term
1. Add more feature files for other issues:
- Issue #8: Tournament bracket visualization
- Issue #11: Club admin dashboard
- Issue #15: Admin view-as-user functionality
- Issue #22: Team configuration options
2. Add more step definitions for:
- Tournament creation
- Team management
- Match result entry
- Calendar view
### Long-term
1. Integrate with CI/CD pipeline
2. Generate HTML reports
3. Add visual regression testing
4. Create test data factory for complex scenarios
## Useful Commands
```bash
# List all feature files
ls e2e/cucumber/features/
# Count scenarios
grep -c "Scenario:" e2e/cucumber/features/*.feature
# List all step definitions
grep -r "Given\|When\|Then" e2e/cucumber/step-definitions/ | wc -l
# Check for @wip scenarios
grep -n "@wip" e2e/cucumber/features/*.feature
```
## Documentation
- [Cucumber.js Documentation](https://github.com/cucumber/cucumber-js)
- [Gherkin Reference](https://cucumber.io/docs/gherkin/)
- [Playwright Documentation](https://playwright.dev)
- [Feature README](./README.md)
-209
View File
@@ -1,209 +0,0 @@
# Cucumber Gherkin-Style E2E Tests
This directory contains Gherkin-style acceptance tests using Cucumber and Playwright for testing the EuchreCamp application.
## Overview
These tests follow the **Given-When-Then** syntax for behavior-driven development (BDD) and test the application from a user's perspective by interacting with the browser UI only.
## Key Principles
1. **Browser-only interactions**: Tests interact with the application via the browser (click, type, navigate)
2. **No direct database access**: All data is created/modified through the UI
3. **Dev site testing**: Tests run against a running development server
4. **Happy path focus**: Tests verify common user workflows
5. **Gherkin syntax**: Tests are written in plain English using Given-When-Then
## Running Tests
### Run all Cucumber tests
```bash
bun run test:acceptance:cucumber
```
### Run with pretty formatter (visible output)
```bash
bun run test:acceptance:cucumber:pretty
```
### Run specific feature file
```bash
bun cucumber-js e2e/cucumber/features/user-registration.feature
```
### Run specific scenario
```bash
bun cucumber-js --name "Successful registration with valid data"
```
### Dry run (check for undefined steps)
```bash
bun cucumber-js --config e2e/cucumber/cucumber.config.ts --dry-run
```
## Test Structure
```
e2e/cucumber/
├── features/ # Gherkin feature files (6 files, 16 scenarios)
│ ├── authentication.feature # Login/logout flows
│ ├── password-reset.feature # Password reset (issue #10)
│ ├── player-schedule.feature # Player schedule view (issue #9)
│ ├── tournament-schedule.feature # Tournament schedule tab (issue #7)
│ ├── user-registration.feature # User registration flows
│ └── wordmark-navigation.feature # Wordmark navigation (issue #24)
├── step-definitions/ # Step implementations (75 steps defined)
│ ├── common-steps.ts # Navigation, forms, assertions
│ └── auth-steps.ts # Login, logout, registration, schedule
├── support/ # Test infrastructure
│ ├── world.ts # Shared test context
│ └── hooks.ts # Before/After hooks
├── cucumber.config.ts # Cucumber configuration
└── README.md # This file
```
## Feature Files
### 1. user-registration.feature
User registration scenarios with validation
### 2. authentication.feature
Login/logout flows for authenticated users
### 3. wordmark-navigation.feature
Tests for Issue #24: Wordmark navigation based on user role
### 4. password-reset.feature
Tests for Issue #10: Password reset flow (marked @wip - needs implementation)
### 5. player-schedule.feature
Tests for Issue #9: Player schedule view with upcoming matches
### 6. tournament-schedule.feature
Tests for Issue #7: Tournament admin schedule tab and round-robin generation
## Example Test
### Feature File (user-registration.feature)
```gherkin
Feature: User Registration
As a new user
I want to register for an account
So that I can participate in Euchre tournaments
Background:
Given I am on the registration page
Scenario: Successful registration with valid data
When I fill in "name" with "Test User"
And I fill in "email" with "test@example.com"
And I fill in "password" with "TestPassword123!"
And I click the "Create Account" button
Then I should be redirected to my profile page
And my user account should exist
```
### Step Definition (auth-steps.ts)
```typescript
Given('I am logged in as a player', async function () {
const credentials = generateTestCredentials();
world.user = credentials;
await world.page.goto(`${world.baseURL}/auth/register`);
await world.page.fill('input[name="name"]', credentials.name);
await world.page.fill('input[name="email"]', credentials.email);
await world.page.fill('input[name="password"]', credentials.password);
await world.page.click('button[type="submit"]');
await world.page.waitForURL(/\/players\/\d+\/profile/);
});
```
## Tags
Use tags to organize and filter tests:
- `@happy-path` - Tests successful user workflows
- `@negative-test` - Tests error cases and validation
- `@authentication` - Tests related to login/registration
- `@wip` - Work in progress (skipped by default)
- `@skip` - Temporarily skipped tests
## Configuration
The Cucumber configuration is in `cucumber.config.ts`:
- Feature files: `e2e/cucumber/features/**/*.feature`
- Step definitions: `e2e/cucumber/step-definitions/**/*.ts`
- TypeScript loader: tsx (for path alias support)
- Tags: Skips `@wip` and `@skip` by default
- Retries: 2 retries in CI environment
## World Context
The `world.ts` file provides a shared context for tests:
```typescript
interface WorldState {
page: Page; // Playwright page
context: BrowserContext;
baseURL: string; // Dev server URL
user?: { // Current test user
email: string;
name: string;
password: string;
};
tournament?: any; // Current test tournament
player?: any; // Current test player
}
```
## Hooks
Hooks run before/after tests:
- `BeforeAll` - Launch browser once before all tests
- `AfterAll` - Close browser and cleanup after all tests
- `Before` - Create new page context before each scenario
- `After` - Close page and cleanup test data after each scenario
## Best Practices
1. **Unique test data**: Use timestamps to ensure unique test users
2. **Wait for navigation**: Always wait for page loads and redirects
3. **Clear assertions**: Verify expected state after user actions
4. **No database access**: Use UI/API for all data creation
5. **Tag organization**: Use tags to filter test suites
6. **One assertion per step**: Keep steps focused and readable
## Troubleshooting
### Steps showing as undefined
Run with `--dry-run` to check step matching:
```bash
bun cucumber-js --dry-run
```
### Database errors
These tests don't interact with the database directly. If you see Prisma errors, check that:
- The dev server is running
- The database is accessible
- Environment variables are set correctly
### Slow tests
Use the `@wip` tag for tests in development and skip them during full runs.
## CI/CD Integration
In CI, the tests should:
1. Start the dev server (if not already running)
2. Run Cucumber tests against `http://localhost:3000`
3. Use JUnit format for reporting:
```bash
bun cucumber-js --format junit --out reports/cucumber.xml
```
## Related
- [Cucumber.js Documentation](https://github.com/cucumber/cucumber-js)
- [Gherkin Syntax Reference](https://cucumber.io/docs/gherkin/)
- [Playwright Documentation](https://playwright.dev)
-43
View File
@@ -1,43 +0,0 @@
/**
* Cucumber configuration for EuchreCamp E2E tests
*/
module.exports = {
// Paths to feature files
paths: ['e2e/cucumber/features/**/*.feature'],
// Paths to step definitions
import: ['e2e/cucumber/step-definitions/**/*.ts'],
// Paths to support files (hooks, world)
require: ['e2e/cucumber/support/**/*.ts'],
// Use tsx loader for TypeScript with path aliases
requireModule: ['tsx'],
// Format options
format: [
'progress-bar',
'pretty:cucumber-pretty'
],
// Output directory for reports
formatOptions: {
snippetInterface: 'async-await'
},
// Tags to run (can be overridden via command line)
tags: 'not @wip and not @skip',
// Fail fast on first error
failFast: false,
// Retry failed tests (useful in CI)
retry: process.env.CI ? 2 : 0,
// Dry run (just list scenarios without executing)
dryRun: false,
// Strict mode (fail on undefined steps)
strict: true,
};
@@ -1,35 +0,0 @@
Feature: User Authentication
As a registered user
I want to log in and log out
So that I can access my account features
@happy-path @authentication
Scenario: Login with valid credentials
Given I am logged in as a player
When I go to the home page
Then I should see "Sign out"
@happy-path @authentication
Scenario: Logout successfully
Given I am logged in as a player
When I click the "Sign out" button
Then I should be redirected to the login page
@negative-test @authentication
Scenario: Login with invalid credentials
Given I am on the login page
When I log in with invalid credentials
Then I should see an error message
And I should remain on the login page
@happy-path @authentication
Scenario: Navigate to login page
Given I am on the home page
When I click the "Log in" link
Then I should be on the login page
@happy-path @authentication
Scenario: Navigate to registration from login
Given I am on the login page
When I click the "Create an account" link
Then I should be on the registration page
@@ -1,32 +0,0 @@
Feature: Password Reset
As a user who forgot my password
I want to reset my password
So that I can regain access to my account
@happy-path @authentication @issue-10
Scenario: User can access password reset page
Given I am on the login page
When I click the "Forgot password?" link
Then I should be on the password reset page
And I should see "Reset Password"
@happy-path @authentication @issue-10 @wip
Scenario: User requests password reset with valid email
Given I am on the password reset page
When I fill in "email" with "existing-user@example.com"
And I click the "Send Reset Link" button
Then I should see "Password reset link sent"
And I should see "Check your email"
@negative-test @authentication @issue-10 @wip
Scenario: User requests password reset with invalid email
Given I am on the password reset page
When I fill in "email" with "nonexistent@example.com"
And I click the "Send Reset Link" button
Then I should see an error message
@negative-test @authentication @issue-10 @wip
Scenario: User submits empty email field
Given I am on the password reset page
When I click the "Send Reset Link" button
Then I should see "email is required" error
@@ -1,28 +0,0 @@
Feature: Player Schedule
As a player
I want to see my upcoming matches
So that I can prepare for and attend my games
@happy-path @player-features @issue-9
Scenario: Player views empty schedule when no matches
Given I am logged in as a player
When I go to my schedule page
Then I should see "No upcoming matches"
@happy-path @player-features @issue-9 @wip
Scenario: Player views schedule with upcoming matches
Given I am logged in as a player
And I have upcoming matches in my schedule
When I go to my schedule page
Then I should see "Upcoming Matches"
And I should see the match date
And I should see my opponent's name
And I should see the tournament name
@happy-path @player-features @issue-9 @wip
Scenario: Player can navigate to match details from schedule
Given I am logged in as a player
And I have upcoming matches in my schedule
When I go to my schedule page
And I click on a match
Then I should be on the match detail page
@@ -1,39 +0,0 @@
Feature: Tournament Schedule
As a tournament admin
I want to view and generate round matchups in a Schedule tab
So that I can manage tournament matches
@happy-path @tournament @issue-7
Scenario: Tournament admin views schedule page for tournament
Given I am logged in as a tournament admin
And a tournament exists with 4 teams
When I go to the tournament schedule page
Then I should see "Schedule"
And I should see the "Generate Schedule" button
@happy-path @tournament @issue-7 @wip
Scenario: Tournament admin generates round-robin schedule
Given I am logged in as a tournament admin
And a tournament exists with 4 teams
When I go to the tournament schedule page
And I click the "Generate Schedule" button
Then I should see "Schedule generated successfully"
And I should see round 1 matchups
And I should see round 2 matchups
@happy-path @tournament @issue-7 @wip
Scenario: Tournament admin views schedule with bye rounds
Given I am logged in as a tournament admin
And a tournament exists with 5 teams
When I go to the tournament schedule page
And I click the "Generate Schedule" button
Then I should see a bye round for one team
And each team should play every other team exactly once
@happy-path @tournament @issue-7 @wip
Scenario: Tournament admin clicks on a matchup to enter results
Given I am logged in as a tournament admin
And a tournament has a generated schedule
When I go to the tournament schedule page
And I click on a matchup
Then I should be on the match result entry page
@@ -1,59 +0,0 @@
Feature: User Registration
As a new user
I want to register for an account
So that I can participate in Euchre tournaments and track my games
Background:
Given I am on the registration page
@happy-path @authentication
Scenario: Successful registration with valid data
When I fill in "name" with "Test User"
And I fill in "email" with "test-user@example.com"
And I fill in "password" with "TestPassword123!"
And I click the "Create Account" button
Then I should be redirected to my profile page
And my user account should exist
@happy-path @authentication
Scenario: Auto-created player profile is linked to user
When I fill in "name" with "Profile Test User"
And I fill in "email" with "profile-test@example.com"
And I fill in "password" with "ProfilePass123!"
And I click the "Create Account" button
Then I should be redirected to my profile page
And I should see "Welcome, Profile Test User"
@negative-test @authentication
Scenario: Registration with duplicate email fails
Given I am logged in as a player
When I navigate to the registration page
And I fill in "name" with "Duplicate User"
And I fill in "email" with the same email
And I fill in "password" with "TestPassword123!"
And I click the "Create Account" button
Then I should see a registration error
@negative-test @authentication
Scenario: Registration with weak password fails
When I fill in "name" with "Weak Password User"
And I fill in "email" with "weak@example.com"
And I fill in "password" with "weak"
And I click the "Create Account" button
Then I should see "password" validation error
And I should remain on the registration page
@happy-path @authentication
Scenario: Registration form validation
When I click the "Create Account" button
Then I should see "name is required" error
And I should see "email is required" error
And I should see "password is required" error
@wip
Scenario: Registration with email verification (placeholder)
When I fill in "name" with "Email Verify User"
And I fill in "email" with "verify@example.com"
And I fill in "password" with "TestPassword123!"
And I click the "Create Account" button
Then I should see "Please check your email to verify your account"
@@ -1,26 +0,0 @@
Feature: Wordmark Navigation
As a user
I want the EuchreCamp wordmark to navigate to my appropriate homepage
So that I can quickly access my relevant content
@happy-path @navigation @issue-24
Scenario: Unauthenticated user clicks wordmark goes to public homepage
Given I am on the home page
When I click the "EuchreCamp" wordmark
Then I should be on the home page
And I should see "Top 10 Players"
And I should see "Sign In"
@happy-path @navigation @authenticated @issue-24
Scenario: Authenticated player clicks wordmark goes to their profile
Given I am logged in as a player
When I click the "EuchreCamp" wordmark
Then I should be redirected to my profile page
And I should see "Welcome"
@happy-path @navigation @authenticated @issue-24
Scenario: Authenticated admin clicks wordmark goes to admin dashboard
Given I am logged in as a club admin
When I click the "EuchreCamp" wordmark
Then I should be on the admin page
And I should see "Admin"
-322
View File
@@ -1,322 +0,0 @@
/**
* Authentication step definitions for EuchreCamp E2E tests
*
* These steps interact ONLY with the browser UI - no direct database access.
* All user creation happens via the registration/login UI.
*/
import { Given, When, Then } from '@cucumber/cucumber';
import { expect } from '@playwright/test';
import { world } from '../support/world';
// Generate unique test credentials
function generateTestCredentials() {
const timestamp = Date.now();
return {
email: `cucumber-test-${timestamp}@example.com`,
password: 'TestPassword123!',
name: `Cucumber Test User ${timestamp}`
};
}
/**
* Precondition: I am logged in as a player
* Creates a new user via the registration UI
*/
Given('I am logged in as a player', async function () {
console.log('🌍 Creating and logging in as a player via UI...');
const credentials = generateTestCredentials();
world.user = credentials;
// Navigate to registration page
await world.page.goto(`${world.baseURL}/auth/register`);
await world.page.waitForLoadState('networkidle');
// Fill registration form
await world.page.fill('input[name="name"]', credentials.name);
await world.page.fill('input[name="email"]', credentials.email);
await world.page.fill('input[name="password"]', credentials.password);
// Submit form
await world.page.click('button[type="submit"]');
// Wait for redirect to profile page
try {
await world.page.waitForURL(/\/players\/\d+\/profile/, { timeout: 10000 });
console.log(`🌍 Player created and logged in: ${credentials.email}`);
} catch (e) {
// If redirect doesn't happen, check if we're still on the page
console.log('🌍 Registration may have failed or redirected elsewhere');
console.log('🌍 Current URL:', world.page.url());
}
});
/**
* Precondition: I am logged in as a tournament admin
* Note: In the actual app, admin roles are assigned by club admins or via API.
* For acceptance tests, we'll use the default player role and test admin features
* as the dev site would handle them.
*/
Given('I am logged in as a tournament admin', async function () {
console.log('🌍 Creating and logging in as a player (tournament admin role is assigned via UI/API)...');
// For now, use the same flow as player
// In real usage, the admin would either:
// 1. Be pre-created on the dev site
// 2. Have role assigned via API
// 3. Use the admin dashboard to manage users
const credentials = generateTestCredentials();
world.user = credentials;
await world.page.goto(`${world.baseURL}/auth/register`);
await world.page.waitForLoadState('networkidle');
await world.page.fill('input[name="name"]', credentials.name);
await world.page.fill('input[name="email"]', credentials.email);
await world.page.fill('input[name="password"]', credentials.password);
await world.page.click('button[type="submit"]');
await world.page.waitForLoadState('networkidle');
console.log(`🌍 User created: ${credentials.email}`);
});
/**
* Precondition: I am logged in as a club admin
*/
Given('I am logged in as a club admin', async function () {
console.log('🌍 Creating and logging in as a club admin...');
const credentials = generateTestCredentials();
world.user = credentials;
await world.page.goto(`${world.baseURL}/auth/register`);
await world.page.waitForLoadState('networkidle');
await world.page.fill('input[name="name"]', credentials.name);
await world.page.fill('input[name="email"]', credentials.email);
await world.page.fill('input[name="password"]', credentials.password);
await world.page.click('button[type="submit"]');
await world.page.waitForLoadState('networkidle');
console.log(`🌍 User created: ${credentials.email}`);
});
/**
* Registration steps (UI-only)
*/
When('I register with valid credentials', async function () {
const credentials = generateTestCredentials();
world.user = credentials;
await world.page.goto(`${world.baseURL}/auth/register`);
await world.page.waitForLoadState('networkidle');
await world.page.fill('input[name="name"]', credentials.name);
await world.page.fill('input[name="email"]', credentials.email);
await world.page.fill('input[name="password"]', credentials.password);
await world.page.click('button[type="submit"]');
console.log(`🌍 Registered with credentials: ${credentials.email}`);
});
When('I register with duplicate email', async function () {
if (!world.user) {
throw new Error('No existing user to duplicate');
}
await world.page.goto(`${world.baseURL}/auth/register`);
await world.page.waitForLoadState('networkidle');
await world.page.fill('input[name="name"]', world.user.name);
await world.page.fill('input[name="email"]', world.user.email);
await world.page.fill('input[name="password"]', world.user.password);
await world.page.click('button[type="submit"]');
console.log(`🌍 Attempted registration with duplicate: ${world.user.email}`);
});
When('I fill in {string} with the same email', async function (fieldName: string) {
if (!world.user) {
throw new Error('No user credentials available');
}
const selector = `input[name="email"]`;
console.log(`🌍 Filling ${fieldName} with same email: ${world.user.email}`);
await world.page.fill(selector, world.user.email);
});
When('I register with weak password', async function () {
const credentials = generateTestCredentials();
credentials.password = 'weak'; // Too short
await world.page.goto(`${world.baseURL}/auth/register`);
await world.page.waitForLoadState('networkidle');
await world.page.fill('input[name="name"]', credentials.name);
await world.page.fill('input[name="email"]', credentials.email);
await world.page.fill('input[name="password"]', credentials.password);
await world.page.click('button[type="submit"]');
console.log('🌍 Attempted registration with weak password');
});
/**
* Login steps (UI-only)
*/
When('I log in with valid credentials', async function () {
if (!world.user) {
throw new Error('No user credentials available');
}
await world.page.goto(`${world.baseURL}/auth/login`);
await world.page.waitForLoadState('networkidle');
await world.page.fill('input[name="email"]', world.user.email);
await world.page.fill('input[name="password"]', world.user.password);
await world.page.click('button[type="submit"]');
console.log(`🌍 Logged in as: ${world.user.email}`);
});
When('I log in with invalid credentials', async function () {
await world.page.goto(`${world.baseURL}/auth/login`);
await world.page.waitForLoadState('networkidle');
await world.page.fill('input[name="email"]', 'nonexistent@example.com');
await world.page.fill('input[name="password"]', 'wrongpassword');
await world.page.click('button[type="submit"]');
console.log('🌍 Attempted login with invalid credentials');
});
/**
* Logout steps (UI-only)
*/
When('I log out', async function () {
// Click on logout button
await world.page.click('text=Sign out');
console.log('🌍 Logged out');
});
/**
* Verification steps (browser-based)
*/
Then('I should be logged in', async function () {
// Check for logout button or user menu
await expect(world.page.locator('text=Sign out')).toBeVisible();
console.log('🌍 Verified user is logged in');
});
Then('I should not be logged in', async function () {
// Check that we're on login page or don't see logout button
const currentUrl = world.page.url();
expect(currentUrl).toContain('/auth/login');
console.log('🌍 Verified user is not logged in');
});
Then('I should see a registration error', async function () {
// Check for error message in page content
const content = await world.page.content();
expect(content).toContain('error');
console.log('🌍 Verified registration error is visible');
});
Then('I should see an error message', async function () {
// Check for any error message on the page
const content = await world.page.content();
expect(content).toMatch(/error|Error/i);
console.log('🌍 Verified error message is visible');
});
Then('I should remain on the login page', async function () {
const currentUrl = world.page.url();
expect(currentUrl).toContain('/auth/login');
console.log('🌍 Verified still on login page');
});
Then('I should remain on the registration page', async function () {
const currentUrl = world.page.url();
expect(currentUrl).toContain('/auth/register');
console.log('🌍 Verified still on registration page');
});
/**
* Helper: Verify user was created via UI (no database check)
*/
Then('my user account should exist', async function () {
if (!world.user) {
throw new Error('No user credentials available');
}
// We can't check the database directly in acceptance tests
// Instead, verify we're logged in (user profile page)
await expect(world.page.locator('text=Welcome')).toBeVisible();
console.log('🌍 Verified user account was created successfully');
});
/**
* Schedule steps (player)
*/
When('I go to my schedule page', async function () {
console.log('🌍 Going to schedule page');
// Navigate to the schedule page
// The URL pattern would be /players/{playerId}/schedule
// We'll navigate to /players/schedule which should redirect or work
await world.page.goto(`${world.baseURL}/players/schedule`);
await world.page.waitForLoadState('networkidle');
});
Given('I have upcoming matches in my schedule', async function () {
console.log('🌍 Note: This step requires database setup via API or UI');
console.log('🌍 For acceptance tests, this would be set up before running the test');
// For true acceptance testing, we would:
// 1. Create a tournament
// 2. Add the player as a participant
// 3. Generate a schedule
// 4. The match would then appear in the player's schedule
// For now, this is a placeholder that indicates data setup is needed
// In a real test run, this data would already exist in the dev database
});
/**
* Tournament schedule steps
*/
Given('a tournament exists with {int} teams', async function (teamCount: number) {
console.log(`🌍 Note: Tournament with ${teamCount} teams requires data setup`);
console.log('🌍 For acceptance tests, this would be created via UI or API');
// In a real test run, this would either:
// 1. Create a tournament via the UI (slower but more realistic)
// 2. Use API to create tournament and add teams (faster)
// 3. Pre-existing test data in dev database
// Store the team count in world context for later steps
world.tournamentTeamCount = teamCount;
});
When('I go to the tournament schedule page', async function () {
console.log('🌍 Going to tournament schedule page');
// Navigate to a tournament schedule page
// This would typically be /admin/tournaments/{id}/schedule
// For testing, we'll go to the first tournament's schedule
await world.page.goto(`${world.baseURL}/admin/tournaments/1/schedule`);
await world.page.waitForLoadState('networkidle');
});
Given('a tournament has a generated schedule', async function () {
console.log('🌍 Note: Tournament schedule requires generation via API or UI');
console.log('🌍 For acceptance tests, this would be created before running the test');
// In a real test run, we would:
// 1. Create a tournament
// 2. Add teams/participants
// 3. Generate schedule via API or UI
});
@@ -1,309 +0,0 @@
/**
* Common step definitions for EuchreCamp E2E tests
*/
import { Given, When, Then } from '@cucumber/cucumber';
import { expect } from '@playwright/test';
import { world } from '../support/world';
// console.log('🌍 Loading common-steps.ts step definitions');
/**
* Navigation steps
*/
Given('I am on the home page', async function () {
console.log('🌍 Navigating to home page');
await world.page.goto(world.baseURL);
await world.page.waitForLoadState('networkidle');
});
Given('I am on the registration page', async function () {
console.log('🌍 Navigating to registration page');
await world.page.goto(`${world.baseURL}/auth/register`);
await world.page.waitForLoadState('networkidle');
});
Given('I am on the login page', async function () {
console.log('🌍 Navigating to login page');
await world.page.goto(`${world.baseURL}/auth/login`);
await world.page.waitForLoadState('networkidle');
});
Given('I am on the {string} page', async function (pageName: string) {
const pageUrls: Record<string, string> = {
'home': '/',
'home page': '/',
'registration': '/auth/register',
'registration page': '/auth/register',
'login': '/auth/login',
'login page': '/auth/login',
'rankings': '/rankings',
'rankings page': '/rankings',
'admin': '/admin',
'admin page': '/admin',
'admin dashboard': '/admin',
'tournaments': '/admin/tournaments',
'tournaments page': '/admin/tournaments',
};
const url = pageUrls[pageName.toLowerCase()] || `/${pageName.toLowerCase().replace(' ', '-')}`;
console.log(`🌍 Navigating to ${pageName}: ${url}`);
await world.page.goto(`${world.baseURL}${url}`);
// Wait for page to load
await world.page.waitForLoadState('networkidle');
});
When('I navigate to the {string} page', async function (pageName: string) {
// This step is a synonym for "I go to the {string} page"
await world.page.goto(`${world.baseURL}/auth/register`);
await world.page.waitForLoadState('networkidle');
});
When('I navigate to the registration page', async function () {
console.log('🌍 Navigating to registration page');
await world.page.goto(`${world.baseURL}/auth/register`);
await world.page.waitForLoadState('networkidle');
});
When('I go to the home page', async function () {
console.log('🌍 Navigating to home page');
await world.page.goto(world.baseURL);
await world.page.waitForLoadState('networkidle');
});
When('I go to the {string} page', async function (pageName: string) {
const pageUrls: Record<string, string> = {
'home': '/',
'home page': '/',
'registration': '/auth/register',
'registration page': '/auth/register',
'login': '/auth/login',
'login page': '/auth/login',
'rankings': '/rankings',
'rankings page': '/rankings',
'admin': '/admin',
'admin page': '/admin',
'admin dashboard': '/admin',
'tournaments': '/admin/tournaments',
'tournaments page': '/admin/tournaments',
};
const url = pageUrls[pageName.toLowerCase()] || `/${pageName.toLowerCase().replace(' ', '-')}`;
console.log(`🌍 Going to ${pageName}: ${url}`);
await world.page.goto(`${world.baseURL}${url}`);
await world.page.waitForLoadState('networkidle');
});
When('I go back', async function () {
await world.page.goBack();
await world.page.waitForLoadState('networkidle');
});
When('I refresh the page', async function () {
await world.page.reload();
await world.page.waitForLoadState('networkidle');
});
/**
* Form interaction steps
*/
When('I fill in {string} with {string}', async function (fieldName: string, value: string) {
// Map field names to selectors
const fieldSelectors: Record<string, string> = {
'name': 'input[name="name"]',
'email': 'input[name="email"]',
'password': 'input[name="password"]',
'confirm password': 'input[name="confirmPassword"]',
'player name': 'input[name="playerName"]',
'tournament name': 'input[name="name"]',
};
const selector = fieldSelectors[fieldName.toLowerCase()] || `input[name="${fieldName.toLowerCase()}"]`;
console.log(`🌍 Filling ${fieldName} with ${value}`);
await world.page.fill(selector, value);
});
When('I click the {string} button', async function (buttonText: string) {
const selector = `button:has-text("${buttonText}")`;
console.log(`🌍 Clicking button: ${buttonText}`);
await world.page.click(selector);
});
When('I click the {string} link', async function (linkText: string) {
const selector = `a:has-text("${linkText}")`;
console.log(`🌍 Clicking link: ${linkText}`);
await world.page.click(selector);
});
When('I click the {string} wordmark', async function (wordmarkText: string) {
const selector = `a:has-text("${wordmarkText}")`;
console.log(`🌍 Clicking wordmark: ${wordmarkText}`);
await world.page.click(selector);
await world.page.waitForLoadState('networkidle');
});
When('I click the {string} element', async function (elementText: string) {
const selector = `text=${elementText}`;
console.log(`🌍 Clicking element: ${elementText}`);
await world.page.click(selector);
});
/**
* Assertion steps
*/
Then('I should see {string}', async function (text: string) {
console.log(`🌍 Checking for text: ${text}`);
await expect(world.page.locator(`text=${text}`)).toBeVisible();
});
Then('I should not see {string}', async function (text: string) {
console.log(`🌍 Checking text is NOT visible: ${text}`);
await expect(world.page.locator(`text=${text}`)).not.toBeVisible();
});
Then('I should be on the {string} page', async function (pageName: string) {
const pageUrls: Record<string, string> = {
'home': '/',
'home page': '/',
'registration': '/auth/register',
'registration page': '/auth/register',
'login': '/auth/login',
'login page': '/auth/login',
'profile': '/players',
'admin': '/admin',
'admin page': '/admin',
};
const expectedPath = pageUrls[pageName.toLowerCase()] || `/${pageName.toLowerCase().replace(' ', '-')}`;
const currentUrl = world.page.url();
console.log(`🌍 Checking current URL: ${currentUrl}`);
console.log(`🌍 Expected path: ${expectedPath}`);
expect(currentUrl).toContain(expectedPath);
});
Then('I should be redirected to my profile page', async function () {
await world.page.waitForLoadState('networkidle');
const currentUrl = world.page.url();
console.log(`🌍 Checking redirect to profile page. Current URL: ${currentUrl}`);
expect(currentUrl).toMatch(/\/players\/\d+\/profile/);
});
Then('I should be on the registration page', async function () {
const currentUrl = world.page.url();
console.log(`🌍 Checking current URL: ${currentUrl}`);
expect(currentUrl).toContain('/auth/register');
});
Then('I should be on the login page', async function () {
const currentUrl = world.page.url();
console.log(`🌍 Checking current URL: ${currentUrl}`);
expect(currentUrl).toContain('/auth/login');
});
Then('I should be on the admin page', async function () {
const currentUrl = world.page.url();
console.log(`🌍 Checking current URL: ${currentUrl}`);
expect(currentUrl).toContain('/admin');
});
Then('I should be on the home page', async function () {
const currentUrl = world.page.url();
console.log(`🌍 Checking current URL: ${currentUrl}`);
expect(currentUrl).toContain('/');
});
Then('I should be on the password reset page', async function () {
const currentUrl = world.page.url();
console.log(`🌍 Checking current URL: ${currentUrl}`);
expect(currentUrl).toContain('/auth/password-reset');
});
Then('I should see the {string} button', async function (buttonText: string) {
const button = world.page.locator(`button:has-text("${buttonText}")`);
await expect(button).toBeVisible();
console.log(`🌍 Verified button is visible: ${buttonText}`);
});
Then('I should be redirected to {string}', async function (path: string) {
await world.page.waitForLoadState('networkidle');
const currentUrl = world.page.url();
console.log(`🌍 Checking redirect to: ${path}`);
console.log(`🌍 Current URL: ${currentUrl}`);
expect(currentUrl).toContain(path);
});
/**
* Element visibility steps
*/
Then('the element {string} should be visible', async function (elementText: string) {
const element = world.page.locator(`text=${elementText}`);
await expect(element).toBeVisible();
});
Then('the element {string} should not be visible', async function (elementText: string) {
const element = world.page.locator(`text=${elementText}`);
await expect(element).not.toBeVisible();
});
/**
* Wait steps
*/
When('I wait for {int} seconds', async function (seconds: number) {
console.log(`🌍 Waiting ${seconds} seconds`);
await world.page.waitForTimeout(seconds * 1000);
});
When('I wait for the page to load', async function () {
await world.page.waitForLoadState('networkidle');
});
/**
* URL verification steps
*/
Then('the URL should contain {string}', async function (expectedPath: string) {
const currentUrl = world.page.url();
console.log(`🌍 Checking URL contains: ${expectedPath}`);
expect(currentUrl).toContain(expectedPath);
});
Then('I should be redirected to the login page', async function () {
await world.page.waitForLoadState('networkidle');
const currentUrl = world.page.url();
console.log(`🌍 Checking redirect to login page. Current URL: ${currentUrl}`);
expect(currentUrl).toContain('/auth/login');
});
Then('I should see a {string} error', async function (errorMessage: string) {
const content = await world.page.content();
expect(content).toMatch(new RegExp(errorMessage, 'i'));
console.log(`🌍 Verified error message: ${errorMessage}`);
});
Then('I should see {string} validation error', async function (field: string) {
// Look for validation error near the input field
const content = await world.page.content();
// Check if the field name is mentioned in an error context
expect(content).toMatch(new RegExp(field, 'i'));
console.log(`🌍 Verified validation error for: ${field}`);
});
Then('I should see {string} error', async function (errorMessage: string) {
const content = await world.page.content();
expect(content).toMatch(new RegExp(errorMessage, 'i'));
console.log(`🌍 Verified error message: ${errorMessage}`);
});
-108
View File
@@ -1,108 +0,0 @@
/**
* Cucumber hooks for EuchreCamp E2E tests
*/
import { Before, After, BeforeAll, AfterAll } from '@cucumber/cucumber';
import { chromium, Browser } from '@playwright/test';
import { world } from './world';
import path from 'path';
import fs from 'fs';
// Global browser instance
let browser: Browser;
// Load environment files
const envPath = path.resolve(process.cwd(), '.env');
const envDevPath = path.resolve(process.cwd(), '.env.development');
if (fs.existsSync(envPath)) {
require('dotenv').config({ path: envPath });
}
if (fs.existsSync(envDevPath)) {
require('dotenv').config({ path: envDevPath, override: true });
}
/**
* Before all scenarios: Launch browser
*/
BeforeAll(async function () {
console.log('🌍 Launching browser for Cucumber tests...');
browser = await chromium.launch();
});
/**
* After all scenarios: Close browser and cleanup
*/
AfterAll(async function () {
console.log('🌍 Closing browser...');
await browser.close();
console.log('🌍 Disconnecting from database...');
if (world.prisma) {
await world.prisma.$disconnect();
}
});
/**
* Before each scenario: Create new page context
*/
Before(async function () {
// Create new context and page
world.context = await browser.newContext();
world.page = await world.context.newPage();
// Log console messages for debugging
world.page.on('console', msg => {
if (msg.type() === 'error') {
console.log('❌ PAGE ERROR:', msg.text());
}
});
// Log network errors
world.page.on('requestfailed', request => {
console.log('❌ REQUEST FAILED:', request.url());
});
console.log('🌍 Created new page context');
});
/**
* After each scenario: Close page
*/
After(async function () {
console.log('🌍 Cleaning up after scenario...');
// Close page and context
if (world.page) {
await world.page.close();
}
if (world.context) {
await world.context.close();
}
});
/**
* Custom hook for navigating to a page
*/
Before({ tags: '@navigation' }, async function () {
console.log('🌍 Navigation hook triggered');
});
/**
* Custom hook for authenticated scenarios
*/
Before({ tags: '@authenticated' }, async function () {
console.log('🌍 Authenticated hook triggered');
});
/**
* Tag hooks for specific scenarios
*/
Before({ tags: '@slow' }, async function () {
console.log('🌍 Slow test - extending timeout');
});
Before({ tags: '@flaky' }, async function () {
console.log('🌍 Flaky test - retry enabled');
});
-55
View File
@@ -1,55 +0,0 @@
/**
* World context for Cucumber tests
* Provides shared state between step definitions
*/
import { Page, BrowserContext, chromium, Browser } from '@playwright/test';
export interface WorldState {
page: Page;
context: BrowserContext;
prisma: any; // Lazy-loaded PrismaClient
baseURL: string;
user?: {
email: string;
name: string;
password: string;
};
tournament?: any;
tournamentTeamCount?: number;
player?: any;
match?: any;
}
export class World implements WorldState {
page!: Page;
context!: BrowserContext;
prisma: any;
baseURL: string;
user?: {
email: string;
name: string;
password: string;
};
tournament?: any;
tournamentTeamCount?: number;
player?: any;
match?: any;
constructor() {
this.baseURL = process.env.BASE_URL || 'http://localhost:3000';
this.prisma = null; // Will be lazily loaded when needed
}
async getPrisma() {
if (!this.prisma) {
// Lazily load PrismaClient when first accessed
const { PrismaClient } = await import('@prisma/client');
this.prisma = new PrismaClient();
}
return this.prisma;
}
}
// Export singleton instance
export const world = new World();
+7 -105
View File
@@ -9,8 +9,8 @@ set positional-arguments
# Project name # Project name
PROJECT := "euchre-camp" PROJECT := "euchre-camp"
# Docker registry # Docker registry (CasaOS local registry)
REGISTRY := "docker.notsosm.art" REGISTRY := "euchre-camp" # Update to your registry host if needed
IMAGE_TAG := "latest" IMAGE_TAG := "latest"
# Get git commit hash (short version) # Get git commit hash (short version)
@@ -22,8 +22,6 @@ IMAGE_TAG_COMMIT := `git rev-parse --short HEAD`
# --- Variables --- # --- Variables ---
# Database # Database
DB_CONTAINER := "euchre-camp-postgres" DB_CONTAINER := "euchre-camp-postgres"
DATABASE_PROVIDER := env_var_or_default("DATABASE_PROVIDER", "sqlite")
DATABASE_URL := env_var_or_default("DATABASE_URL", "file:./prisma/dev.db")
# --- Setup & Installation --- # --- Setup & Installation ---
@@ -56,24 +54,15 @@ format:
# --- Testing --- # --- Testing ---
# Run all tests (unit + acceptance with SQLite) # Run all tests (unit + acceptance)
# Note: Uses Docker containers for consistent environment test: test-unit test-acceptance
test: test-unit test-acceptance-sqlite
# Run all tests with PostgreSQL (Docker)
test-pg: test-unit test-acceptance-postgres
# Run unit tests (Vitest) # Run unit tests (Vitest)
test-unit: test-unit:
npm run test:run npm run test:run
# Run acceptance tests with SQLite (fast, no Docker needed) # Run acceptance tests (Playwright)
test-acceptance-sqlite: test-acceptance:
@echo "Running acceptance tests with SQLite..."
DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db BETTER_AUTH_SECRET=test-secret-key npm run test:acceptance
# Run acceptance tests with PostgreSQL (Docker)
test-acceptance-postgres:
@echo "Starting Docker containers for acceptance tests..." @echo "Starting Docker containers for acceptance tests..."
docker compose up -d docker compose up -d
@echo "Waiting for services to be ready..." @echo "Waiting for services to be ready..."
@@ -91,13 +80,6 @@ migrate:
seed: seed:
npm run db:seed npm run db:seed
# Switch database provider
db-switch-sqlite:
npm run db:switch sqlite
db-switch-postgres:
npm run db:switch postgresql
# --- Docker --- # --- Docker ---
# Build the Docker image (standard build) # Build the Docker image (standard build)
@@ -161,18 +143,9 @@ docker-push: docker-build-full
# --- CI/CD Pipeline Simulation --- # --- CI/CD Pipeline Simulation ---
# Run full CI pipeline locally (lint, test, build, push) # Run full CI pipeline locally (lint, test, build, push)
# Matches the Gitea Actions workflow ci: lint typecheck test-unit docker-build
ci: lint typecheck test-unit test-acceptance-sqlite docker-build
@echo "CI Pipeline completed successfully!" @echo "CI Pipeline completed successfully!"
# PR validation (what runs on pull requests)
pr-validate: lint typecheck test-unit test-acceptance-sqlite
@echo "PR validation completed successfully!"
# Run CI with PostgreSQL (for release workflow simulation)
ci-postgres: lint typecheck test-unit test-acceptance-postgres docker-build
@echo "CI Pipeline with PostgreSQL completed successfully!"
# --- Utilities --- # --- Utilities ---
# Show help information # Show help information
@@ -185,74 +158,3 @@ clean:
rm -rf node_modules .next dist rm -rf node_modules .next dist
@echo "Cleaning Docker artifacts..." @echo "Cleaning Docker artifacts..."
docker system prune -f docker system prune -f
# Generate Prisma client
prisma-generate:
npx prisma generate
# Reset development database
db-reset-dev:
npm run db:reset-dev
# Setup development database
db-setup-dev:
npm run db:setup-dev
# Clean production database (remove test records)
db-clean-prod:
npm run db:cleanup-prod
# Check production database for test records
db-check-prod:
npm run db:check-prod
# Create admin user
admin-create:
node scripts/create-admin-via-api.js
# List all users
users-list:
node scripts/list-users.js
# Update admin password
admin-update-password:
node scripts/update-admin-password.js
# Bump version
version-bump-patch:
npm run version:patch
version-bump-minor:
npm run version:minor
version-bump-major:
npm run version:major
# Docker Compose shortcuts
docker-up:
npm run docker:up
docker-down:
npm run docker:down
docker-logs:
npm run docker:logs
# View workflow status
workflow-status:
@echo "Current workflows in .gitea/workflows/:"
ls -la .gitea/workflows/
@echo ""
@echo "PR Workflow: Runs unit + acceptance tests on pull requests"
@echo "Test Workflow: Runs unit tests on all branch pushes"
@echo "Release Workflow: Runs on main branch pushes (version bump + Docker build)"
@echo ""
@echo "Note: CI image approach deprecated due to Gitea Actions workspace mounting"
# Check current database provider
db-status:
@echo "Database Provider: ${DATABASE_PROVIDER}"
@echo "Database URL: ${DATABASE_URL}"
@echo ""
@echo "Current schema.prisma provider:"
grep -A 2 "datasource db" prisma/schema.prisma | head -3
-1
View File
@@ -1,5 +1,4 @@
[tools] [tools]
bun = "latest"
docker-compose = "latest" docker-compose = "latest"
just = "latest" just = "latest"
node = "latest" node = "latest"
+24 -36
View File
@@ -1,45 +1,38 @@
{ {
"name": "euchre_camp", "name": "euchre_camp",
"version": "0.1.6", "version": "0.1.2",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "NEXT_PUBLIC_GIT_COMMIT=$(git rev-parse --short HEAD) next dev", "dev": "NEXT_PUBLIC_GIT_COMMIT=$(git rev-parse --short HEAD) next dev",
"build": "next build", "build": "next build",
"start": "next start", "start": "next start",
"lint": "bun run eslint", "lint": "eslint",
"test": "bun test 'src/__tests__/unit/**' 'src/__tests__/*.test.tsx' 'src/__tests__/auth-simple.test.ts'", "test": "vitest",
"test:unit": "bun test src/__tests__/unit/", "test:run": "vitest run",
"test:component": "bun test src/__tests__/*.test.tsx", "test:acceptance": "playwright test src/__tests__/e2e/",
"test:run": "bun test 'src/__tests__/unit/**' 'src/__tests__/*.test.tsx' 'src/__tests__/auth-simple.test.ts'", "test:acceptance:headed": "playwright test src/__tests__/e2e/ --headed",
"test:randomize": "bun test src/__tests__/unit/ --randomize", "db:switch": "node scripts/switch-database.js",
"test:unit:sequential": "bun test src/__tests__/unit/ --max-concurrency=1", "db:setup-postgres": "node scripts/setup-postgres.js",
"test:acceptance": "bun x playwright test e2e/", "db:setup-dev": "node scripts/setup-postgres.js",
"test:acceptance:headed": "bun x playwright test e2e/ --headed", "db:setup-dev:clean": "node scripts/setup-postgres.js --drop",
"test:acceptance:cucumber": "bun cucumber-js --config e2e/cucumber/cucumber.config.ts", "db:reset-dev": "node scripts/reset-dev-db.js",
"test:acceptance:cucumber:pretty": "bun cucumber-js --config e2e/cucumber/cucumber.config.ts --format pretty:cucumber-pretty", "db:use-dev": "node scripts/use-dev-db.js",
"cucumber": "bun cucumber-js --config e2e/cucumber/cucumber.config.ts", "db:cleanup-prod": "node scripts/cleanup-prod-db.js",
"db:switch": "bun run scripts/switch-database.js", "db:check-prod": "node scripts/check-test-records.js",
"db:setup-postgres": "bun run scripts/setup-postgres.js", "db:seed": "node scripts/seed.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:up": "docker-compose up -d",
"docker:down": "docker-compose down", "docker:down": "docker-compose down",
"docker:logs": "docker-compose logs -f", "docker:logs": "docker-compose logs -f",
"docker:build": "docker-compose build", "docker:build": "docker-compose build",
"docker:shell": "docker exec -it euchre-camp-app sh", "docker:shell": "docker exec -it euchre-camp-app sh",
"version": "bun run scripts/bump-version.js", "version": "node scripts/bump-version.js",
"set-version": "bun run scripts/set-version.js", "set-version": "node scripts/set-version.js",
"version:patch": "bun run scripts/bump-version.js patch", "version:patch": "node scripts/bump-version.js patch",
"version:minor": "bun run scripts/bump-version.js minor", "version:minor": "node scripts/bump-version.js minor",
"version:major": "bun run scripts/bump-version.js major", "version:major": "node scripts/bump-version.js major",
"docker:build:push": "bun run scripts/build-and-push-docker.js", "docker:build:push": "node scripts/build-and-push-docker.js",
"docker:compose:generate": "bun run scripts/generate-docker-compose.js", "docker:compose:generate": "node scripts/generate-docker-compose.js",
"release": "bun run version:patch && bun run docker:compose:generate && bun run docker:build:push" "release": "npm run version:patch && npm run docker:compose:generate && npm run docker:build:push"
}, },
"dependencies": { "dependencies": {
"@hookform/resolvers": "^5.2.2", "@hookform/resolvers": "^5.2.2",
@@ -62,15 +55,12 @@
"zod": "^4.3.6" "zod": "^4.3.6"
}, },
"devDependencies": { "devDependencies": {
"@cucumber/cucumber": "^12.8.2",
"@playwright/test": "^1.58.2", "@playwright/test": "^1.58.2",
"@tailwindcss/postcss": "^4", "@tailwindcss/postcss": "^4",
"@testing-library/jest-dom": "^6.9.1", "@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^16.3.2", "@testing-library/react": "^16.3.2",
"@testing-library/user-event": "^14.6.1", "@testing-library/user-event": "^14.6.1",
"@types/bcrypt": "^6.0.0", "@types/bcrypt": "^6.0.0",
"@types/bun": "^1.3.11",
"@types/jsdom": "^28.0.1",
"@types/node": "^20", "@types/node": "^20",
"@types/papaparse": "^5.5.2", "@types/papaparse": "^5.5.2",
"@types/pg": "^8.20.0", "@types/pg": "^8.20.0",
@@ -78,12 +68,10 @@
"@types/react-dom": "^19.2.3", "@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "^6.0.1", "@vitejs/plugin-react": "^6.0.1",
"argon2": "^0.44.0", "argon2": "^0.44.0",
"cucumber-pretty": "^6.0.1", "eslint": "^10.1.0",
"eslint": "^8.57.0",
"eslint-config-next": "^16.2.1", "eslint-config-next": "^16.2.1",
"jsdom": "^29.0.1", "jsdom": "^29.0.1",
"tailwindcss": "^4", "tailwindcss": "^4",
"tsx": "^4.21.0",
"typescript": "^5", "typescript": "^5",
"vitest": "^4.1.2" "vitest": "^4.1.2"
} }
+2 -2
View File
@@ -1,7 +1,7 @@
import { defineConfig, devices } from '@playwright/test'; import { defineConfig, devices } from '@playwright/test';
export default defineConfig({ export default defineConfig({
testDir: './e2e', testDir: './src/__tests__/e2e',
timeout: 30000, timeout: 30000,
expect: { expect: {
timeout: 5000 timeout: 5000
@@ -17,7 +17,7 @@ export default defineConfig({
// Reporter to use // Reporter to use
reporter: 'html', reporter: 'html',
// Global setup and teardown // Global setup and teardown
globalSetup: require.resolve('./e2e/global.setup'), globalSetup: require.resolve('./src/__tests__/e2e/global.setup'),
// Use base URL for relative navigation // Use base URL for relative navigation
use: { use: {
baseURL: 'http://localhost:3000', baseURL: 'http://localhost:3000',
+9 -27
View File
@@ -48,22 +48,14 @@ function getCommitsSinceLastTag() {
if (!latestTag) { if (!latestTag) {
// No tags yet, get all commits // No tags yet, get all commits
const commits = execSync('git log --oneline --format=%s', { encoding: 'utf8' }).trim(); return execSync('git log --oneline --format=%s', { encoding: 'utf8' }).trim().split('\n');
return commits ? commits.split('\n') : [];
} }
const commits = execSync(`git log ${latestTag}..HEAD --oneline --format=%s`, { encoding: 'utf8' }).trim(); const commits = execSync(`git log ${latestTag}..HEAD --oneline --format=%s`, { encoding: 'utf8' }).trim();
return commits ? commits.split('\n') : []; return commits ? commits.split('\n') : [];
} catch (error) { } catch (error) {
// If no commits since tag or other error, get recent commits // If no commits since tag or other error, get recent commits
try { return execSync('git log --oneline --format=%s -n 20', { encoding: 'utf8' }).trim().split('\n');
const commits = execSync('git log --oneline --format=%s -n 20', { encoding: 'utf8' }).trim();
return commits ? commits.split('\n') : [];
} catch (innerError) {
// If all git log attempts fail, return empty array
console.warn('Warning: Could not retrieve commit history, defaulting to patch version');
return [];
}
} }
} }
@@ -183,20 +175,7 @@ function main() {
console.log(`New version: ${currentVersion}${newVersion}`); console.log(`New version: ${currentVersion}${newVersion}`);
} }
// Confirm with user (or skip if --yes flag is set) // Confirm with user
if (skipConfirm) {
// Update package.json
updatePackageJson(newVersion);
// Update changelog
if (bumpType !== 'custom') {
const commits = getCommitsSinceLastTag();
updateChangelog(newVersion, commits, bumpType);
}
console.log(`\n✅ Version bumped to ${newVersion}`);
process.exit(0);
} else {
const readline = require('readline'); const readline = require('readline');
const rl = readline.createInterface({ const rl = readline.createInterface({
input: process.stdin, input: process.stdin,
@@ -215,15 +194,18 @@ function main() {
} }
console.log(`\n✅ Version bumped to ${newVersion}`); console.log(`\n✅ Version bumped to ${newVersion}`);
process.exit(0); console.log(`\nNext steps:`);
console.log(` 1. Review changes: git diff`);
console.log(` 2. Commit changes: git commit -am "chore: bump version to v${newVersion}"`);
console.log(` 3. Create tag: git tag -a v${newVersion} -m "Release v${newVersion}"`);
console.log(` 4. Push changes: git push origin main`);
console.log(` 5. Push tag: git push origin v${newVersion}`);
} else { } else {
console.log('❌ Version bump cancelled'); console.log('❌ Version bump cancelled');
process.exit(1);
} }
rl.close(); rl.close();
}); });
}
} }
// Run main function // Run main function
+1 -1
View File
@@ -12,7 +12,7 @@ const path = require('path');
const { execSync } = require('child_process'); const { execSync } = require('child_process');
// Configuration // Configuration
const REGISTRY = 'docker.notsosm.art'; const REGISTRY = 'euchre-camp';
const IMAGE_NAME = 'euchre-camp'; const IMAGE_NAME = 'euchre-camp';
// Get current version from package.json // Get current version from package.json
-15
View File
@@ -1,15 +0,0 @@
#!/bin/bash
# Run tests in a Node.js container (for consistent environment)
set -e
echo "Running tests in node:20-alpine container..."
echo "This avoids Node.js setup time and ensures consistent environment."
echo ""
# Run unit tests in container
docker run --rm \
-v "$(pwd):/app" \
-w /app \
node:20-alpine \
sh -c "apk add --no-cache bash git && npm ci && npm run test:run"
+7 -8
View File
@@ -1,25 +1,25 @@
import { describe, it, expect, mock, beforeEach } from 'bun:test' import { describe, it, expect, vi, beforeEach, MockedFunction } from 'vitest'
import { render, screen, waitFor } from '@testing-library/react' import { render, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event' import userEvent from '@testing-library/user-event'
import EditTournamentForm from '@/components/EditTournamentForm' import EditTournamentForm from '@/components/EditTournamentForm'
// Mock next/navigation // Mock next/navigation
mock.module('next/navigation', () => ({ vi.mock('next/navigation', () => ({
useRouter: () => ({ useRouter: () => ({
push: mock(() => {}), push: vi.fn(),
}), }),
})) }))
// Mock next/link // Mock next/link
mock.module('next/link', () => ({ vi.mock('next/link', () => ({
default: ({ children, href }: { children: React.ReactNode; href: string }) => ( default: ({ children, href }: { children: React.ReactNode; href: string }) => (
<a href={href}>{children}</a> <a href={href}>{children}</a>
), ),
})) }))
// Mock fetch // Mock fetch
const mockFetch = mock(async () => new Response()) const mockFetch = vi.fn()
global.fetch = mockFetch as any global.fetch = mockFetch as MockedFunction<typeof global.fetch>
const mockTournament = { const mockTournament = {
id: 1, id: 1,
@@ -40,8 +40,7 @@ const mockTournament = {
describe('EditTournamentForm', () => { describe('EditTournamentForm', () => {
beforeEach(() => { beforeEach(() => {
// Only clear the specific mocks we create, not global module mocks vi.clearAllMocks()
mockFetch.mockClear()
}) })
it('renders form with initial values', () => { it('renders form with initial values', () => {
+26 -36
View File
@@ -5,40 +5,31 @@
* Tests the navigation component for proper display based on session state * Tests the navigation component for proper display based on session state
*/ */
import { describe, it, expect, mock, beforeEach, afterEach } from 'bun:test' import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
import { render, screen, waitFor } from '@testing-library/react' import { render, screen, waitFor } from '@testing-library/react'
import Navigation from '@/components/Navigation' 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 // Mock the SessionProvider
mock.module('@/components/SessionProvider', () => ({ vi.mock('@/components/SessionProvider', () => ({
useSession: mock(() => ({ session: null, loading: false, refreshSession: mock(() => {}) })), useSession: vi.fn(),
})) }))
// Mock the auth-client // Mock the auth-client
mock.module('@/lib/auth-client', () => ({ vi.mock('@/lib/auth-client', () => ({
authClient: { authClient: {
signOut: mock(() => {}), signOut: vi.fn(),
}, },
})) }))
// Mock fetch for role API call // Mock fetch for role API call
global.fetch = mock(async () => new Response()) as any global.fetch = vi.fn()
import { useSession as useSessionOriginal } from '@/components/SessionProvider' import { useSession } from '@/components/SessionProvider'
const useSession = useSessionOriginal as any
describe('Epic 1: Navigation Component', () => { describe('Epic 1: Navigation Component', () => {
beforeEach(() => { beforeEach(() => {
// Don't clear all mocks as it might affect bun-setup.ts vi.clearAllMocks()
// Set up default fetch mock vi.mocked(global.fetch).mockImplementation(async (url) => {
(global.fetch as any).mockImplementation?.(async (url: any) => {
if (url?.toString().includes('/api/users/')) { if (url?.toString().includes('/api/users/')) {
return new Response(JSON.stringify({ role: 'player' }), { return new Response(JSON.stringify({ role: 'player' }), {
status: 200, status: 200,
@@ -50,15 +41,14 @@ describe('Epic 1: Navigation Component', () => {
}) })
afterEach(() => { afterEach(() => {
// Don't clear mocks - let them persist for other test files vi.restoreAllMocks()
// Navigation relies on module mocks set up at file level
}) })
it('renders the logo and basic links when not logged in', () => { it('renders the logo and basic links when not logged in', () => {
(useSession).mockReturnValue({ vi.mocked(useSession).mockReturnValue({
session: null, session: null,
loading: false, loading: false,
refreshSession: mock(() => {}), refreshSession: vi.fn(),
}) })
render(<Navigation />) render(<Navigation />)
@@ -70,7 +60,7 @@ describe('Epic 1: Navigation Component', () => {
}) })
it('shows user menu when logged in', async () => { it('shows user menu when logged in', async () => {
(useSession).mockReturnValue({ vi.mocked(useSession).mockReturnValue({
session: { session: {
user: { user: {
id: 'user-123', id: 'user-123',
@@ -81,7 +71,7 @@ describe('Epic 1: Navigation Component', () => {
session: { token: 'abc123' }, session: { token: 'abc123' },
}, },
loading: false, loading: false,
refreshSession: mock(() => {}), refreshSession: vi.fn(),
}) })
render(<Navigation />) render(<Navigation />)
@@ -95,7 +85,7 @@ describe('Epic 1: Navigation Component', () => {
}) })
it('shows Tournaments link when logged in', async () => { it('shows Tournaments link when logged in', async () => {
(useSession).mockReturnValue({ vi.mocked(useSession).mockReturnValue({
session: { session: {
user: { user: {
id: 'user-123', id: 'user-123',
@@ -106,7 +96,7 @@ describe('Epic 1: Navigation Component', () => {
session: { token: 'abc123' }, session: { token: 'abc123' },
}, },
loading: false, loading: false,
refreshSession: mock(() => {}), refreshSession: vi.fn(),
}) })
render(<Navigation />) render(<Navigation />)
@@ -117,7 +107,7 @@ describe('Epic 1: Navigation Component', () => {
}) })
it('shows admin link for club_admin role', async () => { it('shows admin link for club_admin role', async () => {
(useSession).mockReturnValue({ vi.mocked(useSession).mockReturnValue({
session: { session: {
user: { user: {
id: 'admin-123', id: 'admin-123',
@@ -128,11 +118,11 @@ describe('Epic 1: Navigation Component', () => {
session: { token: 'abc123' }, session: { token: 'abc123' },
}, },
loading: false, loading: false,
refreshSession: mock(() => {}), refreshSession: vi.fn(),
}); })
// Mock fetch to return club_admin role // Mock fetch to return club_admin role
(global.fetch as any).mockImplementation(async (url: any) => { vi.mocked(global.fetch).mockImplementation(async (url) => {
if (url?.toString().includes('/api/users/admin-123/role')) { if (url?.toString().includes('/api/users/admin-123/role')) {
return new Response(JSON.stringify({ role: 'club_admin' }), { return new Response(JSON.stringify({ role: 'club_admin' }), {
status: 200, status: 200,
@@ -151,7 +141,7 @@ describe('Epic 1: Navigation Component', () => {
}) })
it('hides admin link for non-admin users', async () => { it('hides admin link for non-admin users', async () => {
(useSession).mockReturnValue({ vi.mocked(useSession).mockReturnValue({
session: { session: {
user: { user: {
id: 'player-123', id: 'player-123',
@@ -162,11 +152,11 @@ describe('Epic 1: Navigation Component', () => {
session: { token: 'abc123' }, session: { token: 'abc123' },
}, },
loading: false, loading: false,
refreshSession: mock(() => {}), refreshSession: vi.fn(),
}); })
// Mock fetch to return player role (already set in beforeEach, but explicit here) // Mock fetch to return player role (already set in beforeEach, but explicit here)
(global.fetch as any).mockImplementation(async (url: any) => { vi.mocked(global.fetch).mockImplementation(async (url) => {
if (url?.toString().includes('/api/users/')) { if (url?.toString().includes('/api/users/')) {
return { return {
json: () => Promise.resolve({ role: 'player' }), json: () => Promise.resolve({ role: 'player' }),
@@ -186,10 +176,10 @@ describe('Epic 1: Navigation Component', () => {
}) })
it('shows loading state', () => { it('shows loading state', () => {
(useSession).mockReturnValue({ vi.mocked(useSession).mockReturnValue({
session: null, session: null,
loading: true, loading: true,
refreshSession: mock(() => {}), refreshSession: vi.fn(),
}) })
render(<Navigation />) render(<Navigation />)
+13 -13
View File
@@ -1,23 +1,23 @@
import { describe, it, expect, mock, beforeEach } from 'bun:test' import { describe, it, expect, vi, beforeEach, MockedFunction } from 'vitest'
import { getSession } from '@/lib/auth-simple' import { getSession } from '@/lib/auth-simple'
// Mock next/headers // Mock next/headers
mock.module('next/headers', () => ({ vi.mock('next/headers', () => ({
cookies: mock(() => Promise.resolve({ cookies: vi.fn().mockResolvedValue({
get: mock(() => ({ name: 'better-auth.session_token', value: 'test-token' })), get: vi.fn().mockReturnValue({ name: 'better-auth.session_token', value: 'test-token' }),
})), }),
headers: mock(() => Promise.resolve({ headers: vi.fn().mockResolvedValue({
get: mock(() => null), get: vi.fn().mockReturnValue(null),
})), }),
})) }))
// Mock fetch // Mock fetch
const mockFetch = mock(async () => new Response()) const mockFetch = vi.fn()
global.fetch = mockFetch as any global.fetch = mockFetch as MockedFunction<typeof global.fetch>
describe('getSession', () => { describe('getSession', () => {
beforeEach(() => { beforeEach(() => {
mock.clearAllMocks() vi.clearAllMocks()
}) })
it('returns session data when auth API returns 200', async () => { it('returns session data when auth API returns 200', async () => {
@@ -26,7 +26,7 @@ describe('getSession', () => {
user: { id: 'user-123', email: 'test@example.com' }, user: { id: 'user-123', email: 'test@example.com' },
} }
mockFetch.mockImplementation(async () => mockFetch.mockResolvedValue(
new Response(JSON.stringify(mockSession), { status: 200 }) new Response(JSON.stringify(mockSession), { status: 200 })
) )
@@ -37,7 +37,7 @@ describe('getSession', () => {
}) })
it('returns null when auth API returns non-200 status', async () => { it('returns null when auth API returns non-200 status', async () => {
mockFetch.mockImplementation(async () => mockFetch.mockResolvedValue(
new Response(null, { status: 401 }) new Response(null, { status: 401 })
) )
-40
View File
@@ -1,40 +0,0 @@
// 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 = '';
}
});
@@ -79,7 +79,7 @@ test.describe('CSV Upload Player Deduplication', () => {
formData.append('eventId', testTournamentId.toString()); formData.append('eventId', testTournamentId.toString());
const response = await request.post('http://localhost:3000/api/matches/upload', { const response = await request.post('http://localhost:3000/api/matches/upload', {
multipart: formData, data: formData,
}); });
expect(response.ok()).toBeTruthy(); expect(response.ok()).toBeTruthy();
@@ -133,7 +133,7 @@ test.describe('CSV Upload Player Deduplication', () => {
formData.append('eventId', testTournamentId.toString()); formData.append('eventId', testTournamentId.toString());
const response = await request.post('http://localhost:3000/api/matches/upload', { const response = await request.post('http://localhost:3000/api/matches/upload', {
multipart: formData, data: formData,
}); });
expect(response.ok()).toBeTruthy(); expect(response.ok()).toBeTruthy();
@@ -190,7 +190,7 @@ test.describe('CSV Upload Player Deduplication', () => {
formData.append('eventId', testTournamentId.toString()); formData.append('eventId', testTournamentId.toString());
const response = await request.post('http://localhost:3000/api/matches/upload', { const response = await request.post('http://localhost:3000/api/matches/upload', {
multipart: formData, data: formData,
}); });
expect(response.ok()).toBeTruthy(); expect(response.ok()).toBeTruthy();
@@ -41,7 +41,7 @@ test.describe('Tournament Edit - allowTies functionality', () => {
} }
}); });
test('should display allowTies checkbox on edit form @chromium-admin', async ({ page }) => { test('should display allowTies checkbox on edit form', async ({ page }) => {
// Navigate to tournament edit page // Navigate to tournament edit page
await page.goto(`/admin/tournaments/${tournamentId}/edit`); await page.goto(`/admin/tournaments/${tournamentId}/edit`);
@@ -54,7 +54,7 @@ test.describe('Tournament Edit - allowTies functionality', () => {
await expect(allowTiesCheckbox).not.toBeChecked(); await expect(allowTiesCheckbox).not.toBeChecked();
}); });
test('should save allowTies when toggled to true @chromium-admin', async ({ page }) => { test('should save allowTies when toggled to true', async ({ page }) => {
// Navigate to tournament edit page // Navigate to tournament edit page
await page.goto(`/admin/tournaments/${tournamentId}/edit`); await page.goto(`/admin/tournaments/${tournamentId}/edit`);
@@ -80,7 +80,7 @@ test.describe('Tournament Edit - allowTies functionality', () => {
expect(updatedTournament?.allowTies).toBe(true); expect(updatedTournament?.allowTies).toBe(true);
}); });
test('should save allowTies when toggled to false @chromium-admin', async ({ page }) => { test('should save allowTies when toggled to false', async ({ page }) => {
// First, set allowTies to true // First, set allowTies to true
await prisma.event.update({ await prisma.event.update({
where: { id: tournamentId }, where: { id: tournamentId },
-12
View File
@@ -1,12 +0,0 @@
/// <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
> {}
}
+1 -1
View File
@@ -4,7 +4,7 @@
* Tests the mathematical correctness of Elo calculations and rating updates * Tests the mathematical correctness of Elo calculations and rating updates
*/ */
import { describe, test, expect } from 'bun:test'; import { describe, test, expect } from 'vitest';
import { calculateEloChange, calculateExpectedScore, calculateTeamElo } from '@/lib/elo-utils'; import { calculateEloChange, calculateExpectedScore, calculateTeamElo } from '@/lib/elo-utils';
describe('Elo Rating System', () => { describe('Elo Rating System', () => {
+1 -1
View File
@@ -4,7 +4,7 @@
* Tests for ID parsing and validation in API routes and pages * Tests for ID parsing and validation in API routes and pages
*/ */
import { describe, test, expect } from 'bun:test'; import { describe, test, expect } from 'vitest';
describe('ID Validation', () => { describe('ID Validation', () => {
describe('parseInt with validation', () => { describe('parseInt with validation', () => {
+39 -51
View File
@@ -4,33 +4,12 @@
* Tests the permission system for tournament management * Tests the permission system for tournament management
*/ */
import { describe, test, expect, mock, beforeEach } from 'bun:test'; import { describe, test, expect, vi } from 'vitest';
import { hasRole, canManageTournament, canCreateTournaments } from '@/lib/permissions'; import { hasRole, canManageTournament, canCreateTournaments } from '@/lib/permissions';
import { getSession } from '@/lib/auth-simple'; import { getSession } from '@/lib/auth-simple';
import { prisma } from '@/lib/prisma'; import { prisma } from '@/lib/prisma';
import type { User } from '@prisma/client'; 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 // Helper to create mock user
const createMockUser = (id: string, email: string, role: string): User => ({ const createMockUser = (id: string, email: string, role: string): User => ({
id, id,
@@ -44,21 +23,30 @@ const createMockUser = (id: string, email: string, role: string): User => ({
updatedAt: new Date(), updatedAt: new Date(),
}); });
describe('Permissions', () => { // Mock the getSession and prisma functions
beforeEach(() => { vi.mock('@/lib/auth-simple', () => ({
// Reset mock implementations to default (no-op) before each test getSession: vi.fn(),
getSessionMock.mockImplementation(() => undefined); }));
userFindUniqueMock.mockImplementation(() => undefined);
eventFindUniqueMock.mockImplementation(() => undefined);
});
vi.mock('@/lib/prisma', () => ({
prisma: {
user: {
findUnique: vi.fn(),
},
event: {
findUnique: vi.fn(),
},
},
}));
describe('Permissions', () => {
describe('hasRole', () => { describe('hasRole', () => {
test('should allow club_admin to access tournament_admin resources', async () => { test('should allow club_admin to access tournament_admin resources', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: '1', email: 'test@example.com' }, user: { id: '1', email: 'test@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('1', 'test@example.com', 'club_admin') createMockUser('1', 'test@example.com', 'club_admin')
); );
@@ -67,11 +55,11 @@ describe('Permissions', () => {
}); });
test('should deny player from accessing tournament_admin resources', async () => { test('should deny player from accessing tournament_admin resources', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: '1', email: 'test@example.com' }, user: { id: '1', email: 'test@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('1', 'test@example.com', 'player') createMockUser('1', 'test@example.com', 'player')
); );
@@ -80,7 +68,7 @@ describe('Permissions', () => {
}); });
test('should deny unauthenticated user', async () => { test('should deny unauthenticated user', async () => {
getSessionMock.mockImplementation(async () => null); vi.mocked(getSession).mockResolvedValue(null);
const result = await hasRole('club_admin'); const result = await hasRole('club_admin');
expect(result.allowed).toBe(false); expect(result.allowed).toBe(false);
@@ -90,11 +78,11 @@ describe('Permissions', () => {
describe('canManageTournament', () => { describe('canManageTournament', () => {
test('should allow club_admin to manage any tournament', async () => { test('should allow club_admin to manage any tournament', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'admin-1', email: 'admin@example.com' }, user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('admin-1', 'admin@example.com', 'club_admin') createMockUser('admin-1', 'admin@example.com', 'club_admin')
); );
@@ -103,11 +91,11 @@ describe('Permissions', () => {
}); });
test('should deny player from managing tournaments', async () => { test('should deny player from managing tournaments', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'player-1', email: 'player@example.com' }, user: { id: 'player-1', email: 'player@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('player-1', 'player@example.com', 'player') createMockUser('player-1', 'player@example.com', 'player')
); );
@@ -119,11 +107,11 @@ describe('Permissions', () => {
describe('canCreateTournaments', () => { describe('canCreateTournaments', () => {
test('should allow tournament_admin to create tournaments', async () => { test('should allow tournament_admin to create tournaments', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'admin-1', email: 'admin@example.com' }, user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('admin-1', 'admin@example.com', 'tournament_admin') createMockUser('admin-1', 'admin@example.com', 'tournament_admin')
); );
@@ -132,11 +120,11 @@ describe('Permissions', () => {
}); });
test('should allow club_admin to create tournaments', async () => { test('should allow club_admin to create tournaments', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'admin-1', email: 'admin@example.com' }, user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('admin-1', 'admin@example.com', 'club_admin') createMockUser('admin-1', 'admin@example.com', 'club_admin')
); );
@@ -145,11 +133,11 @@ describe('Permissions', () => {
}); });
test('should deny player from creating tournaments', async () => { test('should deny player from creating tournaments', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'player-1', email: 'player@example.com' }, user: { id: 'player-1', email: 'player@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('player-1', 'player@example.com', 'player') createMockUser('player-1', 'player@example.com', 'player')
); );
+18 -24
View File
@@ -4,19 +4,15 @@
* Tests the player deduplication logic for CSV uploads * Tests the player deduplication logic for CSV uploads
*/ */
import { describe, test, expect, mock, beforeEach,} from 'bun:test'; import { describe, test, expect, vi, beforeEach } from 'vitest';
import { prisma } from '@/lib/prisma'; import { prisma } from '@/lib/prisma';
// Create mock functions at module level
const playerFindFirstMock = mock(() => {});
const playerCreateMock = mock(() => {});
// Mock the prisma module // Mock the prisma module
mock.module('@/lib/prisma', () => ({ vi.mock('@/lib/prisma', () => ({
prisma: { prisma: {
player: { player: {
findFirst: playerFindFirstMock, findFirst: vi.fn(),
create: playerCreateMock, create: vi.fn(),
}, },
}, },
})); }));
@@ -50,9 +46,7 @@ async function findOrCreatePlayer(name: string) {
describe('Player Deduplication', () => { describe('Player Deduplication', () => {
beforeEach(() => { beforeEach(() => {
// Clear all mock history before each test vi.clearAllMocks();
playerFindFirstMock.mockClear();
playerCreateMock.mockClear();
}); });
describe('findOrCreatePlayer', () => { describe('findOrCreatePlayer', () => {
@@ -70,7 +64,7 @@ describe('Player Deduplication', () => {
rating: 0, rating: 0,
}; };
playerFindFirstMock.mockImplementation(async () => mockPlayer); vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
const result = await findOrCreatePlayer('Emily'); const result = await findOrCreatePlayer('Emily');
@@ -95,7 +89,7 @@ describe('Player Deduplication', () => {
rating: 0, rating: 0,
}; };
playerFindFirstMock.mockImplementation(async () => mockPlayer); vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
const result = await findOrCreatePlayer('EMILY'); const result = await findOrCreatePlayer('EMILY');
@@ -120,7 +114,7 @@ describe('Player Deduplication', () => {
rating: 0, rating: 0,
}; };
playerFindFirstMock.mockImplementation(async () => mockPlayer); vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
const result = await findOrCreatePlayer(' Emily '); const result = await findOrCreatePlayer(' Emily ');
@@ -132,7 +126,7 @@ describe('Player Deduplication', () => {
}); });
test('should create new player if not found', async () => { test('should create new player if not found', async () => {
playerFindFirstMock.mockImplementation(async () => null); vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
const newPlayer = { const newPlayer = {
id: 100, id: 100,
@@ -147,7 +141,7 @@ describe('Player Deduplication', () => {
updatedAt: new Date(), updatedAt: new Date(),
}; };
playerCreateMock.mockImplementation(async () => newPlayer); vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
const result = await findOrCreatePlayer('NewPlayer'); const result = await findOrCreatePlayer('NewPlayer');
@@ -168,7 +162,7 @@ describe('Player Deduplication', () => {
}); });
test('should handle names with special characters', async () => { test('should handle names with special characters', async () => {
playerFindFirstMock.mockImplementation(async () => null); vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
const newPlayer = { const newPlayer = {
id: 100, id: 100,
@@ -183,7 +177,7 @@ describe('Player Deduplication', () => {
updatedAt: new Date(), updatedAt: new Date(),
}; };
playerCreateMock.mockImplementation(async () => newPlayer); vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
const result = await findOrCreatePlayer('Test-Player_123'); const result = await findOrCreatePlayer('Test-Player_123');
@@ -201,7 +195,7 @@ describe('Player Deduplication', () => {
}); });
test('should handle names with spaces', async () => { test('should handle names with spaces', async () => {
playerFindFirstMock.mockImplementation(async () => null); vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
const newPlayer = { const newPlayer = {
id: 100, id: 100,
@@ -216,7 +210,7 @@ describe('Player Deduplication', () => {
updatedAt: new Date(), updatedAt: new Date(),
}; };
playerCreateMock.mockImplementation(async () => newPlayer); vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
const result = await findOrCreatePlayer('Dave B'); const result = await findOrCreatePlayer('Dave B');
@@ -248,7 +242,7 @@ describe('Player Deduplication', () => {
rating: 0, rating: 0,
}; };
playerFindFirstMock.mockImplementation(async () => mockPlayer); vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
const result1 = await findOrCreatePlayer('EMILY'); const result1 = await findOrCreatePlayer('EMILY');
const result2 = await findOrCreatePlayer('Emily'); const result2 = await findOrCreatePlayer('Emily');
@@ -261,7 +255,7 @@ describe('Player Deduplication', () => {
}); });
test('should handle empty or whitespace-only names', async () => { test('should handle empty or whitespace-only names', async () => {
playerFindFirstMock.mockImplementation(async () => null); vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
const newPlayer = { const newPlayer = {
id: 100, id: 100,
@@ -276,7 +270,7 @@ describe('Player Deduplication', () => {
updatedAt: new Date(), updatedAt: new Date(),
}; };
playerCreateMock.mockImplementation(async () => newPlayer); vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
const result = await findOrCreatePlayer(' '); const result = await findOrCreatePlayer(' ');
@@ -326,7 +320,7 @@ describe('Player Deduplication', () => {
rating: 0, rating: 0,
}; };
playerFindFirstMock vi.mocked(prisma.player.findFirst)
.mockResolvedValueOnce(existingPlayer) // First call for "Emily" .mockResolvedValueOnce(existingPlayer) // First call for "Emily"
.mockResolvedValueOnce(existingPlayer) // Second call for "EMILY" .mockResolvedValueOnce(existingPlayer) // Second call for "EMILY"
.mockResolvedValueOnce(existingPlayer); // Third call for " Emily " .mockResolvedValueOnce(existingPlayer); // Third call for " Emily "
+19 -29
View File
@@ -7,30 +7,24 @@
* - Partnership performance * - Partnership performance
*/ */
import { describe, test, expect, mock, beforeEach } from 'bun:test'; import { describe, test, expect, vi, beforeEach } from 'vitest';
import { prisma } from '@/lib/prisma'; import { prisma } from '@/lib/prisma';
import type { Player, Event, Match, PartnershipStat } from '@prisma/client'; 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 // Mock the prisma module
mock.module('@/lib/prisma', () => ({ vi.mock('@/lib/prisma', () => ({
prisma: { prisma: {
player: { player: {
findUnique: playerFindUniqueMock, findUnique: vi.fn(),
}, },
event: { event: {
findMany: eventFindManyMock, findMany: vi.fn(),
}, },
match: { match: {
findMany: matchFindManyMock, findMany: vi.fn(),
}, },
partnershipStat: { partnershipStat: {
findMany: partnershipStatFindManyMock, findMany: vi.fn(),
}, },
}, },
})); }));
@@ -117,11 +111,7 @@ const createMockPartnershipStat = (
describe('Player Profile Enhancements', () => { describe('Player Profile Enhancements', () => {
beforeEach(() => { beforeEach(() => {
// Reset mock implementations to default (no-op) before each test vi.clearAllMocks();
playerFindUniqueMock.mockImplementation(() => undefined);
eventFindManyMock.mockImplementation(() => undefined);
matchFindManyMock.mockImplementation(() => undefined);
partnershipStatFindManyMock.mockImplementation(() => undefined);
}); });
describe('Tournaments Participated', () => { describe('Tournaments Participated', () => {
@@ -132,8 +122,8 @@ describe('Player Profile Enhancements', () => {
createMockTournament(2, 'Tournament B'), createMockTournament(2, 'Tournament B'),
]; ];
playerFindUniqueMock.mockImplementation(async () => mockPlayer); vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
eventFindManyMock.mockImplementation(async () => mockTournaments); vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
// Simulate the query that would be run // Simulate the query that would be run
const tournaments = await prisma.event.findMany({ const tournaments = await prisma.event.findMany({
@@ -155,8 +145,8 @@ describe('Player Profile Enhancements', () => {
test('should return empty array if player has no tournaments', async () => { test('should return empty array if player has no tournaments', async () => {
const mockPlayer = createMockPlayer(1, 'Test Player'); const mockPlayer = createMockPlayer(1, 'Test Player');
playerFindUniqueMock.mockImplementation(async () => mockPlayer); vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
eventFindManyMock.mockImplementation(async () => []); vi.mocked(prisma.event.findMany).mockResolvedValue([]);
const tournaments = await prisma.event.findMany({ const tournaments = await prisma.event.findMany({
where: { where: {
@@ -183,8 +173,8 @@ describe('Player Profile Enhancements', () => {
createMockMatch(2, 1, 3, 5, 6, 4, 4), createMockMatch(2, 1, 3, 5, 6, 4, 4),
]; ];
playerFindUniqueMock.mockImplementation(async () => mockPlayer); vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
matchFindManyMock.mockImplementation(async () => mockMatches); vi.mocked(prisma.match.findMany).mockResolvedValue(mockMatches);
// Simulate the query that would be run // Simulate the query that would be run
const matches = await prisma.match.findMany({ const matches = await prisma.match.findMany({
@@ -214,8 +204,8 @@ describe('Player Profile Enhancements', () => {
test('should return empty array if player has no matches', async () => { test('should return empty array if player has no matches', async () => {
const mockPlayer = createMockPlayer(1, 'Test Player'); const mockPlayer = createMockPlayer(1, 'Test Player');
playerFindUniqueMock.mockImplementation(async () => mockPlayer); vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
matchFindManyMock.mockImplementation(async () => []); vi.mocked(prisma.match.findMany).mockResolvedValue([]);
const matches = await prisma.match.findMany({ const matches = await prisma.match.findMany({
where: { where: {
@@ -250,8 +240,8 @@ describe('Player Profile Enhancements', () => {
createMockPartnershipStat(2, 1, 3, 5, 2, 3), createMockPartnershipStat(2, 1, 3, 5, 2, 3),
]; ];
playerFindUniqueMock.mockImplementation(async () => mockPlayer); vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
partnershipStatFindManyMock.mockImplementation(async () => mockPartnershipStats); vi.mocked(prisma.partnershipStat.findMany).mockResolvedValue(mockPartnershipStats);
// Simulate the query that would be run // Simulate the query that would be run
const partnershipStats = await prisma.partnershipStat.findMany({ const partnershipStats = await prisma.partnershipStat.findMany({
@@ -275,8 +265,8 @@ describe('Player Profile Enhancements', () => {
test('should return empty array if player has no partnership data', async () => { test('should return empty array if player has no partnership data', async () => {
const mockPlayer = createMockPlayer(1, 'Test Player'); const mockPlayer = createMockPlayer(1, 'Test Player');
playerFindUniqueMock.mockImplementation(async () => mockPlayer); vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
partnershipStatFindManyMock.mockImplementation(async () => []); vi.mocked(prisma.partnershipStat.findMany).mockResolvedValue([]);
const partnershipStats = await prisma.partnershipStat.findMany({ const partnershipStats = await prisma.partnershipStat.findMany({
where: { where: {
+11 -11
View File
@@ -5,33 +5,33 @@
*/ */
/* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-explicit-any */
import { describe, test, expect, beforeEach, mock } from 'bun:test'; import { describe, test, expect, beforeEach, vi } from 'vitest';
import { recalculateAllElo } from '@/lib/elo-utils'; import { recalculateAllElo } from '@/lib/elo-utils';
// Mock Prisma client // Mock Prisma client
const mockPrisma = { const mockPrisma = {
player: { player: {
updateMany: mock(() => {}).mockResolvedValue({ count: 0 }), updateMany: vi.fn().mockResolvedValue({ count: 0 }),
update: mock(() => {}).mockResolvedValue({}), update: vi.fn().mockResolvedValue({}),
}, },
eloSnapshot: { eloSnapshot: {
deleteMany: mock(() => {}).mockResolvedValue({ count: 0 }), deleteMany: vi.fn().mockResolvedValue({ count: 0 }),
create: mock(() => {}).mockResolvedValue({}), create: vi.fn().mockResolvedValue({}),
}, },
partnershipStat: { partnershipStat: {
deleteMany: mock(() => {}).mockResolvedValue({ count: 0 }), deleteMany: vi.fn().mockResolvedValue({ count: 0 }),
findFirst: mock(() => {}).mockResolvedValue(null), // No existing stats initially findFirst: vi.fn().mockResolvedValue(null), // No existing stats initially
update: mock(() => {}).mockResolvedValue({}), update: vi.fn().mockResolvedValue({}),
create: mock(() => {}).mockResolvedValue({}), create: vi.fn().mockResolvedValue({}),
}, },
match: { match: {
findMany: mock(() => {}).mockResolvedValue([]), findMany: vi.fn().mockResolvedValue([]),
}, },
}; };
describe('recalculateAllElo', () => { describe('recalculateAllElo', () => {
beforeEach(() => { beforeEach(() => {
mock.clearAllMocks(); vi.clearAllMocks();
}); });
test('should reset all player stats to zero', async () => { test('should reset all player stats to zero', async () => {
@@ -5,31 +5,25 @@
* Regression tests for the issue where tournament_admin users were redirected to login * Regression tests for the issue where tournament_admin users were redirected to login
*/ */
import { describe, test, expect, mock, beforeEach } from 'bun:test'; import { describe, test, expect, vi, beforeEach } from 'vitest';
import { canManageTournament, ownsTournament, getManageableTournaments } from '@/lib/permissions'; import { canManageTournament, ownsTournament, getManageableTournaments } from '@/lib/permissions';
import { getSession } from '@/lib/auth-simple'; import { getSession } from '@/lib/auth-simple';
import { prisma } from '@/lib/prisma'; import { prisma } from '@/lib/prisma';
import type { User, Event } from '@prisma/client'; 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 // Mock the getSession and prisma functions
mock.module('@/lib/auth-simple', () => ({ vi.mock('@/lib/auth-simple', () => ({
getSession: getSessionMock, getSession: vi.fn(),
})); }));
mock.module('@/lib/prisma', () => ({ vi.mock('@/lib/prisma', () => ({
prisma: { prisma: {
user: { user: {
findUnique: userFindUniqueMock, findUnique: vi.fn(),
}, },
event: { event: {
findUnique: eventFindUniqueMock, findUnique: vi.fn(),
findMany: eventFindManyMock, findMany: vi.fn(),
}, },
}, },
})); }));
@@ -67,21 +61,16 @@ const createMockTournament = (id: number, ownerId: string | null): Event => ({
describe('Tournament Permissions', () => { describe('Tournament Permissions', () => {
beforeEach(() => { beforeEach(() => {
// Reset mock implementations to default (no-op) before each test vi.clearAllMocks();
// This prevents pollution from previous tests
getSessionMock.mockImplementation(() => undefined);
userFindUniqueMock.mockImplementation(() => undefined);
eventFindUniqueMock.mockImplementation(() => undefined);
eventFindManyMock.mockImplementation(() => undefined);
}); });
describe('canManageTournament', () => { describe('canManageTournament', () => {
test('should allow club_admin to manage any tournament', async () => { test('should allow club_admin to manage any tournament', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'admin-1', email: 'admin@example.com' }, user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('admin-1', 'admin@example.com', 'club_admin') createMockUser('admin-1', 'admin@example.com', 'club_admin')
); );
@@ -90,14 +79,14 @@ describe('Tournament Permissions', () => {
}); });
test('should allow tournament_admin to manage their own tournament', async () => { test('should allow tournament_admin to manage their own tournament', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'tour-admin-1', email: 'tour@example.com' }, user: { id: 'tour-admin-1', email: 'tour@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin') createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
); );
eventFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.event.findUnique).mockResolvedValue(
createMockTournament(1, 'tour-admin-1') createMockTournament(1, 'tour-admin-1')
); );
@@ -106,14 +95,14 @@ describe('Tournament Permissions', () => {
}); });
test('should deny tournament_admin from managing other users tournaments', async () => { test('should deny tournament_admin from managing other users tournaments', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'tour-admin-1', email: 'tour@example.com' }, user: { id: 'tour-admin-1', email: 'tour@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin') createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
); );
eventFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.event.findUnique).mockResolvedValue(
createMockTournament(1, 'other-user-1') createMockTournament(1, 'other-user-1')
); );
@@ -123,11 +112,11 @@ describe('Tournament Permissions', () => {
}); });
test('should deny player from managing tournaments', async () => { test('should deny player from managing tournaments', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'player-1', email: 'player@example.com' }, user: { id: 'player-1', email: 'player@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('player-1', 'player@example.com', 'player') createMockUser('player-1', 'player@example.com', 'player')
); );
@@ -137,7 +126,7 @@ describe('Tournament Permissions', () => {
}); });
test('should deny unauthenticated user', async () => { test('should deny unauthenticated user', async () => {
getSessionMock.mockImplementation(async () => null); vi.mocked(getSession).mockResolvedValue(null);
const result = await canManageTournament(999); const result = await canManageTournament(999);
expect(result.allowed).toBe(false); expect(result.allowed).toBe(false);
@@ -147,11 +136,11 @@ describe('Tournament Permissions', () => {
describe('ownsTournament', () => { describe('ownsTournament', () => {
test('should return true if user owns tournament', async () => { test('should return true if user owns tournament', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'owner-1', email: 'owner@example.com' }, user: { id: 'owner-1', email: 'owner@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
eventFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.event.findUnique).mockResolvedValue(
createMockTournament(1, 'owner-1') createMockTournament(1, 'owner-1')
); );
@@ -160,11 +149,11 @@ describe('Tournament Permissions', () => {
}); });
test('should return false if user does not own tournament', async () => { test('should return false if user does not own tournament', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'non-owner-1', email: 'nonowner@example.com' }, user: { id: 'non-owner-1', email: 'nonowner@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
eventFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.event.findUnique).mockResolvedValue(
createMockTournament(1, 'owner-1') createMockTournament(1, 'owner-1')
); );
@@ -176,11 +165,11 @@ describe('Tournament Permissions', () => {
describe('getManageableTournaments', () => { describe('getManageableTournaments', () => {
test('should return all tournaments for club_admin', async () => { test('should return all tournaments for club_admin', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'admin-1', email: 'admin@example.com' }, user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('admin-1', 'admin@example.com', 'club_admin') createMockUser('admin-1', 'admin@example.com', 'club_admin')
); );
@@ -189,11 +178,11 @@ describe('Tournament Permissions', () => {
createMockTournament(2, 'user-2'), createMockTournament(2, 'user-2'),
createMockTournament(3, 'user-3'), createMockTournament(3, 'user-3'),
]; ];
eventFindManyMock.mockImplementation(async () => mockTournaments); vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
const result = await getManageableTournaments(); const result = await getManageableTournaments();
expect(result).toEqual(mockTournaments); expect(result).toEqual(mockTournaments);
expect(eventFindManyMock).toHaveBeenCalledWith({ expect(prisma.event.findMany).toHaveBeenCalledWith({
where: { eventType: 'tournament' }, where: { eventType: 'tournament' },
include: { participants: true }, include: { participants: true },
orderBy: { createdAt: 'desc' } orderBy: { createdAt: 'desc' }
@@ -201,11 +190,11 @@ describe('Tournament Permissions', () => {
}); });
test('should return only owned tournaments for tournament_admin', async () => { test('should return only owned tournaments for tournament_admin', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'tour-admin-1', email: 'tour@example.com' }, user: { id: 'tour-admin-1', email: 'tour@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin') createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
); );
@@ -213,11 +202,11 @@ describe('Tournament Permissions', () => {
createMockTournament(1, 'tour-admin-1'), createMockTournament(1, 'tour-admin-1'),
createMockTournament(2, 'tour-admin-1'), createMockTournament(2, 'tour-admin-1'),
]; ];
eventFindManyMock.mockImplementation(async () => mockTournaments); vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
const result = await getManageableTournaments(); const result = await getManageableTournaments();
expect(result).toEqual(mockTournaments); expect(result).toEqual(mockTournaments);
expect(eventFindManyMock).toHaveBeenCalledWith({ expect(prisma.event.findMany).toHaveBeenCalledWith({
where: { where: {
eventType: 'tournament', eventType: 'tournament',
ownerId: 'tour-admin-1' ownerId: 'tour-admin-1'
@@ -228,11 +217,11 @@ describe('Tournament Permissions', () => {
}); });
test('should return only non-draft tournaments for players', async () => { test('should return only non-draft tournaments for players', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'player-1', email: 'player@example.com' }, user: { id: 'player-1', email: 'player@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('player-1', 'player@example.com', 'player') createMockUser('player-1', 'player@example.com', 'player')
); );
@@ -240,11 +229,11 @@ describe('Tournament Permissions', () => {
createMockTournament(1, 'user-1'), createMockTournament(1, 'user-1'),
createMockTournament(2, 'user-2'), createMockTournament(2, 'user-2'),
]; ];
eventFindManyMock.mockImplementation(async () => mockTournaments); vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
const result = await getManageableTournaments(); const result = await getManageableTournaments();
expect(result).toEqual(mockTournaments); expect(result).toEqual(mockTournaments);
expect(eventFindManyMock).toHaveBeenCalledWith({ expect(prisma.event.findMany).toHaveBeenCalledWith({
where: { where: {
eventType: 'tournament', eventType: 'tournament',
status: { not: 'draft' } status: { not: 'draft' }
@@ -260,14 +249,14 @@ describe('Tournament Permissions', () => {
// This simulates the scenario where a tournament_admin user // This simulates the scenario where a tournament_admin user
// clicks "Edit" on a tournament they own // clicks "Edit" on a tournament they own
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'tour-admin-1', email: 'tour@example.com' }, user: { id: 'tour-admin-1', email: 'tour@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin') createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
); );
eventFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.event.findUnique).mockResolvedValue(
createMockTournament(1, 'tour-admin-1') createMockTournament(1, 'tour-admin-1')
); );
@@ -282,11 +271,11 @@ describe('Tournament Permissions', () => {
test('club_admin should still be able to manage any tournament', async () => { test('club_admin should still be able to manage any tournament', async () => {
// This ensures we didn't break the existing club_admin functionality // This ensures we didn't break the existing club_admin functionality
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'club-admin-1', email: 'club@example.com' }, user: { id: 'club-admin-1', email: 'club@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('club-admin-1', 'club@example.com', 'club_admin') createMockUser('club-admin-1', 'club@example.com', 'club_admin')
); );
@@ -297,16 +286,13 @@ describe('Tournament Permissions', () => {
test('players should still be denied from managing tournaments', async () => { test('players should still be denied from managing tournaments', async () => {
// This ensures we didn't accidentally grant players access // This ensures we didn't accidentally grant players access
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'player-1', email: 'player@example.com' }, user: { id: 'player-1', email: 'player@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('player-1', 'player@example.com', 'player') createMockUser('player-1', 'player@example.com', 'player')
); );
eventFindUniqueMock.mockImplementation(async () =>
createMockTournament(1, 'other-user-1')
);
const result = await canManageTournament(1); const result = await canManageTournament(1);
expect(result.allowed).toBe(false); expect(result.allowed).toBe(false);
+23 -37
View File
@@ -3,33 +3,23 @@
* Tests the allowTies field is properly saved when updating tournaments * Tests the allowTies field is properly saved when updating tournaments
*/ */
import { describe, it, expect, mock, beforeEach,} from 'bun:test'; import { describe, it, expect, vi, beforeEach } from 'vitest';
import { prisma } from '@/lib/prisma'; 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 // Mock the prisma client
mock.module('@/lib/prisma', () => ({ vi.mock('@/lib/prisma', () => ({
prisma: { prisma: {
event: { event: {
findUnique: eventFindUniqueMock, findUnique: vi.fn(),
update: eventUpdateMock, update: vi.fn(),
}, },
}, },
})); }));
// Mock the permissions module // Mock the permissions module
mock.module('@/lib/permissions', () => ({ vi.mock('@/lib/permissions', () => ({
canManageTournament: defaultCanManageTournament, canManageTournament: vi.fn().mockResolvedValue({ allowed: true }),
canDeleteTournament: defaultCanDeleteTournament, canDeleteTournament: vi.fn().mockResolvedValue({ allowed: true }),
})); }));
// Import the route handler after mocking // Import the route handler after mocking
@@ -37,16 +27,12 @@ import { PUT } from '@/app/api/tournaments/[id]/route';
describe('Tournament Update API', () => { describe('Tournament Update API', () => {
beforeEach(() => { beforeEach(() => {
// Clear all mock history before each test vi.clearAllMocks();
eventFindUniqueMock.mockClear();
eventUpdateMock.mockClear();
canManageTournamentMock.mockClear();
canDeleteTournamentMock.mockClear();
}); });
it('should update allowTies field when provided', async () => { it('should update allowTies field when provided', async () => {
// Mock existing tournament // Mock existing tournament
eventFindUniqueMock.mockImplementation(async () => ({ vi.mocked(prisma.event.findUnique).mockResolvedValue({
id: 1, id: 1,
name: 'Test Tournament', name: 'Test Tournament',
allowTies: false, allowTies: false,
@@ -60,10 +46,10 @@ describe('Tournament Update API', () => {
ownerId: null, ownerId: null,
createdAt: new Date(), createdAt: new Date(),
updatedAt: new Date(), updatedAt: new Date(),
} as any)); } as any);
// Mock successful update // Mock successful update
eventUpdateMock.mockImplementation(async () => ({ vi.mocked(prisma.event.update).mockResolvedValue({
id: 1, id: 1,
name: 'Test Tournament', name: 'Test Tournament',
allowTies: true, allowTies: true,
@@ -77,7 +63,7 @@ describe('Tournament Update API', () => {
ownerId: null, ownerId: null,
createdAt: new Date(), createdAt: new Date(),
updatedAt: new Date(), updatedAt: new Date(),
} as any)); } as any);
const request = new Request('http://localhost/api/tournaments/1', { const request = new Request('http://localhost/api/tournaments/1', {
method: 'PUT', method: 'PUT',
@@ -92,7 +78,7 @@ describe('Tournament Update API', () => {
const response = await PUT(request, { params }); const response = await PUT(request, { params });
expect(response.status).toBe(200); expect(response.status).toBe(200);
expect(prisma.event.update).toHaveBeenCalledWith( expect(vi.mocked(prisma.event.update)).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
data: expect.objectContaining({ data: expect.objectContaining({
allowTies: true, allowTies: true,
@@ -103,7 +89,7 @@ describe('Tournament Update API', () => {
it('should default allowTies to false when not provided', async () => { it('should default allowTies to false when not provided', async () => {
// Mock existing tournament // Mock existing tournament
eventFindUniqueMock.mockImplementation(async () => ({ vi.mocked(prisma.event.findUnique).mockResolvedValue({
id: 1, id: 1,
name: 'Test Tournament', name: 'Test Tournament',
allowTies: true, allowTies: true,
@@ -117,10 +103,10 @@ describe('Tournament Update API', () => {
ownerId: null, ownerId: null,
createdAt: new Date(), createdAt: new Date(),
updatedAt: new Date(), updatedAt: new Date(),
} as any)); } as any);
// Mock successful update // Mock successful update
eventUpdateMock.mockImplementation(async () => ({ vi.mocked(prisma.event.update).mockResolvedValue({
id: 1, id: 1,
name: 'Test Tournament', name: 'Test Tournament',
allowTies: false, allowTies: false,
@@ -134,7 +120,7 @@ describe('Tournament Update API', () => {
ownerId: null, ownerId: null,
createdAt: new Date(), createdAt: new Date(),
updatedAt: new Date(), updatedAt: new Date(),
} as any)); } as any);
const request = new Request('http://localhost/api/tournaments/1', { const request = new Request('http://localhost/api/tournaments/1', {
method: 'PUT', method: 'PUT',
@@ -149,7 +135,7 @@ describe('Tournament Update API', () => {
const response = await PUT(request, { params }); const response = await PUT(request, { params });
expect(response.status).toBe(200); expect(response.status).toBe(200);
expect(prisma.event.update).toHaveBeenCalledWith( expect(vi.mocked(prisma.event.update)).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
data: expect.objectContaining({ data: expect.objectContaining({
allowTies: false, // Should default to false allowTies: false, // Should default to false
@@ -160,7 +146,7 @@ describe('Tournament Update API', () => {
it('should preserve allowTies value when updating other fields', async () => { it('should preserve allowTies value when updating other fields', async () => {
// Mock existing tournament with allowTies = true // Mock existing tournament with allowTies = true
eventFindUniqueMock.mockImplementation(async () => ({ vi.mocked(prisma.event.findUnique).mockResolvedValue({
id: 1, id: 1,
name: 'Test Tournament', name: 'Test Tournament',
allowTies: true, allowTies: true,
@@ -174,10 +160,10 @@ describe('Tournament Update API', () => {
ownerId: null, ownerId: null,
createdAt: new Date(), createdAt: new Date(),
updatedAt: new Date(), updatedAt: new Date(),
} as any)); } as any);
// Mock successful update // Mock successful update
eventUpdateMock.mockImplementation(async () => ({ vi.mocked(prisma.event.update).mockResolvedValue({
id: 1, id: 1,
name: 'Updated Tournament Name', name: 'Updated Tournament Name',
allowTies: true, allowTies: true,
@@ -191,7 +177,7 @@ describe('Tournament Update API', () => {
ownerId: null, ownerId: null,
createdAt: new Date(), createdAt: new Date(),
updatedAt: new Date(), updatedAt: new Date(),
} as any)); } as any);
const request = new Request('http://localhost/api/tournaments/1', { const request = new Request('http://localhost/api/tournaments/1', {
method: 'PUT', method: 'PUT',
@@ -206,7 +192,7 @@ describe('Tournament Update API', () => {
const response = await PUT(request, { params }); const response = await PUT(request, { params });
expect(response.status).toBe(200); expect(response.status).toBe(200);
const updateCall = eventUpdateMock.mock.calls[0][0]; const updateCall = vi.mocked(prisma.event.update).mock.calls[0][0];
expect(updateCall.data.allowTies).toBe(true); expect(updateCall.data.allowTies).toBe(true);
expect(updateCall.data.name).toBe('Updated Tournament Name'); expect(updateCall.data.name).toBe('Updated Tournament Name');
expect(updateCall.data.targetScore).toBe(10); expect(updateCall.data.targetScore).toBe(10);
+36 -46
View File
@@ -4,31 +4,25 @@
* Tests for user name editing and profile management * Tests for user name editing and profile management
*/ */
import { describe, test, expect, mock, beforeEach,} from 'bun:test'; import { describe, test, expect, vi, beforeEach } from 'vitest';
import { hasRole } from '@/lib/permissions'; import { hasRole } from '@/lib/permissions';
import { getSession } from '@/lib/auth-simple'; import { getSession } from '@/lib/auth-simple';
import { prisma } from '@/lib/prisma'; import { prisma } from '@/lib/prisma';
import type { User, Player } from '@prisma/client'; 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 // Mock the getSession and prisma functions
mock.module('@/lib/auth-simple', () => ({ vi.mock('@/lib/auth-simple', () => ({
getSession: getSessionMock, getSession: vi.fn(),
})); }));
mock.module('@/lib/prisma', () => ({ vi.mock('@/lib/prisma', () => ({
prisma: { prisma: {
user: { user: {
findUnique: userFindUniqueMock, findUnique: vi.fn(),
update: userUpdateMock, update: vi.fn(),
}, },
player: { player: {
findUnique: playerFindUniqueMock, findUnique: vi.fn(),
}, },
}, },
})); }));
@@ -62,20 +56,16 @@ const createMockPlayer = (id: number, name: string): Player => ({
describe('User Management', () => { describe('User Management', () => {
beforeEach(() => { beforeEach(() => {
// Reset mock implementations to default (no-op) before each test vi.clearAllMocks();
getSessionMock.mockImplementation(() => undefined);
userFindUniqueMock.mockImplementation(() => undefined);
userUpdateMock.mockImplementation(() => undefined);
playerFindUniqueMock.mockImplementation(() => undefined);
}); });
describe('User Name Editing', () => { describe('User Name Editing', () => {
test('club_admin should be able to edit any user name', async () => { test('club_admin should be able to edit any user name', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'admin-1', email: 'admin@example.com' }, user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('admin-1', 'admin@example.com', 'club_admin') createMockUser('admin-1', 'admin@example.com', 'club_admin')
); );
@@ -84,11 +74,11 @@ describe('User Management', () => {
}); });
test('tournament_admin should NOT be able to edit user names', async () => { test('tournament_admin should NOT be able to edit user names', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'admin-1', email: 'admin@example.com' }, user: { id: 'tour-admin-1', email: 'tour@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin') createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
); );
@@ -97,11 +87,11 @@ describe('User Management', () => {
}); });
test('player should NOT be able to edit user names', async () => { test('player should NOT be able to edit user names', async () => {
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'admin-1', email: 'admin@example.com' }, user: { id: 'player-1', email: 'player@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => vi.mocked(prisma.user.findUnique).mockResolvedValue(
createMockUser('player-1', 'player@example.com', 'player') createMockUser('player-1', 'player@example.com', 'player')
); );
@@ -110,7 +100,7 @@ describe('User Management', () => {
}); });
test('unauthenticated user should NOT be able to edit user names', async () => { test('unauthenticated user should NOT be able to edit user names', async () => {
getSessionMock.mockImplementation(async () => null); vi.mocked(getSession).mockResolvedValue(null);
const result = await hasRole('club_admin'); const result = await hasRole('club_admin');
expect(result.allowed).toBe(false); expect(result.allowed).toBe(false);
@@ -121,11 +111,11 @@ describe('User Management', () => {
test('user should be able to view their own profile', async () => { test('user should be able to view their own profile', async () => {
const mockUser = createMockUser('user-1', 'user@example.com', 'player'); const mockUser = createMockUser('user-1', 'user@example.com', 'player');
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'admin-1', email: 'admin@example.com' }, user: { id: 'user-1', email: 'user@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => mockUser); vi.mocked(prisma.user.findUnique).mockResolvedValue(mockUser);
// In the actual implementation, this would check if session.user.id === params.id // In the actual implementation, this would check if session.user.id === params.id
const canViewOwnProfile = true; // This logic is in the API route const canViewOwnProfile = true; // This logic is in the API route
@@ -136,11 +126,11 @@ describe('User Management', () => {
const mockAdmin = createMockUser('admin-1', 'admin@example.com', 'club_admin'); const mockAdmin = createMockUser('admin-1', 'admin@example.com', 'club_admin');
const mockUser = createMockUser('user-1', 'user@example.com', 'player'); const mockUser = createMockUser('user-1', 'user@example.com', 'player');
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'admin-1', email: 'admin@example.com' }, user: { id: 'admin-1', email: 'admin@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
(userFindUniqueMock) vi.mocked(prisma.user.findUnique)
.mockResolvedValueOnce(mockAdmin) // For the requesting user .mockResolvedValueOnce(mockAdmin) // For the requesting user
.mockResolvedValueOnce(mockUser); // For the target user .mockResolvedValueOnce(mockUser); // For the target user
@@ -152,11 +142,11 @@ describe('User Management', () => {
test('non-admin should NOT be able to view other user profiles', async () => { test('non-admin should NOT be able to view other user profiles', async () => {
const mockUser = createMockUser('user-1', 'user@example.com', 'player'); const mockUser = createMockUser('user-1', 'user@example.com', 'player');
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'admin-1', email: 'admin@example.com' }, user: { id: 'user-1', email: 'user@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => mockUser); vi.mocked(prisma.user.findUnique).mockResolvedValue(mockUser);
// In the actual implementation, this would check if session.user.id === params.id // In the actual implementation, this would check if session.user.id === params.id
const canViewOtherProfile = false; // This logic is in the API route const canViewOtherProfile = false; // This logic is in the API route
@@ -169,11 +159,11 @@ describe('User Management', () => {
const mockUser = createMockUser('user-1', 'user@example.com', 'club_admin'); const mockUser = createMockUser('user-1', 'user@example.com', 'club_admin');
const mockPlayer = createMockPlayer(1, 'Old Name'); const mockPlayer = createMockPlayer(1, 'Old Name');
getSessionMock.mockImplementation(async () => ({ vi.mocked(getSession).mockResolvedValue({
user: { id: 'admin-1', email: 'admin@example.com' }, user: { id: 'user-1', email: 'user@example.com' },
session: { token: 'test', expiresAt: new Date() } session: { token: 'test', expiresAt: new Date() }
})); });
userFindUniqueMock.mockImplementation(async () => mockUser); vi.mocked(prisma.user.findUnique).mockResolvedValue(mockUser);
const updatedUser = { const updatedUser = {
...mockUser, ...mockUser,
@@ -181,7 +171,7 @@ describe('User Management', () => {
player: { ...mockPlayer, name: 'New Name', normalizedName: 'new name' } player: { ...mockPlayer, name: 'New Name', normalizedName: 'new name' }
}; };
userUpdateMock.mockImplementation(async () => updatedUser); vi.mocked(prisma.user.update).mockResolvedValue(updatedUser);
// The API route should update both user.name and player.name // The API route should update both user.name and player.name
expect(updatedUser.name).toBe('New Name'); expect(updatedUser.name).toBe('New Name');
-2
View File
@@ -14,8 +14,6 @@ export const auth = betterAuth({
enabled: true, enabled: true,
autoSignIn: true, // Automatically sign in after registration autoSignIn: true, // Automatically sign in after registration
requireEmailVerification: false, // Don't require email verification for tests 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, secret: process.env.BETTER_AUTH_SECRET || process.env.NEXTAUTH_SECRET,
baseURL: process.env.BETTER_AUTH_URL || process.env.NEXTAUTH_URL || "http://localhost:3000", baseURL: process.env.BETTER_AUTH_URL || process.env.NEXTAUTH_URL || "http://localhost:3000",
+7 -25
View File
@@ -1,38 +1,20 @@
import { PrismaClient } from '@prisma/client' import { PrismaClient } from '@prisma/client'
import { PrismaPg } from '@prisma/adapter-pg'
import pg from 'pg'
import dotenv from 'dotenv'
// Load .env file if it exists // Load .env file if it exists
require('dotenv').config() dotenv.config()
const globalForPrisma = globalThis as unknown as { const globalForPrisma = globalThis as unknown as {
prisma: PrismaClient | undefined prisma: PrismaClient | undefined
} }
// Detect database provider from environment (default to sqlite for local development) const adapter = new PrismaPg({ connectionString: process.env.DATABASE_URL })
const databaseProvider = process.env.DATABASE_PROVIDER || 'sqlite'
const databaseUrl = process.env.DATABASE_URL
// Create PrismaClient with appropriate adapter // Create PrismaClient with adapter
const createPrismaClient = () => { const createPrismaClient = () => {
let client: PrismaClient const client = new PrismaClient({ adapter })
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 adapter = new PrismaPg({ connectionString: databaseUrl })
client = new PrismaClient({ adapter })
} else {
// No adapter needed for SQLite
client = new PrismaClient()
}
return client return client
} }