Compare commits
29 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2c5666e419 | |||
| 98b18de00a | |||
| 3e50916132 | |||
| bd646ff4a4 | |||
| 61be5efadc | |||
| 954abb0939 | |||
| 5f9705a740 | |||
| a921fe5682 | |||
| 0cc4764aa5 | |||
| 9e3d2a85fd | |||
| 301ad2132f | |||
| 4a09bd044a | |||
| baeab0fbe5 | |||
| 90ecbb6fba | |||
| b3ba4b5a8c | |||
| a5a5f41c16 | |||
| a3e46ec83e | |||
| 66fc2386c2 | |||
| 83cccf4987 | |||
| b162750a67 | |||
| 671ee78a47 | |||
| 861e14503b | |||
| 1489848b77 | |||
| 49865cd9c3 | |||
| c8e89b17ac | |||
| e1b43c0702 | |||
| e4874c3438 | |||
| d9d759a06f | |||
| c796b89fb6 |
+22
-32
@@ -1,54 +1,44 @@
|
|||||||
# EuchreCamp Environment Configuration
|
# EuchreCamp Environment Configuration
|
||||||
# Copy this file to .env and fill in your values
|
# ============================================
|
||||||
|
# Copy this file to .env or use
|
||||||
|
# .env.development / .env.production for specific environments
|
||||||
|
|
||||||
# ============================================
|
# ============================================
|
||||||
# Database Configuration
|
# Database Configuration
|
||||||
# ============================================
|
# ============================================
|
||||||
# PostgreSQL connection string
|
# IMPORTANT: Use the appropriate DATABASE_URL for your environment:
|
||||||
# Format: postgresql://username:password@host:port/database
|
#
|
||||||
DATABASE_URL=postgresql://euchre:euchrepassword@localhost:5432/euchre_camp
|
# - Development: euchre_camp_dev (in .env.development)
|
||||||
|
# - CI/Testing: euchre_camp_ci (set via CI_DATABASE_URL secret)
|
||||||
|
# - Production: euchre_camp (in .env.production, DO NOT USE FOR TESTS)
|
||||||
|
|
||||||
# Shadow database for Prisma migrations (optional for PostgreSQL)
|
|
||||||
DATABASE_SHADOW_URL=postgresql://euchre:euchrepassword@localhost:5432/euchre_camp_shadow
|
|
||||||
|
|
||||||
# Database provider (postgresql)
|
|
||||||
DATABASE_PROVIDER=postgresql
|
DATABASE_PROVIDER=postgresql
|
||||||
|
|
||||||
# ============================================
|
# ============================================
|
||||||
# Better Auth Configuration
|
# Better Auth Configuration
|
||||||
# ============================================
|
# ============================================
|
||||||
# Secret key for session encryption (generate a strong random string)
|
# Generate a new secret with: openssl rand -base64 32
|
||||||
# Run: openssl rand -base64 32
|
BETTER_AUTH_SECRET=generate-new-secret-in-production
|
||||||
BETTER_AUTH_SECRET=your-secret-key-change-in-production
|
|
||||||
|
|
||||||
# Base URL for authentication callbacks
|
# Base URL - update for production
|
||||||
# For production: https://your-domain.com
|
|
||||||
BETTER_AUTH_URL=http://localhost:3000
|
BETTER_AUTH_URL=http://localhost:3000
|
||||||
|
|
||||||
# ============================================
|
# ============================================
|
||||||
# Application Configuration
|
# Application Configuration
|
||||||
# ============================================
|
# ============================================
|
||||||
# Environment: development, production, test
|
NODE_ENV=development
|
||||||
NODE_ENV=production
|
|
||||||
|
|
||||||
# Trusted origins for CORS and authentication
|
# Comma-separated list of trusted origins
|
||||||
# Add your domain(s) for production
|
|
||||||
TRUSTED_ORIGINS=http://localhost:3000,http://127.0.0.1:3000
|
TRUSTED_ORIGINS=http://localhost:3000,http://127.0.0.1:3000
|
||||||
|
|
||||||
# ============================================
|
# ============================================
|
||||||
# Optional: External Services
|
# Environment-Specific Overrides
|
||||||
# ============================================
|
# ============================================
|
||||||
# If using external database (e.g., Supabase, Railway)
|
# For development (.env.development):
|
||||||
# DATABASE_URL=postgresql://user:pass@host:port/db
|
# DATABASE_URL from .credentials (euchre_camp_dev)
|
||||||
|
# NODE_ENV=development
|
||||||
# If using external auth provider
|
# BETTER_AUTH_URL=http://localhost:3000
|
||||||
# BETTER_AUTH_URL=https://your-app.com
|
#
|
||||||
|
# For CI (set via secrets):
|
||||||
# ============================================
|
# DATABASE_URL set as CI_DATABASE_URL secret (euchre_camp_ci)
|
||||||
# CasaOS Deployment Notes
|
# NODE_ENV=test
|
||||||
# ============================================
|
|
||||||
# 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)
|
|
||||||
@@ -132,11 +132,11 @@ When a PR is merged to `main`:
|
|||||||
|
|
||||||
## Database Configuration for CI
|
## Database Configuration for CI
|
||||||
|
|
||||||
### SQLite for CI Acceptance Tests
|
### PostgreSQL for CI Acceptance Tests
|
||||||
- **Why SQLite**: No database server required, perfect for CI environments
|
- **Why PostgreSQL**: Matches production database, catches PG-specific issues
|
||||||
- **Usage**: PR workflow runs acceptance tests with SQLite database
|
- **Usage**: PR workflow runs acceptance tests with PostgreSQL database
|
||||||
- **Configuration**: `DATABASE_PROVIDER=sqlite`, `DATABASE_URL=file:./prisma/ci.db`
|
- **Configuration**: `CI_DATABASE_URL` secret, set as `DATABASE_URL` env var
|
||||||
- **Benefits**: Fast, isolated, no external dependencies
|
- **Benefits**: Production-like environment, consistent with dev and prod
|
||||||
|
|
||||||
### PostgreSQL for Production
|
### PostgreSQL for Production
|
||||||
- **Usage**: Release workflow runs tests in Docker with PostgreSQL
|
- **Usage**: Release workflow runs tests in Docker with PostgreSQL
|
||||||
|
|||||||
@@ -5,14 +5,15 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
paths:
|
paths:
|
||||||
- 'Dockerfile.ci-base'
|
- "Dockerfile.ci-base"
|
||||||
- 'package.json'
|
- "package.json"
|
||||||
- 'bun.lock'
|
- "bun.lock"
|
||||||
- '.gitea/workflows/build-ci-images.yml'
|
- "package-lock.json"
|
||||||
|
- ".gitea/workflows/build-ci-images.yml"
|
||||||
schedule:
|
schedule:
|
||||||
# Weekly rebuild to get latest Playwright/Bun versions
|
# Weekly rebuild to get latest Playwright/Bun versions
|
||||||
- cron: '0 2 * * 0' # Every Sunday at 2 AM
|
- cron: "0 2 * * 0" # Every Sunday at 2 AM
|
||||||
workflow_dispatch: # Manual trigger
|
workflow_dispatch: # Manual trigger
|
||||||
|
|
||||||
env:
|
env:
|
||||||
REGISTRY: docker.notsosm.art
|
REGISTRY: docker.notsosm.art
|
||||||
@@ -24,48 +25,44 @@ jobs:
|
|||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
packages: write
|
packages: write
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
- name: Login to Registry
|
- name: Login to Registry
|
||||||
run: |
|
run: |
|
||||||
echo "${{ secrets.DOCKER_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u ${{ secrets.DOCKER_LOGIN }} --password-stdin
|
echo "${{ secrets.DOCKER_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u ${{ secrets.DOCKER_LOGIN }} --password-stdin
|
||||||
|
|
||||||
- name: Extract metadata for CI base image
|
- name: Extract metadata for CI base image
|
||||||
id: meta
|
id: meta
|
||||||
run: |
|
run: |
|
||||||
# Get Playwright version from package.json
|
# Get Playwright version from package.json
|
||||||
PLAYWRIGHT_VERSION=$(grep -o '"@playwright/test": "[^"]*"' package.json | cut -d'"' -f4)
|
PLAYWRIGHT_VERSION=$(grep -o '"@playwright/test": "[^"]*"' package.json | cut -d'"' -f4 | sed 's/^\^//')
|
||||||
echo "playwright_version=${PLAYWRIGHT_VERSION}" >> $GITHUB_OUTPUT
|
echo "playwright_version=${PLAYWRIGHT_VERSION}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
# Get Bun version (latest)
|
# Get Bun version (latest)
|
||||||
BUN_VERSION=$(bun --version 2>/dev/null || echo "latest")
|
BUN_VERSION=$(bun --version 2>/dev/null || echo "latest")
|
||||||
echo "bun_version=${BUN_VERSION}" >> $GITHUB_OUTPUT
|
echo "bun_version=${BUN_VERSION}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
# Set tags
|
# 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
|
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
|
- name: Build and push CI base image
|
||||||
run: |
|
run: |
|
||||||
# Build with multiple tags
|
|
||||||
docker build \
|
docker build \
|
||||||
--file Dockerfile.ci-base \
|
--file Dockerfile.ci-base \
|
||||||
--tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:latest \
|
--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:playwright-${{ steps.meta.outputs.playwright_version }} \
|
||||||
--tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:${{ github.sha }} \
|
--tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:${{ github.sha }} \
|
||||||
|
--push \
|
||||||
.
|
.
|
||||||
|
|
||||||
# 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
|
- name: Clean up
|
||||||
if: always()
|
if: always()
|
||||||
run: |
|
run: |
|
||||||
docker logout ${{ env.REGISTRY }}
|
docker logout ${{ env.REGISTRY }}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
name: Deploy Production
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
version:
|
||||||
|
description: 'Version tag to deploy (e.g., v0.1.21)'
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
|
||||||
|
env:
|
||||||
|
REGISTRY: docker.notsosm.art
|
||||||
|
IMAGE_NAME: euchre-camp
|
||||||
|
PROD_APPS_PATH: /apps/youthful_simon
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
deploy-prod:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
container:
|
||||||
|
image: docker.notsosm.art/euchre-camp/ci-base:latest
|
||||||
|
options: --user root
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Deploy to production
|
||||||
|
run: |
|
||||||
|
VERSION="${{ inputs.version }}"
|
||||||
|
COMPOSE_FILE="${{ env.PROD_APPS_PATH }}/docker-compose.yml"
|
||||||
|
|
||||||
|
echo "Deploying ${VERSION} to production..."
|
||||||
|
|
||||||
|
# Update prod compose file with the release tag
|
||||||
|
# Note: Standardizing to docker.notsosm.art registry
|
||||||
|
sed -i "s|image: euchre-camp/euchre-camp:[a-zA-Z0-9.-]*|image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${VERSION}|" ${COMPOSE_FILE}
|
||||||
|
sed -i "s|image: docker.notsosm.art/euchre-camp:[a-zA-Z0-9.-]*|image: docker.notsosm.art/euchre-camp:${VERSION}|" ${COMPOSE_FILE}
|
||||||
|
|
||||||
|
# Pull and restart the prod container
|
||||||
|
cd ${{ env.PROD_APPS_PATH }}
|
||||||
|
docker compose pull app
|
||||||
|
docker compose up -d app
|
||||||
|
|
||||||
|
# Wait for production site to be healthy
|
||||||
|
echo "Waiting for production site to be healthy..."
|
||||||
|
for i in {1..30}; do
|
||||||
|
if curl -sf https://euchre.notsosm.art/api/health > /dev/null 2>&1; then
|
||||||
|
echo "✅ Production successfully deployed with version ${VERSION}"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
sleep 0.5
|
||||||
|
done
|
||||||
|
echo "❌ Production deployment failed"
|
||||||
|
docker compose logs app
|
||||||
|
exit 1
|
||||||
+66
-19
@@ -5,62 +5,108 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
|
||||||
|
env:
|
||||||
|
REGISTRY: docker.notsosm.art
|
||||||
|
IMAGE_NAME: euchre-camp
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
unit-tests:
|
unit-tests:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: docker.notsosm.art/euchre-camp/ci-base:latest
|
image: docker.notsosm.art/euchre-camp/ci-base:latest
|
||||||
options: --user root
|
options: --user root
|
||||||
|
env:
|
||||||
|
DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Clear Bun cache
|
|
||||||
run: bun pm cache rm || true
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: bun install
|
run: npm ci --legacy-peer-deps
|
||||||
|
|
||||||
- name: Generate Prisma client
|
- name: Generate Prisma client
|
||||||
run: bun x prisma generate
|
run: npx prisma generate
|
||||||
env:
|
|
||||||
DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
|
|
||||||
|
|
||||||
- name: Run unit tests
|
- name: Run unit tests
|
||||||
run: bun test src/__tests__/unit/ src/__tests__/*.test.tsx src/__tests__/auth-simple.test.ts
|
run: npm test
|
||||||
|
|
||||||
e2e-tests:
|
build-and-deploy-ci:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: unit-tests
|
needs: unit-tests
|
||||||
container:
|
container:
|
||||||
image: docker.notsosm.art/euchre-camp/ci-base:latest
|
image: docker.notsosm.art/euchre-camp/ci-base:latest
|
||||||
options: --user root
|
options: --user root
|
||||||
|
volumes:
|
||||||
|
- /var/lib/casaos/apps:/apps
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Clear Bun cache
|
# Required for acceptance tests - they import prisma via @/ path alias
|
||||||
run: bun pm cache rm || true
|
# and @cucumber/cucumber for cucumber-e2e tests
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: bun install
|
run: npm ci --legacy-peer-deps
|
||||||
|
|
||||||
- name: Generate Prisma client
|
- name: Generate Prisma client
|
||||||
run: bun x prisma generate
|
run: npx prisma generate
|
||||||
env:
|
env:
|
||||||
DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
|
DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
|
||||||
|
|
||||||
- name: Run E2E tests
|
- name: Extract PR number and commit info
|
||||||
run: npm run test:acceptance:cucumber:prod
|
id: info
|
||||||
|
run: |
|
||||||
|
echo "pr_number=$(echo $GITHUB_REF | grep -oP 'refs/pull/\K[0-9]+')" >> $GITHUB_OUTPUT
|
||||||
|
echo "short_sha=$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Build Docker image for PR
|
||||||
|
run: |
|
||||||
|
IMAGE_TAG="pr-${{ steps.info.outputs.pr_number }}-${{ steps.info.outputs.short_sha }}"
|
||||||
|
docker build \
|
||||||
|
--target runner \
|
||||||
|
--build-arg GIT_COMMIT=$GITHUB_SHA \
|
||||||
|
-t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${IMAGE_TAG} \
|
||||||
|
.
|
||||||
|
|
||||||
|
- name: Update CI site compose and restart
|
||||||
|
run: |
|
||||||
|
IMAGE_TAG="pr-${{ steps.info.outputs.pr_number }}-${{ steps.info.outputs.short_sha }}"
|
||||||
|
COMPOSE_FILE="/apps/euchre_camp_ci/docker-compose.yml"
|
||||||
|
|
||||||
|
# Update the image tag in the compose file
|
||||||
|
sed -i "s|image: docker.notsosm.art/euchre-camp:[a-zA-Z0-9.-]*|image: docker.notsosm.art/euchre-camp:${IMAGE_TAG}|" ${COMPOSE_FILE}
|
||||||
|
|
||||||
|
# Image was built locally in the previous step; compose uses it without pulling
|
||||||
|
cd /apps/euchre_camp_ci
|
||||||
|
docker compose up -d app
|
||||||
|
|
||||||
|
- name: Wait for CI site to be ready
|
||||||
|
run: |
|
||||||
|
for i in {1..15}; do
|
||||||
|
if docker ps --filter name=euchre-camp-ci --format '{{.Status}}' | grep -q Up; then
|
||||||
|
echo "CI site container is running"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
echo "CI site container failed to start"
|
||||||
|
docker compose -f /apps/euchre_camp_ci/docker-compose.yml logs app
|
||||||
|
exit 1
|
||||||
|
|
||||||
|
- name: Run acceptance tests
|
||||||
|
run: DATABASE_URL="${{ secrets.CI_DATABASE_URL }}" npx playwright test e2e/
|
||||||
env:
|
env:
|
||||||
DATABASE_URL: postgresql://euchre_camp:${{ secrets.DB_PASSWORD }}@dhg.lol:5432/euchre_camp_dev
|
CI: true
|
||||||
DATABASE_PROVIDER: postgresql
|
|
||||||
|
- name: Cleanup PR images
|
||||||
|
if: always()
|
||||||
|
run: |
|
||||||
|
docker rmi --force ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:pr-${{ steps.info.outputs.pr_number }}-${{ steps.info.outputs.short_sha }} || true
|
||||||
|
|
||||||
analyze-bump-type:
|
analyze-bump-type:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: e2e-tests
|
needs: unit-tests
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
@@ -100,6 +146,7 @@ jobs:
|
|||||||
echo "reason=$REASON" >> $GITHUB_OUTPUT
|
echo "reason=$REASON" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Comment bump type on PR
|
- name: Comment bump type on PR
|
||||||
|
if: github.event_name == 'pull_request'
|
||||||
uses: actions/github-script@v7
|
uses: actions/github-script@v7
|
||||||
with:
|
with:
|
||||||
script: |
|
script: |
|
||||||
|
|||||||
@@ -73,10 +73,10 @@ 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 -e "console.log(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"
|
||||||
|
|
||||||
@@ -121,8 +121,9 @@ jobs:
|
|||||||
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" \
|
||||||
|
-e NODE_ENV=test \
|
||||||
${{ 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 test
|
||||||
|
|
||||||
- name: Build production image
|
- name: Build production image
|
||||||
if: steps.commit.outputs.committed == 'true'
|
if: steps.commit.outputs.committed == 'true'
|
||||||
@@ -163,32 +164,26 @@ jobs:
|
|||||||
if: steps.commit.outputs.committed == 'true'
|
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..."
|
||||||
|
|
||||||
# Update docker-compose.yml with new image tag using full registry path
|
# Update dev compose file with new image tag
|
||||||
# The registry is docker.notsosm.art and image is euchre-camp
|
|
||||||
IMAGE_TAG="${{ steps.version.outputs.new_version }}"
|
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
|
COMPOSE_FILE="/apps/intelligent_silasak/docker-compose.yml"
|
||||||
|
sed -i "s|image: docker.notsosm.art/euchre-camp:[a-zA-Z0-9.-]*|image: docker.notsosm.art/euchre-camp:${IMAGE_TAG}|" ${COMPOSE_FILE}
|
||||||
# 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
|
# Pull and restart the dev container
|
||||||
cd /home/euchre_camp
|
cd /apps/intelligent_silasak
|
||||||
docker-compose pull app
|
docker compose pull app
|
||||||
docker-compose up -d app
|
docker compose up -d app
|
||||||
|
|
||||||
# Wait for container to be healthy
|
# Wait for container to be healthy
|
||||||
echo "Waiting for container to start..."
|
echo "Waiting for dev site to be healthy..."
|
||||||
sleep 10
|
for i in {1..30}; do
|
||||||
|
if curl -sf https://euchre-dev.notsosm.art/api/health > /dev/null 2>&1; then
|
||||||
# Check if container is running
|
echo "✅ Dev environment successfully deployed with version ${{ steps.version.outputs.new_version }}"
|
||||||
if docker ps --filter "name=euchre-camp-app" --format "{{.Status}}" | grep -q "Up"; then
|
exit 0
|
||||||
echo "✅ Dev environment successfully deployed with version ${{ steps.version.outputs.new_version }}"
|
fi
|
||||||
else
|
sleep 0.5
|
||||||
echo "❌ Dev environment deployment failed"
|
done
|
||||||
docker-compose logs app
|
echo "❌ Dev environment deployment failed"
|
||||||
exit 1
|
docker compose logs app
|
||||||
fi
|
exit 1
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
/playwright/.auth/
|
/playwright/.auth/
|
||||||
/test-results
|
/test-results
|
||||||
/cookies.txt
|
/cookies.txt
|
||||||
|
# .env.test was removed — tests use DATABASE_URL from shell or .env.development
|
||||||
|
|
||||||
# next.js
|
# next.js
|
||||||
/.next/
|
/.next/
|
||||||
@@ -59,3 +60,4 @@ playwright-report/
|
|||||||
|
|
||||||
cucumber-pretty
|
cucumber-pretty
|
||||||
.env.production
|
.env.production
|
||||||
|
.credentials
|
||||||
|
|||||||
Generated
+376
@@ -0,0 +1,376 @@
|
|||||||
|
{
|
||||||
|
"name": ".opencode",
|
||||||
|
"lockfileVersion": 3,
|
||||||
|
"requires": true,
|
||||||
|
"packages": {
|
||||||
|
"": {
|
||||||
|
"dependencies": {
|
||||||
|
"@opencode-ai/plugin": "1.14.40"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
|
||||||
|
"version": "3.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
|
||||||
|
"integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
|
||||||
|
"cpu": [
|
||||||
|
"arm64"
|
||||||
|
],
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"darwin"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
|
||||||
|
"version": "3.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
|
||||||
|
"integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
|
||||||
|
"cpu": [
|
||||||
|
"x64"
|
||||||
|
],
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"darwin"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
|
||||||
|
"version": "3.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
|
||||||
|
"integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
|
||||||
|
"cpu": [
|
||||||
|
"arm"
|
||||||
|
],
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
|
||||||
|
"version": "3.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
|
||||||
|
"integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
|
||||||
|
"cpu": [
|
||||||
|
"arm64"
|
||||||
|
],
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
|
||||||
|
"version": "3.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
|
||||||
|
"integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
|
||||||
|
"cpu": [
|
||||||
|
"x64"
|
||||||
|
],
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"linux"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
|
||||||
|
"version": "3.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
|
||||||
|
"integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
|
||||||
|
"cpu": [
|
||||||
|
"x64"
|
||||||
|
],
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"win32"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"node_modules/@opencode-ai/plugin": {
|
||||||
|
"version": "1.14.40",
|
||||||
|
"resolved": "https://registry.npmjs.org/@opencode-ai/plugin/-/plugin-1.14.40.tgz",
|
||||||
|
"integrity": "sha512-A2oBQzTPr4AZMcjUWR4RXVAhn6Rc299RYPPLiKzZ1h0aczHm/nTFdJniVEnfR8XkKLm6JXcWK4W9wo4MJJKoaA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@opencode-ai/sdk": "1.14.40",
|
||||||
|
"effect": "4.0.0-beta.59",
|
||||||
|
"zod": "4.1.8"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"@opentui/core": ">=0.2.2",
|
||||||
|
"@opentui/solid": ">=0.2.2"
|
||||||
|
},
|
||||||
|
"peerDependenciesMeta": {
|
||||||
|
"@opentui/core": {
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"@opentui/solid": {
|
||||||
|
"optional": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@opencode-ai/sdk": {
|
||||||
|
"version": "1.14.40",
|
||||||
|
"resolved": "https://registry.npmjs.org/@opencode-ai/sdk/-/sdk-1.14.40.tgz",
|
||||||
|
"integrity": "sha512-e+Av0pNPhoPvQ02DK0Km6sHEXmTlFTuei6C8zV6E3/Iw8jQjTWsW/sssq0kKWnpeUqhdZVxPIqDc5Gvo+n/51A==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"cross-spawn": "7.0.6"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@standard-schema/spec": {
|
||||||
|
"version": "1.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
|
||||||
|
"integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/cross-spawn": {
|
||||||
|
"version": "7.0.6",
|
||||||
|
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
|
||||||
|
"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"path-key": "^3.1.0",
|
||||||
|
"shebang-command": "^2.0.0",
|
||||||
|
"which": "^2.0.1"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 8"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/detect-libc": {
|
||||||
|
"version": "2.1.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
|
||||||
|
"integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"optional": true,
|
||||||
|
"engines": {
|
||||||
|
"node": ">=8"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/effect": {
|
||||||
|
"version": "4.0.0-beta.59",
|
||||||
|
"resolved": "https://registry.npmjs.org/effect/-/effect-4.0.0-beta.59.tgz",
|
||||||
|
"integrity": "sha512-xyUDLeHSe8d6lWGOvR6Fgn2HL6gYeTZ/S4Jzk9uc4ZUxMPPsNZlNXrvk0C7/utQFzeX7uAWcVnG2BjbA0SRoAA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@standard-schema/spec": "^1.1.0",
|
||||||
|
"fast-check": "^4.6.0",
|
||||||
|
"find-my-way-ts": "^0.1.6",
|
||||||
|
"ini": "^6.0.0",
|
||||||
|
"kubernetes-types": "^1.30.0",
|
||||||
|
"msgpackr": "^1.11.9",
|
||||||
|
"multipasta": "^0.2.7",
|
||||||
|
"toml": "^4.1.1",
|
||||||
|
"uuid": "^13.0.0",
|
||||||
|
"yaml": "^2.8.3"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/fast-check": {
|
||||||
|
"version": "4.7.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/fast-check/-/fast-check-4.7.0.tgz",
|
||||||
|
"integrity": "sha512-NsZRtqvSSoCP0HbNjUD+r1JH8zqZalyp6gLY9e7OYs7NK9b6AHOs2baBFeBG7bVNsuoukh89x2Yg3rPsul8ziQ==",
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"type": "individual",
|
||||||
|
"url": "https://github.com/sponsors/dubzzz"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/fast-check"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"pure-rand": "^8.0.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=12.17.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/find-my-way-ts": {
|
||||||
|
"version": "0.1.6",
|
||||||
|
"resolved": "https://registry.npmjs.org/find-my-way-ts/-/find-my-way-ts-0.1.6.tgz",
|
||||||
|
"integrity": "sha512-a85L9ZoXtNAey3Y6Z+eBWW658kO/MwR7zIafkIUPUMf3isZG0NCs2pjW2wtjxAKuJPxMAsHUIP4ZPGv0o5gyTA==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/ini": {
|
||||||
|
"version": "6.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/ini/-/ini-6.0.0.tgz",
|
||||||
|
"integrity": "sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ==",
|
||||||
|
"license": "ISC",
|
||||||
|
"engines": {
|
||||||
|
"node": "^20.17.0 || >=22.9.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/isexe": {
|
||||||
|
"version": "2.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
|
||||||
|
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
|
||||||
|
"license": "ISC"
|
||||||
|
},
|
||||||
|
"node_modules/kubernetes-types": {
|
||||||
|
"version": "1.30.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/kubernetes-types/-/kubernetes-types-1.30.0.tgz",
|
||||||
|
"integrity": "sha512-Dew1okvhM/SQcIa2rcgujNndZwU8VnSapDgdxlYoB84ZlpAD43U6KLAFqYo17ykSFGHNPrg0qry0bP+GJd9v7Q==",
|
||||||
|
"license": "Apache-2.0"
|
||||||
|
},
|
||||||
|
"node_modules/msgpackr": {
|
||||||
|
"version": "1.11.12",
|
||||||
|
"resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.12.tgz",
|
||||||
|
"integrity": "sha512-RBdJ1Un7yGlXWajrkxcSa93nvQ0w4zBf60c0yYv7YtBelP8H2FA7XsfBbMHtXKXUMUxH7zV3Zuozh+kUQWhHvg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"optionalDependencies": {
|
||||||
|
"msgpackr-extract": "^3.0.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/msgpackr-extract": {
|
||||||
|
"version": "3.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz",
|
||||||
|
"integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==",
|
||||||
|
"hasInstallScript": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"dependencies": {
|
||||||
|
"node-gyp-build-optional-packages": "5.2.2"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"download-msgpackr-prebuilds": "bin/download-prebuilds.js"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3",
|
||||||
|
"@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3",
|
||||||
|
"@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3",
|
||||||
|
"@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3",
|
||||||
|
"@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3",
|
||||||
|
"@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/multipasta": {
|
||||||
|
"version": "0.2.7",
|
||||||
|
"resolved": "https://registry.npmjs.org/multipasta/-/multipasta-0.2.7.tgz",
|
||||||
|
"integrity": "sha512-KPA58d68KgGil15oDqXjkUBEBYc00XvbPj5/X+dyzeo/lWm9Nc25pQRlf1D+gv4OpK7NM0J1odrbu9JNNGvynA==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/node-gyp-build-optional-packages": {
|
||||||
|
"version": "5.2.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
|
||||||
|
"integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"dependencies": {
|
||||||
|
"detect-libc": "^2.0.1"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"node-gyp-build-optional-packages": "bin.js",
|
||||||
|
"node-gyp-build-optional-packages-optional": "optional.js",
|
||||||
|
"node-gyp-build-optional-packages-test": "build-test.js"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/path-key": {
|
||||||
|
"version": "3.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
|
||||||
|
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=8"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/pure-rand": {
|
||||||
|
"version": "8.4.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-8.4.0.tgz",
|
||||||
|
"integrity": "sha512-IoM8YF/jY0hiugFo/wOWqfmarlE6J0wc6fDK1PhftMk7MGhVZl88sZimmqBBFomLOCSmcCCpsfj7wXASCpvK9A==",
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"type": "individual",
|
||||||
|
"url": "https://github.com/sponsors/dubzzz"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/fast-check"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/shebang-command": {
|
||||||
|
"version": "2.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
|
||||||
|
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"shebang-regex": "^3.0.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=8"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/shebang-regex": {
|
||||||
|
"version": "3.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
|
||||||
|
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=8"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/toml": {
|
||||||
|
"version": "4.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/toml/-/toml-4.1.1.tgz",
|
||||||
|
"integrity": "sha512-EBJnVBr3dTXdA89WVFoAIPUqkBjxPMwRqsfuo1r240tKFHXv3zgca4+NJib/h6TyvGF7vOawz0jGuryJCdNHrw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/uuid": {
|
||||||
|
"version": "13.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.2.tgz",
|
||||||
|
"integrity": "sha512-vzi9uRZ926x4XV73S/4qQaTwPXM2JBj6/6lI/byHH1jOpCzb0zDbfytgA9LcN/hzb2l7WQSQnxITOVx5un/wGw==",
|
||||||
|
"funding": [
|
||||||
|
"https://github.com/sponsors/broofa",
|
||||||
|
"https://github.com/sponsors/ctavan"
|
||||||
|
],
|
||||||
|
"license": "MIT",
|
||||||
|
"bin": {
|
||||||
|
"uuid": "dist-node/bin/uuid"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/which": {
|
||||||
|
"version": "2.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
|
||||||
|
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"isexe": "^2.0.0"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"node-which": "bin/node-which"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 8"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/yaml": {
|
||||||
|
"version": "2.8.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.4.tgz",
|
||||||
|
"integrity": "sha512-ml/JPOj9fOQK8RNnWojA67GbZ0ApXAUlN2UQclwv2eVgTgn7O9gg9o7paZWKMp4g0H3nTLtS9LVzhkpOFIKzog==",
|
||||||
|
"license": "ISC",
|
||||||
|
"bin": {
|
||||||
|
"yaml": "bin.mjs"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 14.6"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/eemeli"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/zod": {
|
||||||
|
"version": "4.1.8",
|
||||||
|
"license": "MIT",
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/colinhacks"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -165,9 +165,9 @@ npm run db:setup-postgres
|
|||||||
- **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:**
|
**CI-style acceptance tests (uses PostgreSQL, set DATABASE_URL in your shell):**
|
||||||
```bash
|
```bash
|
||||||
DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db npm run test:acceptance
|
DATABASE_PROVIDER=postgresql DATABASE_URL="your_dev_db_url" npm run test:acceptance
|
||||||
```
|
```
|
||||||
|
|
||||||
### CI Runner Image
|
### CI Runner Image
|
||||||
|
|||||||
@@ -1,3 +1,18 @@
|
|||||||
|
## [0.1.20] - 2026-05-02
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Merge branch 'main' of https://git.notsosm.art/david/euchre_camp
|
||||||
|
- Merge branch 'fix/schedule-test-reliability': Reliable schedule generation tests
|
||||||
|
- fix: make schedule generation tests reliable (#33)
|
||||||
|
|
||||||
|
## [0.1.19] - 2026-05-02
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Merge branch 'main' of https://git.notsosm.art/david/euchre_camp
|
||||||
|
- test: mark bye rounds scenario as @wip pending schedule generator fix
|
||||||
|
|
||||||
## [0.1.18] - 2026-05-02
|
## [0.1.18] - 2026-05-02
|
||||||
|
|
||||||
### Patch Changes
|
### Patch Changes
|
||||||
|
|||||||
+11
-11
@@ -4,7 +4,7 @@
|
|||||||
FROM oven/bun:alpine AS builder
|
FROM oven/bun:alpine AS builder
|
||||||
|
|
||||||
# Install dependencies (needed for native modules)
|
# Install dependencies (needed for native modules)
|
||||||
RUN apk add --no-cache python3 make g++
|
RUN apk add --no-cache python3 make g++ nodejs npm
|
||||||
|
|
||||||
# Set working directory
|
# Set working directory
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
@@ -13,14 +13,14 @@ 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 --legacy-peer-deps
|
||||||
|
|
||||||
# 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_PROVIDER=postgresql 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
|
||||||
@@ -30,7 +30,7 @@ RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:
|
|||||||
FROM oven/bun:alpine AS test-runner
|
FROM oven/bun: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 nodejs npm
|
||||||
|
|
||||||
# Set working directory
|
# Set working directory
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
@@ -39,19 +39,19 @@ 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 --legacy-peer-deps
|
||||||
|
|
||||||
# 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_PROVIDER=postgresql 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 oven/bun:alpine AS runner
|
||||||
|
|
||||||
# Install dumb-init for proper signal handling
|
# Install dumb-init and npm for production install
|
||||||
RUN apk add --no-cache dumb-init
|
RUN apk add --no-cache dumb-init nodejs npm
|
||||||
|
|
||||||
# Create non-root user
|
# Create non-root user
|
||||||
RUN addgroup --system --gid 1001 euchre && \
|
RUN addgroup --system --gid 1001 euchre && \
|
||||||
@@ -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.lock ./bun.lock
|
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 --legacy-peer-deps --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_PROVIDER=postgresql 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
|
||||||
|
|||||||
@@ -294,8 +294,8 @@ npm run test
|
|||||||
# Run acceptance tests
|
# Run acceptance tests
|
||||||
npm run test:acceptance
|
npm run test:acceptance
|
||||||
|
|
||||||
# Run acceptance tests with SQLite (CI-style)
|
# Run acceptance tests (CI-style, set DATABASE_URL in your shell)
|
||||||
DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db npm run test:acceptance
|
DATABASE_PROVIDER=postgresql DATABASE_URL="your_dev_db_url" npm run test:acceptance
|
||||||
```
|
```
|
||||||
|
|
||||||
### Database Commands
|
### Database Commands
|
||||||
@@ -400,8 +400,8 @@ The original attempt to use a pre-built CI runner image with pre-installed depen
|
|||||||
# Run unit tests (same as CI)
|
# Run unit tests (same as CI)
|
||||||
npm run test:run
|
npm run test:run
|
||||||
|
|
||||||
# Run acceptance tests with SQLite
|
# Run acceptance tests (set DATABASE_URL in your shell)
|
||||||
DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db npm run test:acceptance
|
DATABASE_PROVIDER=postgresql DATABASE_URL="your_dev_db_url" npm run test:acceptance
|
||||||
```
|
```
|
||||||
|
|
||||||
## Docker Deployment
|
## Docker Deployment
|
||||||
|
|||||||
+24
-8
@@ -24,11 +24,11 @@
|
|||||||
- [x] Write TODO list to repository file
|
- [x] Write TODO list to repository file
|
||||||
- [x] Auto-create tournament when uploading matches without selecting one
|
- [x] Auto-create tournament when uploading matches without selecting one
|
||||||
|
|
||||||
### In Progress 🔄
|
### Completed ✅
|
||||||
- [ ] Update API routes to handle new variant scoring fields
|
- [x] Update API routes to handle new variant scoring fields
|
||||||
- [ ] Update EditTournamentForm to add variant scoring controls
|
- [x] Update EditTournamentForm to add variant scoring controls
|
||||||
- [ ] Update MatchEditor to use tournament-specific target score
|
- [x] Update MatchEditor to use tournament-specific target score
|
||||||
- [ ] Run tests and verify variant scoring implementation
|
- [x] Run tests and verify variant scoring implementation
|
||||||
|
|
||||||
### Recently Completed ✅
|
### Recently Completed ✅
|
||||||
- [x] Update CI/CD workflows to use Bun (PR, release)
|
- [x] Update CI/CD workflows to use Bun (PR, release)
|
||||||
@@ -59,11 +59,27 @@
|
|||||||
- [x] Create migration to add rating system tables (elo_ratings, glicko2_ratings, open_skill_ratings)
|
- [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
|
- [x] Add tabbed rankings page to display Elo, OpenSkill, and Glicko2 ratings
|
||||||
|
|
||||||
|
### Completed ✅
|
||||||
|
- [x] Add UI controls for variant scoring in tournament creation/edit
|
||||||
|
- [x] Test variant tournament functionality end-to-end (e2e/tournament-edit-allowTies.test.ts)
|
||||||
|
- [x] Add validation for tie scores based on tournament configuration (MatchEditor.tsx)
|
||||||
|
|
||||||
|
### Completed ✅ (CI/DB Infrastructure)
|
||||||
|
- [x] Fix PostgreSQL database ownership — each env owns its own DB
|
||||||
|
- [x] Fix role attributes — euchre_camp_dev gets CREATEDB, euchre_camp_ci loses SUPERUSER
|
||||||
|
- [x] Update .env.development to use euchre_camp_dev user
|
||||||
|
- [x] Update .env.development.local to use euchre_camp_dev user
|
||||||
|
- [x] Update CI docker-compose to use euchre_camp_ci user
|
||||||
|
- [x] Update dev docker-compose to use euchre_camp_dev user
|
||||||
|
- [x] Recreate dev and CI containers with correct credentials
|
||||||
|
- [x] Fix Playwright baseURL for CI (https://euchre-ci.notsosm.art)
|
||||||
|
- [x] Fix Navigation unit tests (RoleSwitcherProvider wrapper)
|
||||||
|
- [x] Fix secrets vs vars in PR workflow (secrets.CI_DATABASE_URL)
|
||||||
|
|
||||||
### Backlog 📋
|
### 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
|
- [ ] Document variant tournament features
|
||||||
|
- [ ] Update Gitea secret CI_DATABASE_URL to use euchre_camp_ci user
|
||||||
|
- [ ] Test isolation improvements for parallel CI execution
|
||||||
|
|
||||||
## Recently Completed (Detailed)
|
## Recently Completed (Detailed)
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,8 @@
|
|||||||
import { test, expect } from '@playwright/test';
|
import { test, expect } from '@playwright/test';
|
||||||
import { prisma } from '@/lib/prisma';
|
import { prisma } from '@/lib/prisma';
|
||||||
|
|
||||||
|
const BASE_URL = process.env.CI ? 'https://euchre-ci.notsosm.art' : 'http://localhost:3000';
|
||||||
|
|
||||||
// Generate unique test account credentials
|
// Generate unique test account credentials
|
||||||
function getTestCredentials() {
|
function getTestCredentials() {
|
||||||
const timestamp = Date.now();
|
const timestamp = Date.now();
|
||||||
@@ -52,14 +54,14 @@ test.describe.serial('Account Lifecycle API Acceptance Test', () => {
|
|||||||
console.log('Test 1 - testEmail:', testEmail);
|
console.log('Test 1 - testEmail:', testEmail);
|
||||||
|
|
||||||
// Register via API
|
// Register via API
|
||||||
const response = await request.post('http://localhost:3000/api/auth/sign-up/email', {
|
const response = await request.post('/api/auth/sign-up/email', {
|
||||||
data: {
|
data: {
|
||||||
email: testEmail,
|
email: testEmail,
|
||||||
password: testPassword,
|
password: testPassword,
|
||||||
name: testName
|
name: testName
|
||||||
},
|
},
|
||||||
headers: {
|
headers: {
|
||||||
'Origin': 'http://localhost:3000'
|
'Origin': BASE_URL
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -96,13 +98,13 @@ test.describe.serial('Account Lifecycle API Acceptance Test', () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Login via API
|
// Login via API
|
||||||
const response = await request.post('http://localhost:3000/api/auth/sign-in/email', {
|
const response = await request.post('/api/auth/sign-in/email', {
|
||||||
data: {
|
data: {
|
||||||
email: testEmail,
|
email: testEmail,
|
||||||
password: testPassword
|
password: testPassword
|
||||||
},
|
},
|
||||||
headers: {
|
headers: {
|
||||||
'Origin': 'http://localhost:3000'
|
'Origin': BASE_URL
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,92 @@
|
|||||||
|
import { test, expect } from '@playwright/test'
|
||||||
|
|
||||||
|
test.describe('Admin Smoke Test', () => {
|
||||||
|
test.describe('Admin Panel Navigation', () => {
|
||||||
|
test('should navigate to admin dashboard', async ({ page }) => {
|
||||||
|
await page.goto('/admin')
|
||||||
|
await expect(page.locator('text=Admin')).toBeVisible()
|
||||||
|
})
|
||||||
|
|
||||||
|
test('should navigate to matches admin page', async ({ page }) => {
|
||||||
|
await page.goto('/admin/matches')
|
||||||
|
await expect(page.locator('text=Match Management')).toBeVisible()
|
||||||
|
})
|
||||||
|
|
||||||
|
test('should navigate to players admin page', async ({ page }) => {
|
||||||
|
await page.goto('/admin/players')
|
||||||
|
await expect(page.locator('text=Player Management')).toBeVisible()
|
||||||
|
})
|
||||||
|
|
||||||
|
test('should navigate to users admin page', async ({ page }) => {
|
||||||
|
await page.goto('/admin/users')
|
||||||
|
await expect(page.locator('text=User Management')).toBeVisible()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
test.describe('Match Management', () => {
|
||||||
|
test('should display matches page', async ({ page }) => {
|
||||||
|
await page.goto('/admin/matches')
|
||||||
|
await expect(page.locator('text=Match Management')).toBeVisible()
|
||||||
|
|
||||||
|
const hasTable = await page.locator('table').count().then(c => c > 0)
|
||||||
|
const hasEmptyState = await page.locator('text=/no matches|No matches/').count().then(c => c > 0)
|
||||||
|
|
||||||
|
expect(hasTable || hasEmptyState).toBeTruthy()
|
||||||
|
})
|
||||||
|
|
||||||
|
test('should have delete button for matches when matches exist', async ({ page }) => {
|
||||||
|
await page.goto('/admin/matches')
|
||||||
|
const deleteButtons = page.locator('button:has-text("Delete")')
|
||||||
|
const count = await deleteButtons.count()
|
||||||
|
if (count > 0) {
|
||||||
|
await expect(page.locator('text=Actions')).toBeVisible()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
test.describe('Player Management', () => {
|
||||||
|
test('should display players table', async ({ page }) => {
|
||||||
|
await page.goto('/admin/players')
|
||||||
|
await expect(page.locator('table')).toBeVisible()
|
||||||
|
await expect(page.locator('text=Player Name')).toBeVisible()
|
||||||
|
await expect(page.locator('text=Current Elo')).toBeVisible()
|
||||||
|
await expect(page.locator('text=Actions')).toBeVisible()
|
||||||
|
})
|
||||||
|
|
||||||
|
test('should have edit and delete buttons for players', async ({ page }) => {
|
||||||
|
await page.goto('/admin/players')
|
||||||
|
await expect(page.locator('text=Actions')).toBeVisible()
|
||||||
|
})
|
||||||
|
|
||||||
|
test('should allow editing player name', async ({ page }) => {
|
||||||
|
await page.goto('/admin/players')
|
||||||
|
const editButton = page.locator('button:has-text("Edit")').first()
|
||||||
|
if (await editButton.isVisible()) {
|
||||||
|
await editButton.click()
|
||||||
|
|
||||||
|
await expect(page.locator('text=Edit Player Name')).toBeVisible()
|
||||||
|
|
||||||
|
await page.click('text=Cancel')
|
||||||
|
await expect(page.locator('text=Edit Player Name')).not.toBeVisible()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
test.describe('User Management', () => {
|
||||||
|
test('should display users page', async ({ page }) => {
|
||||||
|
await page.goto('/admin/users')
|
||||||
|
const hasTable = await page.locator('table').isVisible().catch(() => false)
|
||||||
|
const hasNoUsers = await page.locator('text=No users found').isVisible().catch(() => false)
|
||||||
|
|
||||||
|
expect(hasTable || hasNoUsers).toBeTruthy()
|
||||||
|
|
||||||
|
await expect(page.locator('text=User Management')).toBeVisible()
|
||||||
|
})
|
||||||
|
|
||||||
|
test('should have create user link', async ({ page }) => {
|
||||||
|
await page.goto('/admin/users')
|
||||||
|
const createLink = page.locator('a.bg-green-600:has-text("Create User")')
|
||||||
|
await expect(createLink).toBeVisible()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -78,7 +78,7 @@ test.describe('CSV Upload Player Deduplication', () => {
|
|||||||
formData.append('csvFile', file);
|
formData.append('csvFile', file);
|
||||||
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('/api/matches/upload', {
|
||||||
multipart: formData,
|
multipart: formData,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -132,7 +132,7 @@ test.describe('CSV Upload Player Deduplication', () => {
|
|||||||
formData.append('csvFile', file);
|
formData.append('csvFile', file);
|
||||||
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('/api/matches/upload', {
|
||||||
multipart: formData,
|
multipart: formData,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -189,7 +189,7 @@ test.describe('CSV Upload Player Deduplication', () => {
|
|||||||
formData.append('csvFile', file);
|
formData.append('csvFile', file);
|
||||||
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('/api/matches/upload', {
|
||||||
multipart: formData,
|
multipart: formData,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+18
-38
@@ -1,45 +1,25 @@
|
|||||||
/**
|
|
||||||
* 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 { test } from '@playwright/test';
|
||||||
import { execSync } from 'child_process';
|
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.describe('Cucumber E2E Tests', () => {
|
||||||
test('Run all Cucumber feature files', async () => {
|
test('Run all Cucumber feature files', async () => {
|
||||||
// This test is a placeholder that triggers Cucumber execution
|
const baseURL = process.env.CI
|
||||||
// In practice, Cucumber should be run directly via CLI
|
? 'https://euchre-ci.notsosm.art'
|
||||||
console.log('Cucumber tests should be run via: bun cucumber-js');
|
: 'http://localhost:3000';
|
||||||
|
|
||||||
|
const result = execSync(
|
||||||
|
'npx cucumber-js --config e2e/cucumber/cucumber.config.ts',
|
||||||
|
{
|
||||||
|
encoding: 'utf-8',
|
||||||
|
stdio: 'pipe',
|
||||||
|
env: {
|
||||||
|
...process.env,
|
||||||
|
BASE_URL: baseURL,
|
||||||
|
},
|
||||||
|
cwd: process.cwd(),
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
console.log(result);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
|
||||||
* 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|||||||
@@ -3,6 +3,11 @@ Feature: Home Page
|
|||||||
I want to see the home page
|
I want to see the home page
|
||||||
So that I can learn about the club and view player rankings
|
So that I can learn about the club and view player rankings
|
||||||
|
|
||||||
|
Background:
|
||||||
|
Given there are top players in the system
|
||||||
|
And there is a club president
|
||||||
|
And there is a recent tournament
|
||||||
|
|
||||||
@happy-path @public @home
|
@happy-path @public @home
|
||||||
Scenario: Home page displays Top 10 Players
|
Scenario: Home page displays Top 10 Players
|
||||||
Given I am on the home page
|
Given I am on the home page
|
||||||
|
|||||||
@@ -19,8 +19,6 @@ Feature: Tournament Schedule
|
|||||||
And I click the "Generate Schedule" button
|
And I click the "Generate Schedule" button
|
||||||
Then I should see "Generated"
|
Then I should see "Generated"
|
||||||
And I should see "rounds with"
|
And I should see "rounds with"
|
||||||
# Navigate away and back to verify schedule persisted (avoids HMR caching issues)
|
|
||||||
When I go to the tournament schedule page
|
|
||||||
Then I should see round 1 matchups
|
Then I should see round 1 matchups
|
||||||
And I should see round 2 matchups
|
And I should see round 2 matchups
|
||||||
|
|
||||||
@@ -31,8 +29,6 @@ Feature: Tournament Schedule
|
|||||||
When I go to the tournament schedule page
|
When I go to the tournament schedule page
|
||||||
And I click the "Generate Schedule" button
|
And I click the "Generate Schedule" button
|
||||||
Then I should see "Generated"
|
Then I should see "Generated"
|
||||||
# Navigate away and back to verify schedule persisted
|
|
||||||
When I go to the tournament schedule page
|
|
||||||
Then I should see 5 rounds
|
Then I should see 5 rounds
|
||||||
And each team should play every other team exactly once
|
And each team should play every other team exactly once
|
||||||
|
|
||||||
@@ -43,7 +39,5 @@ Feature: Tournament Schedule
|
|||||||
When I go to the tournament schedule page
|
When I go to the tournament schedule page
|
||||||
And I click the "Generate Schedule" button
|
And I click the "Generate Schedule" button
|
||||||
Then I should see "Generated"
|
Then I should see "Generated"
|
||||||
# Navigate away and back to ensure schedule data is loaded
|
|
||||||
When I go to the tournament schedule page
|
|
||||||
And I click on a matchup
|
And I click on a matchup
|
||||||
Then I should be on the match result entry page
|
Then I should be on the match result entry page
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ Given('I am logged in as a tournament admin', async function () {
|
|||||||
|
|
||||||
// Wait for any redirect away from register page
|
// Wait for any redirect away from register page
|
||||||
await world.page.waitForURL((url) => !url.toString().includes('/auth/register'), { timeout: 15000 });
|
await world.page.waitForURL((url) => !url.toString().includes('/auth/register'), { timeout: 15000 });
|
||||||
await world.page.waitForLoadState('networkidle');
|
await world.page.waitForLoadState('domcontentloaded');
|
||||||
await world.page.waitForTimeout(1000);
|
await world.page.waitForTimeout(1000);
|
||||||
|
|
||||||
const currentUrl = world.page.url();
|
const currentUrl = world.page.url();
|
||||||
@@ -166,7 +166,7 @@ Given('I am logged in as a tournament admin', async function () {
|
|||||||
|
|
||||||
// Navigate to trigger a fresh role fetch
|
// Navigate to trigger a fresh role fetch
|
||||||
await world.page.goto(`${world.baseURL}/rankings`);
|
await world.page.goto(`${world.baseURL}/rankings`);
|
||||||
await world.page.waitForLoadState('networkidle');
|
await world.page.waitForLoadState('domcontentloaded');
|
||||||
await world.page.waitForTimeout(500);
|
await world.page.waitForTimeout(500);
|
||||||
} else {
|
} else {
|
||||||
console.log(`🌍 WARNING: User not found in DB by email. Trying to find latest user...`);
|
console.log(`🌍 WARNING: User not found in DB by email. Trying to find latest user...`);
|
||||||
@@ -235,7 +235,7 @@ Given('I am logged in as a site admin', async function () {
|
|||||||
|
|
||||||
// Navigate to home page to trigger Navigation re-mount with new role
|
// Navigate to home page to trigger Navigation re-mount with new role
|
||||||
await world.page.goto(`${world.baseURL}/`);
|
await world.page.goto(`${world.baseURL}/`);
|
||||||
await world.page.waitForLoadState('networkidle');
|
await world.page.waitForLoadState('domcontentloaded');
|
||||||
await world.page.waitForTimeout(1000);
|
await world.page.waitForTimeout(1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -245,35 +245,53 @@ Given('I am logged in as a site admin', async function () {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Precondition: I am logged in as a club admin
|
* Precondition: I am logged in as a club admin
|
||||||
* Uses a pre-existing admin user from the database
|
* Creates a new user via UI and assigns club_admin role via Prisma
|
||||||
*/
|
*/
|
||||||
Given('I am logged in as a club admin', async function () {
|
Given('I am logged in as a club admin', async function () {
|
||||||
console.log('🌍 Logging in as existing club admin...');
|
console.log('🌍 Creating and logging in as a club admin...');
|
||||||
|
|
||||||
// Use the admin user created by seed.js
|
const credentials = generateTestCredentials();
|
||||||
const adminEmail = 'david@dhg.lol';
|
world.user = credentials;
|
||||||
const adminPassword = 'adminadmin';
|
|
||||||
|
|
||||||
world.user = {
|
await world.page.goto(`${world.baseURL}/auth/register`);
|
||||||
email: adminEmail,
|
|
||||||
password: adminPassword,
|
|
||||||
name: 'David Admin',
|
|
||||||
};
|
|
||||||
|
|
||||||
await world.page.goto(`${world.baseURL}/auth/login`);
|
|
||||||
await world.page.waitForLoadState('domcontentloaded');
|
await world.page.waitForLoadState('domcontentloaded');
|
||||||
|
|
||||||
await world.page.fill('input[name="email"]', adminEmail);
|
await world.page.fill('input[name="name"]', credentials.name);
|
||||||
await world.page.fill('input[name="password"]', adminPassword);
|
await world.page.fill('input[name="email"]', credentials.email);
|
||||||
await world.page.click('button[type="submit"]');
|
await world.page.fill('input[name="password"]', credentials.password);
|
||||||
|
|
||||||
// Wait for redirect after login
|
await world.page.click('button[type="submit"]');
|
||||||
try {
|
await world.page.waitForURL(/\/players\/\d+\/profile/, { timeout: 15000 });
|
||||||
await world.page.waitForURL((url) => !url.toString().includes('/auth/login'), { timeout: 10000 });
|
|
||||||
console.log(`🌍 Club admin logged in: ${adminEmail}`);
|
const currentUrl = world.page.url();
|
||||||
} catch (e) {
|
const match = currentUrl.match(/\/players\/(\d+)\/profile/);
|
||||||
console.log('🌍 Login redirect timed out, current URL:', world.page.url());
|
if (match) {
|
||||||
|
const playerId = match[1];
|
||||||
|
world.playerId = playerId;
|
||||||
|
|
||||||
|
const prisma = await world.getPrisma();
|
||||||
|
const player = await prisma.player.findUnique({
|
||||||
|
where: { id: parseInt(playerId) },
|
||||||
|
include: { user: true }
|
||||||
|
});
|
||||||
|
|
||||||
|
if (player && player.user) {
|
||||||
|
const userId = player.user.id;
|
||||||
|
(world.user as any).id = userId;
|
||||||
|
|
||||||
|
await prisma.user.update({
|
||||||
|
where: { id: userId },
|
||||||
|
data: { role: 'club_admin' }
|
||||||
|
});
|
||||||
|
console.log(`🌍 Assigned club_admin role to user: ${userId}`);
|
||||||
|
|
||||||
|
await world.page.goto(`${world.baseURL}/`);
|
||||||
|
await world.page.waitForLoadState('domcontentloaded');
|
||||||
|
await world.page.waitForTimeout(1000);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log(`🌍 Club admin created: ${credentials.email}`);
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -564,11 +582,11 @@ Given('a tournament exists with {int} teams', async function (teamCount: number)
|
|||||||
When('I go to the tournament schedule page', async function () {
|
When('I go to the tournament schedule page', async function () {
|
||||||
console.log('🌍 Going to tournament schedule page');
|
console.log('🌍 Going to tournament schedule page');
|
||||||
const tournamentId = world.tournament?.id || 1;
|
const tournamentId = world.tournament?.id || 1;
|
||||||
// Add cache-busting timestamp to force fresh data
|
|
||||||
const url = `${world.baseURL}/admin/tournaments/${tournamentId}/schedule?t=${Date.now()}`;
|
const url = `${world.baseURL}/admin/tournaments/${tournamentId}/schedule?t=${Date.now()}`;
|
||||||
await world.page.goto(url);
|
await world.page.goto(url);
|
||||||
await world.page.waitForLoadState('networkidle');
|
await world.page.waitForLoadState('domcontentloaded');
|
||||||
await world.page.waitForTimeout(1000);
|
// Wait for ScheduleDisplay client component to hydrate
|
||||||
|
await world.page.waitForTimeout(2000);
|
||||||
});
|
});
|
||||||
|
|
||||||
Given('a tournament has a generated schedule', async function () {
|
Given('a tournament has a generated schedule', async function () {
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ When('I go back', async function () {
|
|||||||
|
|
||||||
When('I refresh the page', async function () {
|
When('I refresh the page', async function () {
|
||||||
console.log('🌍 About to refresh page from URL:', world.page.url());
|
console.log('🌍 About to refresh page from URL:', world.page.url());
|
||||||
await world.page.reload({ waitUntil: 'networkidle' });
|
await world.page.reload({ waitUntil: 'load' });
|
||||||
console.log('🌍 Page refreshed, new URL:', world.page.url());
|
console.log('🌍 Page refreshed, new URL:', world.page.url());
|
||||||
// Wait extra time for full render
|
// Wait extra time for full render
|
||||||
await world.page.waitForTimeout(2000);
|
await world.page.waitForTimeout(2000);
|
||||||
@@ -191,7 +191,7 @@ When('I click the {string} link', async function (linkText: string) {
|
|||||||
|
|
||||||
// Wait for navigation to complete
|
// Wait for navigation to complete
|
||||||
try {
|
try {
|
||||||
await world.page.waitForLoadState('networkidle', { timeout: 10000 });
|
await world.page.waitForLoadState('domcontentloaded', { timeout: 10000 });
|
||||||
} catch {
|
} catch {
|
||||||
console.log(`🌍 Networkidle not reached, continuing`);
|
console.log(`🌍 Networkidle not reached, continuing`);
|
||||||
}
|
}
|
||||||
@@ -647,17 +647,14 @@ Then('I should be on the match detail page', async function () {
|
|||||||
// Tournament Schedule Steps
|
// Tournament Schedule Steps
|
||||||
Then('I should see round {int} matchups', async function (roundNumber: number) {
|
Then('I should see round {int} matchups', async function (roundNumber: number) {
|
||||||
const roundText = `Round ${roundNumber}`;
|
const roundText = `Round ${roundNumber}`;
|
||||||
await world.page.waitForTimeout(2000);
|
const roundHeader = world.page.locator(`h3:has-text("${roundText}")`);
|
||||||
const content = await world.page.content();
|
await expect(roundHeader).toBeVisible({ timeout: 30000 });
|
||||||
console.log(`🌍 Page URL: ${world.page.url()}`);
|
|
||||||
console.log(`🌍 Page has "Round ${roundNumber}": ${content.includes(`Round ${roundNumber}`)}`);
|
|
||||||
console.log(`🌍 Page has "Generated": ${content.includes('Generated')}`);
|
|
||||||
|
|
||||||
await expect(world.page.locator(`text=${roundText}`)).toBeVisible({ timeout: 10000 });
|
|
||||||
console.log(`🌍 Verified round ${roundNumber} matchups are visible`);
|
console.log(`🌍 Verified round ${roundNumber} matchups are visible`);
|
||||||
});
|
});
|
||||||
|
|
||||||
Then('I should see {int} rounds', async function (expectedRounds: number) {
|
Then('I should see {int} rounds', async function (expectedRounds: number) {
|
||||||
|
await world.page.waitForLoadState('domcontentloaded');
|
||||||
|
await world.page.waitForTimeout(2000);
|
||||||
const roundHeaders = await world.page.locator('h3:has-text("Round")').count();
|
const roundHeaders = await world.page.locator('h3:has-text("Round")').count();
|
||||||
expect(roundHeaders).toBe(expectedRounds);
|
expect(roundHeaders).toBe(expectedRounds);
|
||||||
console.log(`🌍 Verified ${expectedRounds} rounds are visible`);
|
console.log(`🌍 Verified ${expectedRounds} rounds are visible`);
|
||||||
@@ -693,7 +690,7 @@ Then('I should be on the match result entry page', async function () {
|
|||||||
|
|
||||||
// View As Role Steps
|
// View As Role Steps
|
||||||
When('I view the navigation', async function () {
|
When('I view the navigation', async function () {
|
||||||
await world.page.waitForLoadState('networkidle');
|
await world.page.waitForLoadState('domcontentloaded');
|
||||||
await world.page.waitForTimeout(1000);
|
await world.page.waitForTimeout(1000);
|
||||||
console.log('🌍 Viewing navigation');
|
console.log('🌍 Viewing navigation');
|
||||||
});
|
});
|
||||||
@@ -753,7 +750,7 @@ Then('I should not see the viewing as banner', async function () {
|
|||||||
When('I go to the tournament detail page', async function () {
|
When('I go to the tournament detail page', async function () {
|
||||||
const tournamentId = world.tournament?.id || 1;
|
const tournamentId = world.tournament?.id || 1;
|
||||||
await world.page.goto(`${world.baseURL}/admin/tournaments/${tournamentId}`);
|
await world.page.goto(`${world.baseURL}/admin/tournaments/${tournamentId}`);
|
||||||
await world.page.waitForLoadState('networkidle');
|
await world.page.waitForLoadState('domcontentloaded');
|
||||||
await world.page.waitForTimeout(500);
|
await world.page.waitForTimeout(500);
|
||||||
console.log(`🌍 Navigated to tournament detail page: ${tournamentId}`);
|
console.log(`🌍 Navigated to tournament detail page: ${tournamentId}`);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
import { Given, After } from '@cucumber/cucumber';
|
||||||
|
import { world } from '../support/world';
|
||||||
|
|
||||||
|
Given('there are top players in the system', async function () {
|
||||||
|
const prisma = await world.getPrisma();
|
||||||
|
const timestamp = Date.now();
|
||||||
|
|
||||||
|
for (let i = 0; i < 3; i++) {
|
||||||
|
await prisma.player.create({
|
||||||
|
data: {
|
||||||
|
name: `Home Test Player ${timestamp} ${i + 1}`,
|
||||||
|
normalizedName: `home_test_player_${timestamp}_${i + 1}`.toLowerCase(),
|
||||||
|
currentElo: 2000 - i * 10,
|
||||||
|
gamesPlayed: 10,
|
||||||
|
wins: 7,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Given('there is a club president', async function () {
|
||||||
|
const prisma = await world.getPrisma();
|
||||||
|
const timestamp = Date.now();
|
||||||
|
|
||||||
|
await prisma.user.create({
|
||||||
|
data: {
|
||||||
|
email: `president-${timestamp}@example.com`,
|
||||||
|
name: `Club President ${timestamp}`,
|
||||||
|
role: 'club_admin',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
Given('there is a recent tournament', async function () {
|
||||||
|
const prisma = await world.getPrisma();
|
||||||
|
const timestamp = Date.now();
|
||||||
|
|
||||||
|
const tournament = await prisma.event.create({
|
||||||
|
data: {
|
||||||
|
name: `Recent Tournament ${timestamp}`,
|
||||||
|
eventType: 'tournament',
|
||||||
|
eventDate: new Date(Date.now() + 86400000),
|
||||||
|
status: 'completed',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const p1 = await prisma.player.create({
|
||||||
|
data: { name: `HP1 ${timestamp}`, normalizedName: `hp1_${timestamp}`.toLowerCase(), currentElo: 1500 },
|
||||||
|
});
|
||||||
|
const p2 = await prisma.player.create({
|
||||||
|
data: { name: `HP2 ${timestamp}`, normalizedName: `hp2_${timestamp}`.toLowerCase(), currentElo: 1480 },
|
||||||
|
});
|
||||||
|
const p3 = await prisma.player.create({
|
||||||
|
data: { name: `HP3 ${timestamp}`, normalizedName: `hp3_${timestamp}`.toLowerCase(), currentElo: 1450 },
|
||||||
|
});
|
||||||
|
const p4 = await prisma.player.create({
|
||||||
|
data: { name: `HP4 ${timestamp}`, normalizedName: `hp4_${timestamp}`.toLowerCase(), currentElo: 1420 },
|
||||||
|
});
|
||||||
|
|
||||||
|
await prisma.match.create({
|
||||||
|
data: {
|
||||||
|
eventId: tournament.id,
|
||||||
|
player1P1Id: p1.id,
|
||||||
|
player1P2Id: p2.id,
|
||||||
|
player2P1Id: p3.id,
|
||||||
|
player2P2Id: p4.id,
|
||||||
|
team1Score: 10,
|
||||||
|
team2Score: 5,
|
||||||
|
status: 'completed',
|
||||||
|
playedAt: new Date(),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -14,22 +14,17 @@ setDefaultTimeout(30000);
|
|||||||
// Global browser instance
|
// Global browser instance
|
||||||
let browser: Browser;
|
let browser: Browser;
|
||||||
|
|
||||||
// Load environment files
|
// Load environment file (gitignored, contains dev database URL)
|
||||||
const envPath = path.resolve(process.cwd(), '.env');
|
|
||||||
const envDevPath = path.resolve(process.cwd(), '.env.development');
|
const envDevPath = path.resolve(process.cwd(), '.env.development');
|
||||||
|
|
||||||
if (fs.existsSync(envPath)) {
|
|
||||||
require('dotenv').config({ path: envPath });
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fs.existsSync(envDevPath)) {
|
if (fs.existsSync(envDevPath)) {
|
||||||
require('dotenv').config({ path: envDevPath, override: true });
|
require('dotenv').config({ path: envDevPath });
|
||||||
}
|
}
|
||||||
|
|
||||||
// Database safety check - prevent tests from running against production
|
// Database safety check - prevent tests from running against production
|
||||||
function isProductionDatabase(): boolean {
|
function isProductionDatabase(): boolean {
|
||||||
const dbUrl = process.env.DATABASE_URL || '';
|
const dbUrl = process.env.DATABASE_URL || '';
|
||||||
return dbUrl.includes('euchre_camp') && !dbUrl.includes('_dev') && !dbUrl.includes('test');
|
return dbUrl.includes('euchre_camp') && !dbUrl.includes('_dev') && !dbUrl.includes('_ci') && !dbUrl.includes('test');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isProductionDatabase()) {
|
if (isProductionDatabase()) {
|
||||||
@@ -135,7 +130,8 @@ After(async function () {
|
|||||||
where: {
|
where: {
|
||||||
OR: [
|
OR: [
|
||||||
{ name: { startsWith: 'Test Tournament' } },
|
{ name: { startsWith: 'Test Tournament' } },
|
||||||
{ name: { startsWith: 'Test Schedule Tournament' } }
|
{ name: { startsWith: 'Test Schedule Tournament' } },
|
||||||
|
{ name: { startsWith: 'Recent Tournament' } },
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
select: { id: true }
|
select: { id: true }
|
||||||
@@ -176,7 +172,9 @@ After(async function () {
|
|||||||
{ name: { startsWith: 'Tournament Player' } },
|
{ name: { startsWith: 'Tournament Player' } },
|
||||||
{ name: { startsWith: 'Schedule Player' } },
|
{ name: { startsWith: 'Schedule Player' } },
|
||||||
{ name: { startsWith: 'Test Player' } },
|
{ name: { startsWith: 'Test Player' } },
|
||||||
{ name: { startsWith: 'Test Activity Player' } }
|
{ name: { startsWith: 'Test Activity Player' } },
|
||||||
|
{ name: { startsWith: 'Home Test Player' } },
|
||||||
|
{ name: { startsWith: 'HP' } },
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -184,7 +182,10 @@ After(async function () {
|
|||||||
// Delete test users
|
// Delete test users
|
||||||
await prisma.user.deleteMany({
|
await prisma.user.deleteMany({
|
||||||
where: {
|
where: {
|
||||||
email: { startsWith: 'cucumber-' }
|
OR: [
|
||||||
|
{ email: { startsWith: 'cucumber-' } },
|
||||||
|
{ email: { startsWith: 'president-' } },
|
||||||
|
]
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+12
-10
@@ -94,10 +94,11 @@ test.describe('Elo Rating Updates', () => {
|
|||||||
|
|
||||||
test('Elo rating updates after match upload', async ({ page }) => {
|
test('Elo rating updates after match upload', async ({ page }) => {
|
||||||
// Step 1: Create test players with known initial ratings
|
// Step 1: Create test players with known initial ratings
|
||||||
|
const ts = Date.now();
|
||||||
const player1 = await prisma.player.create({
|
const player1 = await prisma.player.create({
|
||||||
data: {
|
data: {
|
||||||
name: 'Elo Test Player 1',
|
name: `Elo Test Player 1 ${ts}`,
|
||||||
normalizedName: 'elo test player 1',
|
normalizedName: `elo_test_player_1_${ts}`,
|
||||||
currentElo: 1500,
|
currentElo: 1500,
|
||||||
gamesPlayed: 0,
|
gamesPlayed: 0,
|
||||||
wins: 0,
|
wins: 0,
|
||||||
@@ -107,8 +108,8 @@ test.describe('Elo Rating Updates', () => {
|
|||||||
|
|
||||||
const player2 = await prisma.player.create({
|
const player2 = await prisma.player.create({
|
||||||
data: {
|
data: {
|
||||||
name: 'Elo Test Player 2',
|
name: `Elo Test Player 2 ${ts}`,
|
||||||
normalizedName: 'elo test player 2',
|
normalizedName: `elo_test_player_2_${ts}`,
|
||||||
currentElo: 1500,
|
currentElo: 1500,
|
||||||
gamesPlayed: 0,
|
gamesPlayed: 0,
|
||||||
wins: 0,
|
wins: 0,
|
||||||
@@ -118,8 +119,8 @@ test.describe('Elo Rating Updates', () => {
|
|||||||
|
|
||||||
const player3 = await prisma.player.create({
|
const player3 = await prisma.player.create({
|
||||||
data: {
|
data: {
|
||||||
name: 'Elo Test Player 3',
|
name: `Elo Test Player 3 ${ts}`,
|
||||||
normalizedName: 'elo test player 3',
|
normalizedName: `elo_test_player_3_${ts}`,
|
||||||
currentElo: 1500,
|
currentElo: 1500,
|
||||||
gamesPlayed: 0,
|
gamesPlayed: 0,
|
||||||
wins: 0,
|
wins: 0,
|
||||||
@@ -129,8 +130,8 @@ test.describe('Elo Rating Updates', () => {
|
|||||||
|
|
||||||
const player4 = await prisma.player.create({
|
const player4 = await prisma.player.create({
|
||||||
data: {
|
data: {
|
||||||
name: 'Elo Test Player 4',
|
name: `Elo Test Player 4 ${ts}`,
|
||||||
normalizedName: 'elo test player 4',
|
normalizedName: `elo_test_player_4_${ts}`,
|
||||||
currentElo: 1500,
|
currentElo: 1500,
|
||||||
gamesPlayed: 0,
|
gamesPlayed: 0,
|
||||||
wins: 0,
|
wins: 0,
|
||||||
@@ -369,10 +370,11 @@ ${tournament.id},2,1,${player1.name},${player3.name},10,${player2.name},${player
|
|||||||
|
|
||||||
test('Elo ratings are visible on player profile', async ({ page }) => {
|
test('Elo ratings are visible on player profile', async ({ page }) => {
|
||||||
// Create a test player
|
// Create a test player
|
||||||
|
const ts = Date.now();
|
||||||
const player = await prisma.player.create({
|
const player = await prisma.player.create({
|
||||||
data: {
|
data: {
|
||||||
name: 'Elo Test Profile Player',
|
name: `Elo Test Profile Player ${ts}`,
|
||||||
normalizedName: 'elo test profile player',
|
normalizedName: `elo_test_profile_player_${ts}`,
|
||||||
currentElo: 1750,
|
currentElo: 1750,
|
||||||
gamesPlayed: 50,
|
gamesPlayed: 50,
|
||||||
wins: 30,
|
wins: 30,
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
|
|
||||||
import { test, expect } from '@playwright/test';
|
import { test, expect } from '@playwright/test';
|
||||||
import { prisma } from '@/lib/prisma';
|
import { prisma } from '@/lib/prisma';
|
||||||
|
const BASE_URL = process.env.CI ? 'https://euchre-ci.notsosm.art' : 'http://localhost:3000';
|
||||||
|
|
||||||
|
|
||||||
function getTestCredentials() {
|
function getTestCredentials() {
|
||||||
@@ -35,11 +36,11 @@ test.describe.serial('Epic 1: User Logout', () => {
|
|||||||
testName = credentials.name;
|
testName = credentials.name;
|
||||||
|
|
||||||
// Create test user via API with proper origin header
|
// Create test user via API with proper origin header
|
||||||
const response = await fetch('http://localhost:3000/api/auth/sign-up/email', {
|
const response = await fetch(`${BASE_URL}/api/auth/sign-up/email`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
'Origin': 'http://localhost:3000',
|
'Origin': BASE_URL,
|
||||||
'X-Requested-With': 'XMLHttpRequest'
|
'X-Requested-With': 'XMLHttpRequest'
|
||||||
},
|
},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
@@ -92,7 +93,7 @@ test.describe.serial('Epic 1: User Logout', () => {
|
|||||||
|
|
||||||
test('Logout button appears in navigation when logged in', async ({ page }) => {
|
test('Logout button appears in navigation when logged in', async ({ page }) => {
|
||||||
// Login first
|
// Login first
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
|
|
||||||
// Wait for page to load
|
// Wait for page to load
|
||||||
await page.waitForLoadState('domcontentloaded');
|
await page.waitForLoadState('domcontentloaded');
|
||||||
@@ -156,7 +157,7 @@ test.describe.serial('Epic 1: User Logout', () => {
|
|||||||
|
|
||||||
test('Logout clears session and redirects to home', async ({ page }) => {
|
test('Logout clears session and redirects to home', async ({ page }) => {
|
||||||
// Login first
|
// Login first
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
@@ -180,7 +181,7 @@ test.describe.serial('Epic 1: User Logout', () => {
|
|||||||
|
|
||||||
test('After logout, protected pages redirect to login', async ({ page }) => {
|
test('After logout, protected pages redirect to login', async ({ page }) => {
|
||||||
// Login first
|
// Login first
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
@@ -200,7 +201,7 @@ test.describe.serial('Epic 1: User Logout', () => {
|
|||||||
await page.waitForURL('**/auth/login**', { timeout: 10000 });
|
await page.waitForURL('**/auth/login**', { timeout: 10000 });
|
||||||
|
|
||||||
// Try to access admin page
|
// Try to access admin page
|
||||||
await page.goto('http://localhost:3000/admin');
|
await page.goto('/admin');
|
||||||
|
|
||||||
// Should redirect to login
|
// Should redirect to login
|
||||||
await expect(page).toHaveURL(/.*auth\/login.*/);
|
await expect(page).toHaveURL(/.*auth\/login.*/);
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import { test, expect } from '@playwright/test';
|
|||||||
|
|
||||||
test.describe.skip('Epic 1: Password Reset (Not Implemented)', () => {
|
test.describe.skip('Epic 1: Password Reset (Not Implemented)', () => {
|
||||||
test('Forgot password link exists on login page', async ({ page }) => {
|
test('Forgot password link exists on login page', async ({ page }) => {
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
|
|
||||||
// Check for forgot password link
|
// Check for forgot password link
|
||||||
await expect(page.locator('a[href*="password-reset"]')).toBeVisible();
|
await expect(page.locator('a[href*="password-reset"]')).toBeVisible();
|
||||||
@@ -29,7 +29,7 @@ test.describe.skip('Epic 1: Password Reset (Not Implemented)', () => {
|
|||||||
test('Password reset page exists but is not functional', async ({ page }) => {
|
test('Password reset page exists but is not functional', async ({ page }) => {
|
||||||
// Note: The link exists but the page may not be implemented
|
// Note: The link exists but the page may not be implemented
|
||||||
// This test documents the current state
|
// This test documents the current state
|
||||||
await page.goto('http://localhost:3000/auth/password-reset');
|
await page.goto('/auth/password-reset');
|
||||||
|
|
||||||
// Check if page loads (may show "not implemented" message)
|
// Check if page loads (may show "not implemented" message)
|
||||||
await expect(page.locator('body')).toBeVisible();
|
await expect(page.locator('body')).toBeVisible();
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ test.describe.serial('Epic 1: User Registration', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('Registration page exists and loads', async ({ page }) => {
|
test('Registration page exists and loads', async ({ page }) => {
|
||||||
await page.goto('http://localhost:3000/auth/register');
|
await page.goto('/auth/register');
|
||||||
|
|
||||||
// Check for registration form elements
|
// Check for registration form elements
|
||||||
await expect(page.locator('input[name="name"]')).toBeVisible();
|
await expect(page.locator('input[name="name"]')).toBeVisible();
|
||||||
@@ -61,7 +61,7 @@ test.describe.serial('Epic 1: User Registration', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('Registration with valid data creates account', async ({ page }) => {
|
test('Registration with valid data creates account', async ({ page }) => {
|
||||||
await page.goto('http://localhost:3000/auth/register');
|
await page.goto('/auth/register');
|
||||||
|
|
||||||
// Wait for page to load
|
// Wait for page to load
|
||||||
await page.waitForLoadState('domcontentloaded');
|
await page.waitForLoadState('domcontentloaded');
|
||||||
@@ -122,7 +122,7 @@ test.describe.serial('Epic 1: User Registration', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('Registration with duplicate email fails', async ({ page }) => {
|
test('Registration with duplicate email fails', async ({ page }) => {
|
||||||
await page.goto('http://localhost:3000/auth/register');
|
await page.goto('/auth/register');
|
||||||
|
|
||||||
// Fill registration form with existing email
|
// Fill registration form with existing email
|
||||||
await page.fill('input[name="name"]', testName);
|
await page.fill('input[name="name"]', testName);
|
||||||
@@ -147,7 +147,7 @@ test.describe.serial('Epic 1: User Registration', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('Registration with weak password fails', async ({ page }) => {
|
test('Registration with weak password fails', async ({ page }) => {
|
||||||
await page.goto('http://localhost:3000/auth/register');
|
await page.goto('/auth/register');
|
||||||
|
|
||||||
// Fill registration form with weak password
|
// Fill registration form with weak password
|
||||||
await page.fill('input[name="name"]', testName);
|
await page.fill('input[name="name"]', testName);
|
||||||
@@ -162,7 +162,7 @@ test.describe.serial('Epic 1: User Registration', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('Auto-created player profile is linked to user', async ({ page }) => {
|
test('Auto-created player profile is linked to user', async ({ page }) => {
|
||||||
await page.goto('http://localhost:3000/auth/register');
|
await page.goto('/auth/register');
|
||||||
|
|
||||||
const profileEmail = `profile-${Date.now()}@example.com`;
|
const profileEmail = `profile-${Date.now()}@example.com`;
|
||||||
const profileName = 'Profile Test User';
|
const profileName = 'Profile Test User';
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
/**
|
||||||
|
* Epic 3: Rankings & Public Data
|
||||||
|
* Acceptance Test: Player Rankings Page
|
||||||
|
*
|
||||||
|
* User Story: As a visitor, I want to view player rankings so that I can see top players
|
||||||
|
*
|
||||||
|
* Acceptance Criteria:
|
||||||
|
* - Sortable rankings table
|
||||||
|
* - Columns: Rank, Name, Elo, Win Rate, Games Played
|
||||||
|
* - Search/filter functionality
|
||||||
|
* - Pagination
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { test, expect } from '@playwright/test';
|
||||||
|
|
||||||
|
test.describe('Epic 3: Rankings Page', () => {
|
||||||
|
test('Rankings page loads and displays rankings table', async ({ page }) => {
|
||||||
|
await page.goto('/rankings');
|
||||||
|
|
||||||
|
// Check page title or heading
|
||||||
|
await expect(page.locator('h1, h2')).toContainText(/rankings?/i);
|
||||||
|
|
||||||
|
// Check for rankings table
|
||||||
|
await expect(page.locator('table')).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Rankings table displays player columns', async ({ page }) => {
|
||||||
|
await page.goto('/rankings');
|
||||||
|
|
||||||
|
// Check for expected column headers
|
||||||
|
const table = page.locator('table');
|
||||||
|
await expect(table).toBeVisible();
|
||||||
|
|
||||||
|
// Check for column headers (may vary based on implementation)
|
||||||
|
const headerCount = await page.locator('th').count();
|
||||||
|
expect(headerCount).toBeGreaterThan(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Rankings page is publicly accessible (no login required)', async ({ page }) => {
|
||||||
|
// Navigate directly to rankings without logging in
|
||||||
|
await page.goto('/rankings');
|
||||||
|
|
||||||
|
// Page should load without redirecting to login
|
||||||
|
await expect(page).toHaveURL(/.*rankings.*/);
|
||||||
|
await expect(page.locator('body')).toBeVisible();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -13,6 +13,7 @@
|
|||||||
|
|
||||||
import { test, expect } from '@playwright/test';
|
import { test, expect } from '@playwright/test';
|
||||||
import { prisma } from '@/lib/prisma';
|
import { prisma } from '@/lib/prisma';
|
||||||
|
const BASE_URL = process.env.CI ? 'https://euchre-ci.notsosm.art' : 'http://localhost:3000';
|
||||||
|
|
||||||
|
|
||||||
function getTestCredentials() {
|
function getTestCredentials() {
|
||||||
@@ -36,11 +37,11 @@ test.describe.serial('Epic 4: Tournament Creation', () => {
|
|||||||
testName = credentials.name;
|
testName = credentials.name;
|
||||||
|
|
||||||
// Create admin user via API
|
// Create admin user via API
|
||||||
const response = await fetch('http://localhost:3000/api/auth/sign-up/email', {
|
const response = await fetch(`${BASE_URL}/api/auth/sign-up/email`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
'Origin': 'http://localhost:3000'
|
'Origin': BASE_URL
|
||||||
},
|
},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
email: testEmail,
|
email: testEmail,
|
||||||
@@ -82,7 +83,7 @@ test.describe.serial('Epic 4: Tournament Creation', () => {
|
|||||||
|
|
||||||
test('Tournament creation page exists and loads', async ({ page }) => {
|
test('Tournament creation page exists and loads', async ({ page }) => {
|
||||||
// Login first
|
// Login first
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
@@ -91,7 +92,7 @@ test.describe.serial('Epic 4: Tournament Creation', () => {
|
|||||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
// Navigate to new tournament page
|
// Navigate to new tournament page
|
||||||
await page.goto('http://localhost:3000/admin/tournaments/new');
|
await page.goto('/admin/tournaments/new');
|
||||||
|
|
||||||
// Check for form
|
// Check for form
|
||||||
await expect(page.locator('form')).toBeVisible();
|
await expect(page.locator('form')).toBeVisible();
|
||||||
@@ -99,7 +100,7 @@ test.describe.serial('Epic 4: Tournament Creation', () => {
|
|||||||
|
|
||||||
test('Tournament form has required fields', async ({ page }) => {
|
test('Tournament form has required fields', async ({ page }) => {
|
||||||
// Login first
|
// Login first
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
@@ -107,7 +108,7 @@ test.describe.serial('Epic 4: Tournament Creation', () => {
|
|||||||
// Wait for redirect to admin or player profile (indicates successful login)
|
// Wait for redirect to admin or player profile (indicates successful login)
|
||||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
await page.goto('http://localhost:3000/admin/tournaments/new');
|
await page.goto('/admin/tournaments/new');
|
||||||
|
|
||||||
// Check for required fields
|
// Check for required fields
|
||||||
await expect(page.locator('input[name="name"]')).toBeVisible();
|
await expect(page.locator('input[name="name"]')).toBeVisible();
|
||||||
@@ -117,7 +118,7 @@ test.describe.serial('Epic 4: Tournament Creation', () => {
|
|||||||
|
|
||||||
test('Create tournament with valid data', async ({ page }) => {
|
test('Create tournament with valid data', async ({ page }) => {
|
||||||
// Login first
|
// Login first
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
@@ -126,7 +127,7 @@ test.describe.serial('Epic 4: Tournament Creation', () => {
|
|||||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
// Navigate to new tournament page
|
// Navigate to new tournament page
|
||||||
await page.goto('http://localhost:3000/admin/tournaments/new');
|
await page.goto('/admin/tournaments/new');
|
||||||
|
|
||||||
const tournamentName = `Test Tournament ${Date.now()}`;
|
const tournamentName = `Test Tournament ${Date.now()}`;
|
||||||
|
|
||||||
|
|||||||
+61
-83
@@ -4,40 +4,28 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { chromium, type FullConfig } from '@playwright/test';
|
import { chromium, type FullConfig } from '@playwright/test';
|
||||||
import { prisma } from '@/lib/prisma';
|
import { PrismaClient } from '@prisma/client';
|
||||||
import { cleanupAllTestData } from '@/__tests__/test-utils';
|
import { PrismaPg } from '@prisma/adapter-pg';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import fs from 'fs';
|
import fs from 'fs';
|
||||||
|
|
||||||
// Load .env file first, then .env.development (which will override .env)
|
|
||||||
const envPath = path.resolve(process.cwd(), '.env');
|
|
||||||
const envDevPath = path.resolve(process.cwd(), '.env.development');
|
|
||||||
|
|
||||||
// Load base .env file
|
|
||||||
if (fs.existsSync(envPath)) {
|
|
||||||
require('dotenv').config({ path: envPath });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load .env.development file (will override .env settings)
|
|
||||||
if (fs.existsSync(envDevPath)) {
|
|
||||||
require('dotenv').config({ path: envDevPath, override: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
const authFile = 'playwright/.auth/user.json';
|
const authFile = 'playwright/.auth/user.json';
|
||||||
const adminAuthFile = 'playwright/.auth/admin.json';
|
const adminAuthFile = 'playwright/.auth/admin.json';
|
||||||
|
|
||||||
// Check if we're using the dev database
|
function isDatabase(url: string, name: string): boolean {
|
||||||
function isDevDatabase(): boolean {
|
return url.includes(name);
|
||||||
const dbUrl = process.env.DATABASE_URL || '';
|
|
||||||
return dbUrl.includes('euchre_camp_dev');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function isProductionDatabase(): boolean {
|
function isProductionDatabase(): boolean {
|
||||||
const dbUrl = process.env.DATABASE_URL || '';
|
const dbUrl = process.env.DATABASE_URL || '';
|
||||||
return dbUrl.includes('euchre_camp') && !dbUrl.includes('_dev');
|
return isDatabase(dbUrl, 'euchre_camp') && !isDatabase(dbUrl, '_dev') && !isDatabase(dbUrl, '_ci');
|
||||||
|
}
|
||||||
|
|
||||||
|
function isCIDatabase(): boolean {
|
||||||
|
const dbUrl = process.env.DATABASE_URL || '';
|
||||||
|
return isDatabase(dbUrl, '_ci');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Strict check - fail if using production database
|
|
||||||
if (isProductionDatabase()) {
|
if (isProductionDatabase()) {
|
||||||
console.error('');
|
console.error('');
|
||||||
console.error('='.repeat(80));
|
console.error('='.repeat(80));
|
||||||
@@ -46,59 +34,70 @@ if (isProductionDatabase()) {
|
|||||||
console.error('');
|
console.error('');
|
||||||
console.error('Current DATABASE_URL:', process.env.DATABASE_URL);
|
console.error('Current DATABASE_URL:', process.env.DATABASE_URL);
|
||||||
console.error('');
|
console.error('');
|
||||||
console.error('Tests MUST run against the development database (euchre_camp_dev)');
|
console.error('Tests MUST run against development (euchre_camp_dev) or CI (euchre_camp_ci)');
|
||||||
console.error('');
|
|
||||||
console.error('To fix this:');
|
|
||||||
console.error(' 1. Run: npm run test:acceptance');
|
|
||||||
console.error(' 2. Or set: DATABASE_URL environment variable to dev database URL');
|
|
||||||
console.error(' 3. Or load .env.development: source .env.development && npm run test:acceptance');
|
|
||||||
console.error('');
|
console.error('');
|
||||||
console.error('Aborting test execution to prevent data corruption.');
|
console.error('Aborting test execution to prevent data corruption.');
|
||||||
console.error('');
|
console.error('');
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isDevDatabase()) {
|
function createPrismaClient() {
|
||||||
console.warn('⚠️ WARNING: DATABASE_URL does not contain euchre_camp_dev');
|
const databaseUrl = process.env.DATABASE_URL;
|
||||||
console.warn(' Current DATABASE_URL:', process.env.DATABASE_URL);
|
if (!databaseUrl) throw new Error('DATABASE_URL is required');
|
||||||
|
const adapter = new PrismaPg({ connectionString: databaseUrl });
|
||||||
|
return new PrismaClient({ adapter });
|
||||||
}
|
}
|
||||||
|
|
||||||
export default async function globalSetup(config: FullConfig) {
|
async function resetDatabaseSchema(prisma: PrismaClient) {
|
||||||
|
console.log('Resetting database schema...');
|
||||||
|
|
||||||
|
const tables = await prisma.$queryRaw<{ tablename: string }[]>`
|
||||||
|
SELECT tablename FROM pg_tables
|
||||||
|
WHERE schemaname = 'public' AND tablename NOT LIKE '_prisma_migrations'
|
||||||
|
`;
|
||||||
|
|
||||||
|
if (tables.length > 0) {
|
||||||
|
await prisma.$executeRawUnsafe(`
|
||||||
|
DROP SCHEMA public CASCADE;
|
||||||
|
CREATE SCHEMA public;
|
||||||
|
`);
|
||||||
|
console.log(`Dropped ${tables.length} tables`);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('Running migrations...');
|
||||||
|
const { execSync } = await import('child_process');
|
||||||
|
execSync('bunx prisma migrate deploy', { stdio: 'inherit' });
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createTestUsers(config: FullConfig) {
|
||||||
const baseURL = config.projects[0]?.use?.baseURL || 'http://localhost:3000';
|
const baseURL = config.projects[0]?.use?.baseURL || 'http://localhost:3000';
|
||||||
|
|
||||||
const browser = await chromium.launch();
|
const browser = await chromium.launch();
|
||||||
const context = await browser.newContext();
|
const context = await browser.newContext();
|
||||||
const page = await context.newPage();
|
const page = await context.newPage();
|
||||||
|
|
||||||
// Log all responses for debugging
|
|
||||||
page.on('response', response => {
|
page.on('response', response => {
|
||||||
if (response.url().includes('/api/auth')) {
|
if (response.url().includes('/api/auth')) {
|
||||||
console.log('API Response:', response.status(), response.url());
|
console.log('API Response:', response.status(), response.url());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Generate unique test credentials
|
|
||||||
const timestamp = Date.now();
|
const timestamp = Date.now();
|
||||||
const testEmail = `setup-user-${timestamp}@example.com`;
|
const testEmail = `setup-user-${timestamp}@example.com`;
|
||||||
const testPassword = 'TestPassword1234!';
|
const testPassword = 'TestPassword1234!';
|
||||||
const testName = 'Setup User';
|
const testName = 'Setup User';
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Navigate to registration page
|
|
||||||
console.log('Navigating to registration page...');
|
console.log('Navigating to registration page...');
|
||||||
await page.goto(`${baseURL}/auth/register`);
|
await page.goto(`${baseURL}/auth/register`);
|
||||||
|
|
||||||
// Fill in registration form
|
|
||||||
await page.fill('input[name="name"]', testName);
|
await page.fill('input[name="name"]', testName);
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
|
|
||||||
// Submit the form
|
|
||||||
console.log('Submitting registration form...');
|
console.log('Submitting registration form...');
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
|
|
||||||
// Wait for the sign-up API call to complete
|
|
||||||
console.log('Waiting for sign-up API call...');
|
|
||||||
try {
|
try {
|
||||||
await page.waitForResponse(response =>
|
await page.waitForResponse(response =>
|
||||||
response.url().includes('/api/auth/sign-up/email') && response.status() === 200,
|
response.url().includes('/api/auth/sign-up/email') && response.status() === 200,
|
||||||
@@ -109,40 +108,28 @@ export default async function globalSetup(config: FullConfig) {
|
|||||||
console.log('Sign-up API call failed or timed out');
|
console.log('Sign-up API call failed or timed out');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait a bit for session to be established
|
|
||||||
console.log('Waiting for session establishment...');
|
|
||||||
await page.waitForTimeout(2000);
|
await page.waitForTimeout(2000);
|
||||||
|
|
||||||
// Check if we're already authenticated
|
|
||||||
const currentUrl = page.url();
|
|
||||||
console.log('Current URL after registration:', currentUrl);
|
|
||||||
|
|
||||||
// Save the authentication state
|
|
||||||
await context.storageState({ path: authFile });
|
await context.storageState({ path: authFile });
|
||||||
|
|
||||||
console.log(`Created and authenticated test user: ${testEmail}`);
|
console.log(`Created and authenticated test user: ${testEmail}`);
|
||||||
|
|
||||||
// Now create admin user
|
// Clear session so admin registration doesn't get redirected
|
||||||
|
await context.clearCookies();
|
||||||
|
|
||||||
const adminTimestamp = timestamp + 1;
|
const adminTimestamp = timestamp + 1;
|
||||||
const adminEmail = `setup-admin-${adminTimestamp}@example.com`;
|
const adminEmail = `setup-admin-${adminTimestamp}@example.com`;
|
||||||
const adminPassword = 'AdminPassword123!';
|
const adminPassword = 'AdminPassword123!';
|
||||||
const adminName = 'Setup Admin';
|
const adminName = 'Setup Admin';
|
||||||
|
|
||||||
// Navigate to registration page again
|
|
||||||
console.log('Navigating to registration page for admin...');
|
console.log('Navigating to registration page for admin...');
|
||||||
await page.goto(`${baseURL}/auth/register`);
|
await page.goto(`${baseURL}/auth/register`);
|
||||||
|
|
||||||
// Fill in registration form
|
|
||||||
await page.fill('input[name="name"]', adminName);
|
await page.fill('input[name="name"]', adminName);
|
||||||
await page.fill('input[name="email"]', adminEmail);
|
await page.fill('input[name="email"]', adminEmail);
|
||||||
await page.fill('input[name="password"]', adminPassword);
|
await page.fill('input[name="password"]', adminPassword);
|
||||||
|
|
||||||
// Submit the form
|
|
||||||
console.log('Submitting admin registration form...');
|
console.log('Submitting admin registration form...');
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
|
|
||||||
// Wait for the sign-up API call to complete
|
|
||||||
console.log('Waiting for admin sign-up API call...');
|
|
||||||
try {
|
try {
|
||||||
await page.waitForResponse(response =>
|
await page.waitForResponse(response =>
|
||||||
response.url().includes('/api/auth/sign-up/email') && response.status() === 200,
|
response.url().includes('/api/auth/sign-up/email') && response.status() === 200,
|
||||||
@@ -153,14 +140,10 @@ export default async function globalSetup(config: FullConfig) {
|
|||||||
console.log('Admin sign-up API call failed or timed out');
|
console.log('Admin sign-up API call failed or timed out');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait a bit for session to be established
|
|
||||||
console.log('Waiting for admin session establishment...');
|
|
||||||
await page.waitForTimeout(2000);
|
await page.waitForTimeout(2000);
|
||||||
|
|
||||||
// Update user role to admin via database
|
const prisma = createPrismaClient();
|
||||||
const user = await prisma.user.findUnique({
|
const user = await prisma.user.findUnique({ where: { email: adminEmail } });
|
||||||
where: { email: adminEmail }
|
|
||||||
});
|
|
||||||
|
|
||||||
if (user) {
|
if (user) {
|
||||||
await prisma.user.update({
|
await prisma.user.update({
|
||||||
@@ -169,44 +152,39 @@ export default async function globalSetup(config: FullConfig) {
|
|||||||
});
|
});
|
||||||
console.log('Updated user role to club_admin');
|
console.log('Updated user role to club_admin');
|
||||||
}
|
}
|
||||||
|
await prisma.$disconnect();
|
||||||
|
|
||||||
// Navigate to admin page to refresh session
|
|
||||||
console.log('Navigating to admin page for admin user...');
|
console.log('Navigating to admin page for admin user...');
|
||||||
await page.goto(`${baseURL}/admin`);
|
await page.goto(`${baseURL}/admin`);
|
||||||
await page.waitForLoadState('domcontentloaded');
|
await page.waitForLoadState('domcontentloaded');
|
||||||
console.log('Admin page loaded:', page.url());
|
console.log('Admin page loaded:', page.url());
|
||||||
|
|
||||||
// Wait a bit to ensure session is refreshed
|
|
||||||
await page.waitForTimeout(2000);
|
await page.waitForTimeout(2000);
|
||||||
|
|
||||||
// Refresh the page to force session reload
|
|
||||||
await page.reload();
|
await page.reload();
|
||||||
await page.waitForLoadState('domcontentloaded');
|
await page.waitForLoadState('domcontentloaded');
|
||||||
console.log('Page reloaded');
|
console.log('Page reloaded');
|
||||||
|
|
||||||
// Save the authentication state
|
|
||||||
await context.storageState({ path: adminAuthFile });
|
await context.storageState({ path: adminAuthFile });
|
||||||
|
|
||||||
console.log(`Created and authenticated admin user: ${adminEmail}`);
|
console.log(`Created and authenticated admin user: ${adminEmail}`);
|
||||||
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Global setup error:', error);
|
|
||||||
throw error;
|
|
||||||
} finally {
|
} finally {
|
||||||
await browser.close();
|
await browser.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return teardown function
|
|
||||||
return async () => {
|
|
||||||
console.log('\n=== Global Teardown ===');
|
|
||||||
|
|
||||||
// Clean up all test data
|
|
||||||
try {
|
|
||||||
await cleanupAllTestData();
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error cleaning up test data:', error);
|
|
||||||
} finally {
|
|
||||||
await prisma.$disconnect();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default async function globalSetup(config: FullConfig) {
|
||||||
|
console.log('=== Global Setup ===');
|
||||||
|
console.log('DATABASE_URL:', process.env.DATABASE_URL);
|
||||||
|
|
||||||
|
if (isCIDatabase()) {
|
||||||
|
console.log('CI environment detected - will reset database schema');
|
||||||
|
const prisma = createPrismaClient();
|
||||||
|
await resetDatabaseSchema(prisma);
|
||||||
|
await prisma.$disconnect();
|
||||||
|
} else if (!isProductionDatabase()) {
|
||||||
|
console.log('Development environment - preserving existing data');
|
||||||
|
}
|
||||||
|
|
||||||
|
await createTestUsers(config);
|
||||||
|
console.log('=== Global Setup Complete ===\n');
|
||||||
|
}
|
||||||
@@ -0,0 +1,158 @@
|
|||||||
|
/**
|
||||||
|
* Global teardown for Playwright tests
|
||||||
|
* Handles cleanup based on environment:
|
||||||
|
* - CI: Full schema reset (database can be destroyed and recreated)
|
||||||
|
* - Dev: Selective cleanup of test records (preserve real data)
|
||||||
|
* - Prod: Selective cleanup of test records (preserve real data)
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { type FullConfig } from '@playwright/test';
|
||||||
|
import { PrismaClient } from '@prisma/client';
|
||||||
|
import { PrismaPg } from '@prisma/adapter-pg';
|
||||||
|
import { execSync } from 'child_process';
|
||||||
|
|
||||||
|
const TEST_PATTERNS = {
|
||||||
|
players: [
|
||||||
|
'%Test%',
|
||||||
|
'%Setup%',
|
||||||
|
'%Home Test%',
|
||||||
|
'%Home Match Player%',
|
||||||
|
'%Admin User%',
|
||||||
|
'%NinePart%',
|
||||||
|
'%Nine Part%',
|
||||||
|
'%Test Player%',
|
||||||
|
'%TestUser%',
|
||||||
|
'%Cucumber%',
|
||||||
|
'%Config Admin%',
|
||||||
|
'%Elo Test%',
|
||||||
|
'%Dedupe%',
|
||||||
|
'%Whitespace%',
|
||||||
|
'%Aggregate%',
|
||||||
|
'%Tournament Player%',
|
||||||
|
'%Schedule Player%',
|
||||||
|
'%Test Activity Player%',
|
||||||
|
'%HP%',
|
||||||
|
],
|
||||||
|
events: [
|
||||||
|
'%Test%',
|
||||||
|
'%Setup%',
|
||||||
|
'%Recent%',
|
||||||
|
'%Test Tournament%',
|
||||||
|
'%Cucumber%',
|
||||||
|
'%Elo Test%',
|
||||||
|
'%Schedule%',
|
||||||
|
],
|
||||||
|
users: [
|
||||||
|
'%test%',
|
||||||
|
'%setup%',
|
||||||
|
'%cucumber%',
|
||||||
|
'%TestUser%',
|
||||||
|
'%logout-test%',
|
||||||
|
'%admin-%',
|
||||||
|
'%config-admin%',
|
||||||
|
'%schedule-admin%',
|
||||||
|
'%nine-part-test%',
|
||||||
|
'%tour-admin-%',
|
||||||
|
'%president-%',
|
||||||
|
]
|
||||||
|
};
|
||||||
|
|
||||||
|
function isDatabase(url: string, name: string): boolean {
|
||||||
|
return url.includes(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
function isProductionDatabase(): boolean {
|
||||||
|
const dbUrl = process.env.DATABASE_URL || '';
|
||||||
|
return isDatabase(dbUrl, 'euchre_camp') && !isDatabase(dbUrl, '_dev') && !isDatabase(dbUrl, '_ci');
|
||||||
|
}
|
||||||
|
|
||||||
|
function isCIDatabase(): boolean {
|
||||||
|
const dbUrl = process.env.DATABASE_URL || '';
|
||||||
|
return isDatabase(dbUrl, '_ci');
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildLikeClause(patterns: string[]): string {
|
||||||
|
return patterns.map(p => `name LIKE '${p}'`).join(' OR ');
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildEmailLikeClause(patterns: string[]): string {
|
||||||
|
return patterns.map(p => `email LIKE '${p}'`).join(' OR ');
|
||||||
|
}
|
||||||
|
|
||||||
|
function createPrismaClient() {
|
||||||
|
const databaseUrl = process.env.DATABASE_URL;
|
||||||
|
if (!databaseUrl) throw new Error('DATABASE_URL is required');
|
||||||
|
const adapter = new PrismaPg({ connectionString: databaseUrl });
|
||||||
|
return new PrismaClient({ adapter });
|
||||||
|
}
|
||||||
|
|
||||||
|
async function resetDatabaseSchema(prisma: PrismaClient) {
|
||||||
|
console.log('Resetting database schema...');
|
||||||
|
|
||||||
|
const tables = await prisma.$queryRaw<{ tablename: string }[]>`
|
||||||
|
SELECT tablename FROM pg_tables
|
||||||
|
WHERE schemaname = 'public' AND tablename NOT LIKE '_prisma_migrations'
|
||||||
|
`;
|
||||||
|
|
||||||
|
if (tables.length > 0) {
|
||||||
|
await prisma.$executeRawUnsafe(`
|
||||||
|
DROP SCHEMA public CASCADE;
|
||||||
|
CREATE SCHEMA public;
|
||||||
|
`);
|
||||||
|
console.log(`Dropped ${tables.length} tables`);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('Running migrations...');
|
||||||
|
execSync('bunx prisma migrate deploy', { stdio: 'inherit' });
|
||||||
|
}
|
||||||
|
|
||||||
|
async function cleanupTestRecords(prisma: PrismaClient) {
|
||||||
|
console.log('Cleaning up test records...');
|
||||||
|
|
||||||
|
const playerWhere = buildLikeClause(TEST_PATTERNS.players);
|
||||||
|
const eventWhere = buildLikeClause(TEST_PATTERNS.events);
|
||||||
|
const userWhere = buildEmailLikeClause(TEST_PATTERNS.users);
|
||||||
|
|
||||||
|
await prisma.$executeRawUnsafe(`DELETE FROM elo_snapshots WHERE "playerId" IN (SELECT id FROM players WHERE (${playerWhere}));`);
|
||||||
|
await prisma.$executeRawUnsafe(`DELETE FROM partnership_games WHERE "player1Id" IN (SELECT id FROM players WHERE (${playerWhere}));`);
|
||||||
|
await prisma.$executeRawUnsafe(`DELETE FROM partnership_stats WHERE "player1Id" IN (SELECT id FROM players WHERE (${playerWhere}));`);
|
||||||
|
await prisma.$executeRawUnsafe(`DELETE FROM event_participants WHERE "eventId" IN (SELECT id FROM events WHERE (${eventWhere}));`);
|
||||||
|
await prisma.$executeRawUnsafe(`DELETE FROM tournament_rounds WHERE "eventId" IN (SELECT id FROM events WHERE (${eventWhere}));`);
|
||||||
|
await prisma.$executeRawUnsafe(`DELETE FROM bracket_matchups WHERE "eventId" IN (SELECT id FROM events WHERE (${eventWhere}));`);
|
||||||
|
await prisma.$executeRawUnsafe(`DELETE FROM events WHERE (${eventWhere});`);
|
||||||
|
console.log('Deleted test events');
|
||||||
|
|
||||||
|
await prisma.$executeRawUnsafe(`DELETE FROM elo_ratings WHERE "playerId" IN (SELECT id FROM players WHERE (${playerWhere}));`);
|
||||||
|
await prisma.$executeRawUnsafe(`DELETE FROM glicko2_ratings WHERE "playerId" IN (SELECT id FROM players WHERE (${playerWhere}));`);
|
||||||
|
await prisma.$executeRawUnsafe(`DELETE FROM open_skill_ratings WHERE "playerId" IN (SELECT id FROM players WHERE (${playerWhere}));`);
|
||||||
|
await prisma.$executeRawUnsafe(`DELETE FROM players WHERE (${playerWhere});`);
|
||||||
|
console.log('Deleted test players');
|
||||||
|
|
||||||
|
await prisma.$executeRawUnsafe(`DELETE FROM users WHERE (${userWhere}) AND "playerId" IS NULL;`);
|
||||||
|
console.log('Deleted test users (without player associations)');
|
||||||
|
|
||||||
|
await prisma.$disconnect();
|
||||||
|
}
|
||||||
|
|
||||||
|
export default async function globalTeardown(config: FullConfig) {
|
||||||
|
console.log('\n=== Global Teardown ===');
|
||||||
|
|
||||||
|
const dbUrl = process.env.DATABASE_URL || '';
|
||||||
|
|
||||||
|
if (isCIDatabase()) {
|
||||||
|
console.log('CI environment - resetting database schema');
|
||||||
|
const prisma = createPrismaClient();
|
||||||
|
await resetDatabaseSchema(prisma);
|
||||||
|
await prisma.$disconnect();
|
||||||
|
} else if (isProductionDatabase()) {
|
||||||
|
console.log('Production environment - selective cleanup of test records');
|
||||||
|
const prisma = createPrismaClient();
|
||||||
|
await cleanupTestRecords(prisma);
|
||||||
|
} else {
|
||||||
|
console.log('Development environment - selective cleanup of test records');
|
||||||
|
const prisma = createPrismaClient();
|
||||||
|
await cleanupTestRecords(prisma);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('=== Global Teardown Complete ===\n');
|
||||||
|
}
|
||||||
+13
-12
@@ -13,6 +13,7 @@
|
|||||||
|
|
||||||
import { test, expect } from '@playwright/test';
|
import { test, expect } from '@playwright/test';
|
||||||
import { prisma } from '@/lib/prisma';
|
import { prisma } from '@/lib/prisma';
|
||||||
|
const BASE_URL = process.env.CI ? 'https://euchre-ci.notsosm.art' : 'http://localhost:3000';
|
||||||
|
|
||||||
function getTestCredentials() {
|
function getTestCredentials() {
|
||||||
const timestamp = Date.now();
|
const timestamp = Date.now();
|
||||||
@@ -34,11 +35,11 @@ test.describe.serial('Issue #7: Schedule Tab', () => {
|
|||||||
testPassword = credentials.password;
|
testPassword = credentials.password;
|
||||||
|
|
||||||
// Create admin user via API
|
// Create admin user via API
|
||||||
const response = await fetch('http://localhost:3000/api/auth/sign-up/email', {
|
const response = await fetch(`${BASE_URL}/api/auth/sign-up/email`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
Origin: 'http://localhost:3000',
|
Origin: BASE_URL,
|
||||||
},
|
},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
email: testEmail,
|
email: testEmail,
|
||||||
@@ -128,14 +129,14 @@ test.describe.serial('Issue #7: Schedule Tab', () => {
|
|||||||
|
|
||||||
test('Schedule tab link exists on tournament detail page', async ({ page }) => {
|
test('Schedule tab link exists on tournament detail page', async ({ page }) => {
|
||||||
// Login
|
// Login
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
// Navigate to tournament detail
|
// Navigate to tournament detail
|
||||||
await page.goto(`http://localhost:3000/admin/tournaments/${tournamentId}`);
|
await page.goto(`/admin/tournaments/${tournamentId}`);
|
||||||
|
|
||||||
// Check Schedule tab link exists
|
// Check Schedule tab link exists
|
||||||
const scheduleLink = page.locator('a', { hasText: 'Schedule' });
|
const scheduleLink = page.locator('a', { hasText: 'Schedule' });
|
||||||
@@ -144,14 +145,14 @@ test.describe.serial('Issue #7: Schedule Tab', () => {
|
|||||||
|
|
||||||
test('Schedule page loads with no schedule message', async ({ page }) => {
|
test('Schedule page loads with no schedule message', async ({ page }) => {
|
||||||
// Login
|
// Login
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
// Navigate to schedule page
|
// Navigate to schedule page
|
||||||
await page.goto(`http://localhost:3000/admin/tournaments/${tournamentId}/schedule`);
|
await page.goto(`/admin/tournaments/${tournamentId}/schedule`);
|
||||||
|
|
||||||
// Check page content
|
// Check page content
|
||||||
await expect(page.locator('h1')).toContainText('Tournament Schedule');
|
await expect(page.locator('h1')).toContainText('Tournament Schedule');
|
||||||
@@ -161,14 +162,14 @@ test.describe.serial('Issue #7: Schedule Tab', () => {
|
|||||||
|
|
||||||
test('Generate schedule creates rounds and matchups', async ({ page }) => {
|
test('Generate schedule creates rounds and matchups', async ({ page }) => {
|
||||||
// Login
|
// Login
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
// Navigate to schedule page
|
// Navigate to schedule page
|
||||||
await page.goto(`http://localhost:3000/admin/tournaments/${tournamentId}/schedule`);
|
await page.goto(`/admin/tournaments/${tournamentId}/schedule`);
|
||||||
|
|
||||||
// Click generate schedule
|
// Click generate schedule
|
||||||
await page.click('button:has-text("Generate Schedule")');
|
await page.click('button:has-text("Generate Schedule")');
|
||||||
@@ -191,14 +192,14 @@ test.describe.serial('Issue #7: Schedule Tab', () => {
|
|||||||
|
|
||||||
test('Schedule page displays generated rounds and matchups', async ({ page }) => {
|
test('Schedule page displays generated rounds and matchups', async ({ page }) => {
|
||||||
// Login
|
// Login
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
// Navigate to schedule page
|
// Navigate to schedule page
|
||||||
await page.goto(`http://localhost:3000/admin/tournaments/${tournamentId}/schedule`);
|
await page.goto(`/admin/tournaments/${tournamentId}/schedule`);
|
||||||
|
|
||||||
// Check that rounds are displayed
|
// Check that rounds are displayed
|
||||||
await expect(page.locator('text=Round 1')).toBeVisible();
|
await expect(page.locator('text=Round 1')).toBeVisible();
|
||||||
@@ -213,7 +214,7 @@ test.describe.serial('Issue #7: Schedule Tab', () => {
|
|||||||
|
|
||||||
test('Schedule API returns rounds with matchups', async ({ page }) => {
|
test('Schedule API returns rounds with matchups', async ({ page }) => {
|
||||||
// Login
|
// Login
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
@@ -221,7 +222,7 @@ test.describe.serial('Issue #7: Schedule Tab', () => {
|
|||||||
|
|
||||||
// Call the schedule API
|
// Call the schedule API
|
||||||
const response = await page.request.get(
|
const response = await page.request.get(
|
||||||
`http://localhost:3000/api/tournaments/${tournamentId}/schedule`
|
`/api/tournaments/${tournamentId}/schedule`
|
||||||
);
|
);
|
||||||
expect(response.ok()).toBe(true);
|
expect(response.ok()).toBe(true);
|
||||||
|
|
||||||
|
|||||||
@@ -8,109 +8,6 @@
|
|||||||
import { test, expect } from '@playwright/test'
|
import { test, expect } from '@playwright/test'
|
||||||
|
|
||||||
test.describe('Smoke Test: EuchreCamp Application', () => {
|
test.describe('Smoke Test: EuchreCamp Application', () => {
|
||||||
test.describe('Admin Panel Navigation', () => {
|
|
||||||
test('should navigate to admin dashboard', async ({ page }) => {
|
|
||||||
await page.goto('/admin')
|
|
||||||
// Admin dashboard should be visible
|
|
||||||
await expect(page.locator('text=Admin')).toBeVisible()
|
|
||||||
})
|
|
||||||
|
|
||||||
test('should navigate to matches admin page', async ({ page }) => {
|
|
||||||
await page.goto('/admin/matches')
|
|
||||||
await expect(page.locator('text=Match Management')).toBeVisible()
|
|
||||||
})
|
|
||||||
|
|
||||||
test('should navigate to players admin page', async ({ page }) => {
|
|
||||||
await page.goto('/admin/players')
|
|
||||||
await expect(page.locator('text=Player Management')).toBeVisible()
|
|
||||||
})
|
|
||||||
|
|
||||||
test('should navigate to users admin page', async ({ page }) => {
|
|
||||||
await page.goto('/admin/users')
|
|
||||||
await expect(page.locator('text=User Management')).toBeVisible()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
test.describe('Match Management', () => {
|
|
||||||
test('should display matches page', async ({ page }) => {
|
|
||||||
await page.goto('/admin/matches')
|
|
||||||
// Verify page header is visible
|
|
||||||
await expect(page.locator('text=Match Management')).toBeVisible()
|
|
||||||
|
|
||||||
// Page should load successfully - verify either table or empty state is present
|
|
||||||
const hasTable = await page.locator('table').count().then(c => c > 0)
|
|
||||||
const hasEmptyState = await page.locator('text=/no matches|No matches/').count().then(c => c > 0)
|
|
||||||
|
|
||||||
// At least one should be present
|
|
||||||
expect(hasTable || hasEmptyState).toBeTruthy()
|
|
||||||
})
|
|
||||||
|
|
||||||
test('should have delete button for matches when matches exist', async ({ page }) => {
|
|
||||||
await page.goto('/admin/matches')
|
|
||||||
// Check if delete buttons exist in the table
|
|
||||||
const deleteButtons = page.locator('button:has-text("Delete")')
|
|
||||||
const count = await deleteButtons.count()
|
|
||||||
// Table might be empty, but if there are matches, delete buttons should exist
|
|
||||||
if (count > 0) {
|
|
||||||
await expect(page.locator('text=Actions')).toBeVisible()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
test.describe('Player Management', () => {
|
|
||||||
test('should display players table', async ({ page }) => {
|
|
||||||
await page.goto('/admin/players')
|
|
||||||
await expect(page.locator('table')).toBeVisible()
|
|
||||||
await expect(page.locator('text=Player Name')).toBeVisible()
|
|
||||||
await expect(page.locator('text=Current Elo')).toBeVisible()
|
|
||||||
await expect(page.locator('text=Actions')).toBeVisible()
|
|
||||||
})
|
|
||||||
|
|
||||||
test('should have edit and delete buttons for players', async ({ page }) => {
|
|
||||||
await page.goto('/admin/players')
|
|
||||||
// At minimum, verify the Actions column exists
|
|
||||||
await expect(page.locator('text=Actions')).toBeVisible()
|
|
||||||
})
|
|
||||||
|
|
||||||
test('should allow editing player name', async ({ page }) => {
|
|
||||||
await page.goto('/admin/players')
|
|
||||||
// Click edit on first player
|
|
||||||
const editButton = page.locator('button:has-text("Edit")').first()
|
|
||||||
if (await editButton.isVisible()) {
|
|
||||||
await editButton.click()
|
|
||||||
|
|
||||||
// Verify edit modal appears
|
|
||||||
await expect(page.locator('text=Edit Player Name')).toBeVisible()
|
|
||||||
|
|
||||||
// Close modal
|
|
||||||
await page.click('text=Cancel')
|
|
||||||
await expect(page.locator('text=Edit Player Name')).not.toBeVisible()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
test.describe('User Management', () => {
|
|
||||||
test('should display users page', async ({ page }) => {
|
|
||||||
await page.goto('/admin/users')
|
|
||||||
// Page should load with either a table or "no users" message
|
|
||||||
const hasTable = await page.locator('table').isVisible().catch(() => false)
|
|
||||||
const hasNoUsers = await page.locator('text=No users found').isVisible().catch(() => false)
|
|
||||||
|
|
||||||
// At least one of these should be true
|
|
||||||
expect(hasTable || hasNoUsers).toBeTruthy()
|
|
||||||
|
|
||||||
// Verify page header is visible
|
|
||||||
await expect(page.locator('text=User Management')).toBeVisible()
|
|
||||||
})
|
|
||||||
|
|
||||||
test('should have create user link', async ({ page }) => {
|
|
||||||
await page.goto('/admin/users')
|
|
||||||
// Check for the main create user link (with green button styling)
|
|
||||||
const createLink = page.locator('a.bg-green-600:has-text("Create User")')
|
|
||||||
await expect(createLink).toBeVisible()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
test.describe('Public Pages', () => {
|
test.describe('Public Pages', () => {
|
||||||
test('should display rankings page', async ({ page }) => {
|
test('should display rankings page', async ({ page }) => {
|
||||||
await page.goto('/rankings')
|
await page.goto('/rankings')
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
import { test, expect } from '@playwright/test';
|
import { test, expect } from '@playwright/test';
|
||||||
import { prisma } from '@/lib/prisma';
|
import { prisma } from '@/lib/prisma';
|
||||||
|
const BASE_URL = process.env.CI ? 'https://euchre-ci.notsosm.art' : 'http://localhost:3000';
|
||||||
|
|
||||||
function getTestCredentials() {
|
function getTestCredentials() {
|
||||||
const timestamp = Date.now();
|
const timestamp = Date.now();
|
||||||
@@ -28,11 +29,11 @@ test.describe.serial('Issue #22: Team Configuration', () => {
|
|||||||
testPassword = credentials.password;
|
testPassword = credentials.password;
|
||||||
|
|
||||||
// Create admin user via API
|
// Create admin user via API
|
||||||
const response = await fetch('http://localhost:3000/api/auth/sign-up/email', {
|
const response = await fetch(`${BASE_URL}/api/auth/sign-up/email`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
Origin: 'http://localhost:3000',
|
Origin: BASE_URL,
|
||||||
},
|
},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
email: testEmail,
|
email: testEmail,
|
||||||
@@ -77,14 +78,14 @@ test.describe.serial('Issue #22: Team Configuration', () => {
|
|||||||
|
|
||||||
test('Tournament creation form shows team configuration options', async ({ page }) => {
|
test('Tournament creation form shows team configuration options', async ({ page }) => {
|
||||||
// Login
|
// Login
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
// Navigate to tournament creation
|
// Navigate to tournament creation
|
||||||
await page.goto('http://localhost:3000/admin/tournaments/new');
|
await page.goto('/admin/tournaments/new');
|
||||||
|
|
||||||
// Select Round Robin format
|
// Select Round Robin format
|
||||||
await page.selectOption('select[name="format"]', 'round_robin');
|
await page.selectOption('select[name="format"]', 'round_robin');
|
||||||
@@ -100,14 +101,14 @@ test.describe.serial('Issue #22: Team Configuration', () => {
|
|||||||
|
|
||||||
test('Create tournament with permanent teams', async ({ page }) => {
|
test('Create tournament with permanent teams', async ({ page }) => {
|
||||||
// Login
|
// Login
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
// Navigate to tournament creation
|
// Navigate to tournament creation
|
||||||
await page.goto('http://localhost:3000/admin/tournaments/new');
|
await page.goto('/admin/tournaments/new');
|
||||||
|
|
||||||
// Fill in tournament details
|
// Fill in tournament details
|
||||||
await page.fill('input[name="name"]', `Test Tournament ${Date.now()}`);
|
await page.fill('input[name="name"]', `Test Tournament ${Date.now()}`);
|
||||||
@@ -175,14 +176,14 @@ test.describe.serial('Issue #22: Team Configuration', () => {
|
|||||||
|
|
||||||
test('Create tournament with variable teams and partner rotation', async ({ page }) => {
|
test('Create tournament with variable teams and partner rotation', async ({ page }) => {
|
||||||
// Login
|
// Login
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
// Navigate to tournament creation
|
// Navigate to tournament creation
|
||||||
await page.goto('http://localhost:3000/admin/tournaments/new');
|
await page.goto('/admin/tournaments/new');
|
||||||
|
|
||||||
// Fill in tournament details
|
// Fill in tournament details
|
||||||
await page.fill('input[name="name"]', `Variable Teams Tournament ${Date.now()}`);
|
await page.fill('input[name="name"]', `Variable Teams Tournament ${Date.now()}`);
|
||||||
@@ -237,11 +238,11 @@ test.describe.serial('Issue #22: Team Configuration', () => {
|
|||||||
|
|
||||||
test('Edit tournament team configuration', async ({ page }) => {
|
test('Edit tournament team configuration', async ({ page }) => {
|
||||||
// First create a tournament with default settings
|
// First create a tournament with default settings
|
||||||
const createResponse = await fetch('http://localhost:3000/api/tournaments', {
|
const createResponse = await fetch(`${BASE_URL}/api/tournaments`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
Origin: 'http://localhost:3000',
|
Origin: BASE_URL,
|
||||||
},
|
},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
name: `Edit Test Tournament ${Date.now()}`,
|
name: `Edit Test Tournament ${Date.now()}`,
|
||||||
@@ -253,14 +254,14 @@ test.describe.serial('Issue #22: Team Configuration', () => {
|
|||||||
tournamentId = createData.tournament.id;
|
tournamentId = createData.tournament.id;
|
||||||
|
|
||||||
// Login
|
// Login
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
// Navigate to edit tournament page
|
// Navigate to edit tournament page
|
||||||
await page.goto(`http://localhost:3000/admin/tournaments/${tournamentId}/edit`);
|
await page.goto(`/admin/tournaments/${tournamentId}/edit`);
|
||||||
|
|
||||||
// Check that team configuration section is visible
|
// Check that team configuration section is visible
|
||||||
await expect(page.locator('text=Team Configuration')).toBeVisible();
|
await expect(page.locator('text=Team Configuration')).toBeVisible();
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
export const BASE_URL = process.env.BASE_URL || (process.env.CI
|
||||||
|
? 'https://euchre-ci.notsosm.art'
|
||||||
|
: 'http://localhost:3000');
|
||||||
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
import { test, expect } from '@playwright/test';
|
import { test, expect } from '@playwright/test';
|
||||||
import { prisma } from '@/lib/prisma';
|
import { prisma } from '@/lib/prisma';
|
||||||
|
const BASE_URL = process.env.CI ? 'https://euchre-ci.notsosm.art' : 'http://localhost:3000';
|
||||||
|
|
||||||
function getTestCredentials() {
|
function getTestCredentials() {
|
||||||
const timestamp = Date.now();
|
const timestamp = Date.now();
|
||||||
@@ -41,11 +42,11 @@ test.describe.serial('Tournament with 10 Participants and Variable Team Durabili
|
|||||||
const timestamp = Date.now();
|
const timestamp = Date.now();
|
||||||
|
|
||||||
// Create admin user via API
|
// Create admin user via API
|
||||||
const response = await fetch('http://localhost:3000/api/auth/sign-up/email', {
|
const response = await fetch(`${BASE_URL}/api/auth/sign-up/email`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
Origin: 'http://localhost:3000',
|
Origin: BASE_URL,
|
||||||
},
|
},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
email: testEmail,
|
email: testEmail,
|
||||||
@@ -102,14 +103,14 @@ test.describe.serial('Tournament with 10 Participants and Variable Team Durabili
|
|||||||
|
|
||||||
test('Tournament creation form shows variable team durability options', async ({ page }) => {
|
test('Tournament creation form shows variable team durability options', async ({ page }) => {
|
||||||
// Login
|
// Login
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
// Navigate to tournament creation
|
// Navigate to tournament creation
|
||||||
await page.goto('http://localhost:3000/admin/tournaments/new');
|
await page.goto('/admin/tournaments/new');
|
||||||
|
|
||||||
// Select Round Robin format
|
// Select Round Robin format
|
||||||
await page.selectOption('select[name="format"]', 'round_robin');
|
await page.selectOption('select[name="format"]', 'round_robin');
|
||||||
@@ -132,14 +133,14 @@ test.describe.serial('Tournament with 10 Participants and Variable Team Durabili
|
|||||||
|
|
||||||
test('Create tournament with 10 participants, variable teams, and minimize_repeat', async ({ page }) => {
|
test('Create tournament with 10 participants, variable teams, and minimize_repeat', async ({ page }) => {
|
||||||
// Login
|
// Login
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
// Navigate to tournament creation
|
// Navigate to tournament creation
|
||||||
await page.goto('http://localhost:3000/admin/tournaments/new');
|
await page.goto('/admin/tournaments/new');
|
||||||
|
|
||||||
// Fill in tournament details
|
// Fill in tournament details
|
||||||
const tournamentName = `9 Participant Variable Tournament ${Date.now()}`;
|
const tournamentName = `9 Participant Variable Tournament ${Date.now()}`;
|
||||||
@@ -238,7 +239,7 @@ test.describe.serial('Tournament with 10 Participants and Variable Team Durabili
|
|||||||
test('Schedule generation for 10 participants creates correct number of matchups', async ({ page }) => {
|
test('Schedule generation for 10 participants creates correct number of matchups', async ({ page }) => {
|
||||||
// Navigate to Matchups tab (formerly Teams tab)
|
// Navigate to Matchups tab (formerly Teams tab)
|
||||||
// The test is already authenticated via the chromium-admin project
|
// The test is already authenticated via the chromium-admin project
|
||||||
await page.goto(`http://localhost:3000/admin/tournaments/${tournamentId}`);
|
await page.goto(`/admin/tournaments/${tournamentId}`);
|
||||||
|
|
||||||
// Wait for page to load and data to be fetched
|
// Wait for page to load and data to be fetched
|
||||||
await page.waitForLoadState('domcontentloaded');
|
await page.waitForLoadState('domcontentloaded');
|
||||||
@@ -280,14 +281,14 @@ test.describe.serial('Tournament with 10 Participants and Variable Team Durabili
|
|||||||
|
|
||||||
test('Schedule displays correct matchups for 10 participants', async ({ page }) => {
|
test('Schedule displays correct matchups for 10 participants', async ({ page }) => {
|
||||||
// Login
|
// Login
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
// Navigate to Schedule tab
|
// Navigate to Schedule tab
|
||||||
await page.goto(`http://localhost:3000/admin/tournaments/${tournamentId}/schedule`);
|
await page.goto(`/admin/tournaments/${tournamentId}/schedule`);
|
||||||
|
|
||||||
// Verify rounds are displayed
|
// Verify rounds are displayed
|
||||||
await expect(page.locator('text=Round 1')).toBeVisible();
|
await expect(page.locator('text=Round 1')).toBeVisible();
|
||||||
@@ -304,14 +305,14 @@ test.describe.serial('Tournament with 10 Participants and Variable Team Durabili
|
|||||||
|
|
||||||
test('Matchup generation with minimize_repeat creates varied partnerships', async ({ page }) => {
|
test('Matchup generation with minimize_repeat creates varied partnerships', async ({ page }) => {
|
||||||
// Login
|
// Login
|
||||||
await page.goto('http://localhost:3000/auth/login');
|
await page.goto('/auth/login');
|
||||||
await page.fill('input[name="email"]', testEmail);
|
await page.fill('input[name="email"]', testEmail);
|
||||||
await page.fill('input[name="password"]', testPassword);
|
await page.fill('input[name="password"]', testPassword);
|
||||||
await page.click('button[type="submit"]');
|
await page.click('button[type="submit"]');
|
||||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
// Navigate to Schedule tab
|
// Navigate to Schedule tab
|
||||||
await page.goto(`http://localhost:3000/admin/tournaments/${tournamentId}/schedule`);
|
await page.goto(`/admin/tournaments/${tournamentId}/schedule`);
|
||||||
|
|
||||||
// Get all matchups from the database to verify partnership variety
|
// Get all matchups from the database to verify partnership variety
|
||||||
const matchups = await prisma.bracketMatchup.findMany({
|
const matchups = await prisma.bracketMatchup.findMany({
|
||||||
|
|||||||
@@ -239,3 +239,72 @@ workflow-status:
|
|||||||
@echo "PR Workflow: Runs unit + acceptance tests on pull requests"
|
@echo "PR Workflow: Runs unit + acceptance tests on pull requests"
|
||||||
@echo "Test Workflow: Runs unit tests on all branch pushes"
|
@echo "Test Workflow: Runs unit tests on all branch pushes"
|
||||||
@echo "Release Workflow: Runs on main branch pushes (version bump + Docker build)"
|
@echo "Release Workflow: Runs on main branch pushes (version bump + Docker build)"
|
||||||
|
|
||||||
|
# --- Production Deployment ---
|
||||||
|
|
||||||
|
# Deploy a specific version to production (human gate)
|
||||||
|
# Usage: just deploy-prod v0.1.21
|
||||||
|
deploy-prod version:
|
||||||
|
@echo "Deploying {{version}} to production..."
|
||||||
|
@echo "This requires the image to already be pushed to the registry."
|
||||||
|
@echo ""
|
||||||
|
@read -p "Have you verified this version works in dev? (y/N) " confirm; \
|
||||||
|
if [ "$$confirm" != "y" ]; then \
|
||||||
|
echo "Cancelled. Please verify in dev first."; \
|
||||||
|
exit 1; \
|
||||||
|
fi
|
||||||
|
cd /apps/youthful_simon && \
|
||||||
|
sed -i "s|image: docker.notsosm.art/euchre-camp:[a-zA-Z0-9.-]*|image: docker.notsosm.art/euchre-camp:{{version}}|" docker-compose.yml && \
|
||||||
|
sed -i "s|image: euchre-camp/euchre-camp:[a-zA-Z0-9.-]*|image: docker.notsosm.art/euchre-camp:{{version}}|" docker-compose.yml && \
|
||||||
|
docker compose pull app && \
|
||||||
|
docker compose up -d app && \
|
||||||
|
echo "Waiting for production site to be healthy..." && \
|
||||||
|
for i in {1..30}; do \
|
||||||
|
if curl -sf https://euchre.notsosm.art/api/health > /dev/null 2>&1; then \
|
||||||
|
echo "✅ Production successfully deployed with version {{version}}"; \
|
||||||
|
exit 0; \
|
||||||
|
fi; \
|
||||||
|
sleep 0.5; \
|
||||||
|
done && \
|
||||||
|
echo "❌ Production deployment failed - health check timed out"; \
|
||||||
|
docker compose logs app; \
|
||||||
|
exit 1
|
||||||
|
|
||||||
|
# Show current deployment status across all environments
|
||||||
|
status:
|
||||||
|
@echo "=== EuchreCamp Deployment Status ==="
|
||||||
|
@echo ""
|
||||||
|
@echo "CI Site (euchre-camp-ci):"
|
||||||
|
@grep "image:" /apps/euchre_camp_ci/docker-compose.yml | head -1
|
||||||
|
@echo ""
|
||||||
|
@echo "Dev Site (euchre-camp-dev):"
|
||||||
|
@grep "image:" /apps/intelligent_silasak/docker-compose.yml | head -1
|
||||||
|
@echo ""
|
||||||
|
@echo "Prod Site (euchre-camp):"
|
||||||
|
@grep "image:" /apps/youthful_simon/docker-compose.yml | head -1
|
||||||
|
@echo ""
|
||||||
|
|
||||||
|
# --- SDLC Database Operations ---
|
||||||
|
|
||||||
|
# Sync production data to development database (manual operation)
|
||||||
|
sync-dev:
|
||||||
|
@echo "Syncing production data to development database..."
|
||||||
|
node scripts/sync-prod-to-dev.js
|
||||||
|
|
||||||
|
# Run acceptance tests against production database (opt-in, manual)
|
||||||
|
test-prod:
|
||||||
|
@echo "⚠️ WARNING: This will run tests against the PRODUCTION database!"
|
||||||
|
@echo " All test records will be cleaned up after the run."
|
||||||
|
@echo ""
|
||||||
|
@read -p "Are you sure you want to continue? (y/N) " confirm; \
|
||||||
|
if [ "$$confirm" != "y" ]; then \
|
||||||
|
echo "Cancelled."; \
|
||||||
|
else \
|
||||||
|
DATABASE_URL="$$PROD_DATABASE_URL" bun test:acceptance; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Reset CI database (for local CI testing)
|
||||||
|
reset-ci-db:
|
||||||
|
@echo "Resetting CI database..."
|
||||||
|
psql "$CI_DATABASE_URL" -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;"
|
||||||
|
bunx prisma migrate deploy
|
||||||
|
|||||||
Generated
+10473
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "euchre_camp",
|
"name": "euchre_camp",
|
||||||
"version": "0.1.18",
|
"version": "0.1.20",
|
||||||
"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",
|
||||||
|
|||||||
@@ -11,16 +11,17 @@ export default defineConfig({
|
|||||||
// Fail the build on CI if you accidentally left test.only in the source code.
|
// Fail the build on CI if you accidentally left test.only in the source code.
|
||||||
forbidOnly: !!process.env.CI,
|
forbidOnly: !!process.env.CI,
|
||||||
// Retry on CI only.
|
// Retry on CI only.
|
||||||
retries: process.env.CI ? 2 : 0,
|
retries: process.env.CI ? 1 : 0,
|
||||||
// Always run with 1 worker to avoid database conflicts
|
// Use 1 worker in CI to avoid database conflicts between parallel projects
|
||||||
workers: 1,
|
workers: 1,
|
||||||
// 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('./e2e/global.setup'),
|
||||||
|
globalTeardown: require.resolve('./e2e/global.teardown'),
|
||||||
// Use base URL for relative navigation
|
// Use base URL for relative navigation
|
||||||
use: {
|
use: {
|
||||||
baseURL: 'http://localhost:3000',
|
baseURL: process.env.CI ? 'https://euchre-ci.notsosm.art' : 'http://localhost:3000',
|
||||||
// Collect trace when retrying the failed test.
|
// Collect trace when retrying the failed test.
|
||||||
trace: 'on-first-retry',
|
trace: 'on-first-retry',
|
||||||
// Capture screenshot only on failure
|
// Capture screenshot only on failure
|
||||||
@@ -42,6 +43,7 @@ export default defineConfig({
|
|||||||
storageState: 'playwright/.auth/user.json',
|
storageState: 'playwright/.auth/user.json',
|
||||||
},
|
},
|
||||||
dependencies: ['setup'],
|
dependencies: ['setup'],
|
||||||
|
testIgnore: ['**/admin-*.test.ts'],
|
||||||
},
|
},
|
||||||
// Admin user project
|
// Admin user project
|
||||||
{
|
{
|
||||||
@@ -62,11 +64,12 @@ export default defineConfig({
|
|||||||
storageState: undefined,
|
storageState: undefined,
|
||||||
},
|
},
|
||||||
dependencies: ['setup'],
|
dependencies: ['setup'],
|
||||||
|
testIgnore: ['**/admin-*.test.ts'],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
// Run your local dev server before starting the tests
|
// Run your local dev server before starting the tests
|
||||||
webServer: {
|
webServer: process.env.CI ? undefined : {
|
||||||
command: 'npm run dev',
|
command: 'bun run dev',
|
||||||
url: 'http://localhost:3000',
|
url: 'http://localhost:3000',
|
||||||
timeout: 120000,
|
timeout: 120000,
|
||||||
reuseExistingServer: !process.env.CI,
|
reuseExistingServer: !process.env.CI,
|
||||||
|
|||||||
@@ -0,0 +1,157 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sync production data to development database
|
||||||
|
*
|
||||||
|
* This script copies real data from production to development, filtering out
|
||||||
|
* test records to keep the dev database clean for testing.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const { execSync } = require('child_process');
|
||||||
|
const fs = require('fs');
|
||||||
|
const os = require('os');
|
||||||
|
const path = require('path');
|
||||||
|
|
||||||
|
const PROD_DB_URL = process.env.PROD_DATABASE_URL;
|
||||||
|
const DEV_DB_URL = process.env.DEV_DATABASE_URL;
|
||||||
|
|
||||||
|
if (!PROD_DB_URL || !DEV_DB_URL) {
|
||||||
|
console.error('❌ Missing environment variables');
|
||||||
|
console.error('Please set PROD_DATABASE_URL and DEV_DATABASE_URL');
|
||||||
|
console.error('');
|
||||||
|
console.error('Example:');
|
||||||
|
console.error(' PROD_DATABASE_URL="postgresql://user:pass@host:5432/euchre_camp" \\');
|
||||||
|
console.error(' DEV_DATABASE_URL="postgresql://user:pass@host:5432/euchre_camp_dev" \\');
|
||||||
|
console.error(' node scripts/sync-prod-to-dev.js');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (PROD_DB_URL.includes('_dev') || PROD_DB_URL.includes('_ci')) {
|
||||||
|
console.error('❌ PROD_DATABASE_URL appears to be a non-production database!');
|
||||||
|
console.error(' This script should only be used with the production database.');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const TEST_PATTERNS = {
|
||||||
|
players: [
|
||||||
|
'%Test%',
|
||||||
|
'%Setup%',
|
||||||
|
'%Home Test%',
|
||||||
|
'%Home Match Player%',
|
||||||
|
'%Admin User%',
|
||||||
|
'%NinePart%',
|
||||||
|
'%Nine Part%',
|
||||||
|
'%Test Player%',
|
||||||
|
'%TestUser%',
|
||||||
|
'%Cucumber%',
|
||||||
|
'%Config Admin%',
|
||||||
|
],
|
||||||
|
events: [
|
||||||
|
'%Test%',
|
||||||
|
'%Setup%',
|
||||||
|
'%Recent%',
|
||||||
|
'%Test Tournament%',
|
||||||
|
'%Cucumber%',
|
||||||
|
],
|
||||||
|
users: [
|
||||||
|
'%test%',
|
||||||
|
'%setup%',
|
||||||
|
'%cucumber%',
|
||||||
|
'%TestUser%',
|
||||||
|
]
|
||||||
|
};
|
||||||
|
|
||||||
|
function buildLikeClause(patterns) {
|
||||||
|
return patterns.map(p => `name LIKE '${p}'`).join(' OR ');
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildEmailLikeClause(patterns) {
|
||||||
|
return patterns.map(p => `email LIKE '${p}'`).join(' OR ');
|
||||||
|
}
|
||||||
|
|
||||||
|
async function main() {
|
||||||
|
console.log('🔄 Syncing production data to development database');
|
||||||
|
console.log('====================================================\n');
|
||||||
|
|
||||||
|
const readline = require('readline');
|
||||||
|
const rl = readline.createInterface({
|
||||||
|
input: process.stdin,
|
||||||
|
output: process.stdout
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log('⚠️ WARNING: This will OVERWRITE the development database!');
|
||||||
|
console.log(' Production data will be copied, with test records excluded.');
|
||||||
|
console.log('');
|
||||||
|
console.log('Source:', PROD_DB_URL.replace(/:[^:@]+@/, ':***@'));
|
||||||
|
console.log('Target:', DEV_DB_URL.replace(/:[^:@]+@/, ':***@'));
|
||||||
|
console.log('');
|
||||||
|
|
||||||
|
rl.question('Type "sync" to confirm: ', async (answer) => {
|
||||||
|
if (answer !== 'sync') {
|
||||||
|
console.log('❌ Cancelled');
|
||||||
|
rl.close();
|
||||||
|
process.exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
rl.close();
|
||||||
|
|
||||||
|
try {
|
||||||
|
console.log('\n📦 Dumping production data...');
|
||||||
|
|
||||||
|
const dumpFile = path.join(os.tmpdir(), `prod_dump_${Date.now()}.sql`);
|
||||||
|
|
||||||
|
execSync(`pg_dump "${PROD_DB_URL}" -f "${dumpFile}" --no-owner --no-acl`, {
|
||||||
|
stdio: 'inherit'
|
||||||
|
});
|
||||||
|
console.log('✅ Dump created');
|
||||||
|
|
||||||
|
console.log('\n🗑️ Clearing development database...');
|
||||||
|
execSync(`psql "${DEV_DB_URL}" -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;"`, {
|
||||||
|
stdio: 'inherit'
|
||||||
|
});
|
||||||
|
console.log('✅ Development database cleared');
|
||||||
|
|
||||||
|
console.log('\n📥 Restoring to development database...');
|
||||||
|
execSync(`psql "${DEV_DB_URL}" -f "${dumpFile}"`, {
|
||||||
|
stdio: 'inherit'
|
||||||
|
});
|
||||||
|
console.log('✅ Data restored');
|
||||||
|
|
||||||
|
console.log('\n🧹 Cleaning up test records in dev database...');
|
||||||
|
|
||||||
|
const playerWhere = buildLikeClause(TEST_PATTERNS.players);
|
||||||
|
const eventWhere = buildLikeClause(TEST_PATTERNS.events);
|
||||||
|
const userWhere = buildEmailLikeClause(TEST_PATTERNS.users);
|
||||||
|
|
||||||
|
execSync(`psql "${DEV_DB_URL}" -c "DELETE FROM events WHERE (${eventWhere});"`, {
|
||||||
|
stdio: 'inherit'
|
||||||
|
});
|
||||||
|
console.log(' Deleted test events');
|
||||||
|
|
||||||
|
execSync(`psql "${DEV_DB_URL}" -c "DELETE FROM players WHERE (${playerWhere});"`, {
|
||||||
|
stdio: 'inherit'
|
||||||
|
});
|
||||||
|
console.log(' Deleted test players');
|
||||||
|
|
||||||
|
execSync(`psql "${DEV_DB_URL}" -c "DELETE FROM users WHERE (${userWhere}) AND \"playerId\" IS NULL;"`, {
|
||||||
|
stdio: 'inherit'
|
||||||
|
});
|
||||||
|
console.log(' Deleted test users');
|
||||||
|
|
||||||
|
fs.unlinkSync(dumpFile);
|
||||||
|
console.log('\n🧹 Cleaned up temporary dump file');
|
||||||
|
|
||||||
|
console.log('\n✅ Sync complete!');
|
||||||
|
console.log('\n📊 Summary:');
|
||||||
|
console.log(' - Production data copied to development');
|
||||||
|
console.log(' - Test records filtered out');
|
||||||
|
console.log(' - Development database is now a mirror of production (minus test data)');
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('\n❌ Sync failed:', error.message);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
main();
|
||||||
@@ -8,6 +8,7 @@
|
|||||||
import { describe, it, expect, mock, beforeEach, afterEach } from 'bun:test'
|
import { describe, it, expect, mock, beforeEach, afterEach } from 'bun:test'
|
||||||
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'
|
||||||
|
import { RoleSwitcherProvider } from '@/components/RoleSwitcher'
|
||||||
|
|
||||||
// Mock next/link
|
// Mock next/link
|
||||||
mock.module('next/link', () => ({
|
mock.module('next/link', () => ({
|
||||||
@@ -31,6 +32,14 @@ mock.module('@/lib/auth-client', () => ({
|
|||||||
// Mock fetch for role API call
|
// Mock fetch for role API call
|
||||||
global.fetch = mock(async () => new Response()) as any
|
global.fetch = mock(async () => new Response()) as any
|
||||||
|
|
||||||
|
function renderNavigation() {
|
||||||
|
return render(
|
||||||
|
<RoleSwitcherProvider>
|
||||||
|
<Navigation />
|
||||||
|
</RoleSwitcherProvider>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
import { useSession as useSessionOriginal } from '@/components/SessionProvider'
|
import { useSession as useSessionOriginal } from '@/components/SessionProvider'
|
||||||
const useSession = useSessionOriginal as any
|
const useSession = useSessionOriginal as any
|
||||||
|
|
||||||
@@ -61,7 +70,7 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
refreshSession: mock(() => {}),
|
refreshSession: mock(() => {}),
|
||||||
})
|
})
|
||||||
|
|
||||||
render(<Navigation />)
|
renderNavigation()
|
||||||
|
|
||||||
expect(screen.getByText('EuchreCamp')).toBeInTheDocument()
|
expect(screen.getByText('EuchreCamp')).toBeInTheDocument()
|
||||||
expect(screen.getByText('Rankings')).toBeInTheDocument()
|
expect(screen.getByText('Rankings')).toBeInTheDocument()
|
||||||
@@ -84,7 +93,7 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
refreshSession: mock(() => {}),
|
refreshSession: mock(() => {}),
|
||||||
})
|
})
|
||||||
|
|
||||||
render(<Navigation />)
|
renderNavigation()
|
||||||
|
|
||||||
await waitFor(() => {
|
await waitFor(() => {
|
||||||
expect(screen.getByText('Test User')).toBeInTheDocument()
|
expect(screen.getByText('Test User')).toBeInTheDocument()
|
||||||
@@ -109,7 +118,7 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
refreshSession: mock(() => {}),
|
refreshSession: mock(() => {}),
|
||||||
})
|
})
|
||||||
|
|
||||||
render(<Navigation />)
|
renderNavigation()
|
||||||
|
|
||||||
await waitFor(() => {
|
await waitFor(() => {
|
||||||
expect(screen.getByText('Tournaments')).toBeInTheDocument()
|
expect(screen.getByText('Tournaments')).toBeInTheDocument()
|
||||||
@@ -142,7 +151,7 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
return new Response(JSON.stringify({}), { status: 200 })
|
return new Response(JSON.stringify({}), { status: 200 })
|
||||||
})
|
})
|
||||||
|
|
||||||
render(<Navigation />)
|
renderNavigation()
|
||||||
|
|
||||||
await waitFor(() => {
|
await waitFor(() => {
|
||||||
expect(screen.getByText('Admin')).toBeInTheDocument()
|
expect(screen.getByText('Admin')).toBeInTheDocument()
|
||||||
@@ -177,7 +186,7 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
} as Response
|
} as Response
|
||||||
})
|
})
|
||||||
|
|
||||||
render(<Navigation />)
|
renderNavigation()
|
||||||
|
|
||||||
await waitFor(() => {
|
await waitFor(() => {
|
||||||
expect(screen.getByText('Tournaments')).toBeInTheDocument()
|
expect(screen.getByText('Tournaments')).toBeInTheDocument()
|
||||||
@@ -192,7 +201,7 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
refreshSession: mock(() => {}),
|
refreshSession: mock(() => {}),
|
||||||
})
|
})
|
||||||
|
|
||||||
render(<Navigation />)
|
renderNavigation()
|
||||||
|
|
||||||
expect(screen.getByText('Loading...')).toBeInTheDocument()
|
expect(screen.getByText('Loading...')).toBeInTheDocument()
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
import { describe, test, expect, mock, beforeEach } from 'bun:test';
|
import { describe, test, expect, mock, beforeEach } from 'bun:test';
|
||||||
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 type { User } from '@prisma/client';
|
import type { User } from '@prisma/client';
|
||||||
|
|
||||||
// Create mock functions at module level
|
// Create mock functions at module level
|
||||||
|
|||||||
@@ -8,12 +8,32 @@ import { describe, it, expect, mock, beforeEach,} from 'bun:test';
|
|||||||
// Create mock functions at module level
|
// Create mock functions at module level
|
||||||
const eventFindUniqueMock = mock(async () => ({}));
|
const eventFindUniqueMock = mock(async () => ({}));
|
||||||
const eventUpdateMock = mock(async () => ({}));
|
const eventUpdateMock = mock(async () => ({}));
|
||||||
const canManageTournamentMock = mock(async () => ({ allowed: true }));
|
const userFindUniqueMock = mock(async () => ({
|
||||||
const canDeleteTournamentMock = mock(async () => ({ allowed: true }));
|
id: 'admin-1',
|
||||||
|
email: 'admin@example.com',
|
||||||
|
role: 'club_admin',
|
||||||
|
emailVerified: false,
|
||||||
|
name: null,
|
||||||
|
image: null,
|
||||||
|
playerId: null,
|
||||||
|
createdAt: new Date(),
|
||||||
|
updatedAt: new Date(),
|
||||||
|
}));
|
||||||
|
|
||||||
// Mock prisma first
|
// Mock auth-simple to return a valid session
|
||||||
|
mock.module('@/lib/auth-simple', () => ({
|
||||||
|
getSession: mock(async () => ({
|
||||||
|
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||||
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
|
})),
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Mock prisma with user and event
|
||||||
mock.module('@/lib/prisma', () => ({
|
mock.module('@/lib/prisma', () => ({
|
||||||
prisma: {
|
prisma: {
|
||||||
|
user: {
|
||||||
|
findUnique: userFindUniqueMock,
|
||||||
|
},
|
||||||
event: {
|
event: {
|
||||||
findUnique: eventFindUniqueMock,
|
findUnique: eventFindUniqueMock,
|
||||||
update: eventUpdateMock,
|
update: eventUpdateMock,
|
||||||
@@ -21,12 +41,6 @@ mock.module('@/lib/prisma', () => ({
|
|||||||
},
|
},
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// Mock the permissions module
|
|
||||||
mock.module('@/lib/permissions', () => ({
|
|
||||||
canManageTournament: canManageTournamentMock,
|
|
||||||
canDeleteTournament: canDeleteTournamentMock,
|
|
||||||
}));
|
|
||||||
|
|
||||||
// Import the route handler after mocking
|
// Import the route handler after mocking
|
||||||
import { PUT } from '@/app/api/tournaments/[id]/route';
|
import { PUT } from '@/app/api/tournaments/[id]/route';
|
||||||
import { prisma } from '@/lib/prisma';
|
import { prisma } from '@/lib/prisma';
|
||||||
@@ -36,8 +50,7 @@ describe('Tournament Update API', () => {
|
|||||||
// Clear all mock history before each test
|
// Clear all mock history before each test
|
||||||
eventFindUniqueMock.mockClear();
|
eventFindUniqueMock.mockClear();
|
||||||
eventUpdateMock.mockClear();
|
eventUpdateMock.mockClear();
|
||||||
canManageTournamentMock.mockClear();
|
userFindUniqueMock.mockClear();
|
||||||
canDeleteTournamentMock.mockClear();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should update allowTies field when provided', async () => {
|
it('should update allowTies field when provided', async () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user