Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fa13ed86c9 | |||
| 66e574d5ec | |||
| a9138cfbe4 | |||
| 1489848b77 | |||
| 49865cd9c3 | |||
| c8e89b17ac | |||
| e1b43c0702 | |||
| e4874c3438 | |||
| d9d759a06f | |||
| c796b89fb6 | |||
| 3c071b856d | |||
| adac558b5c | |||
| 5673ec14aa |
+26
-32
@@ -1,54 +1,48 @@
|
||||
# EuchreCamp Environment Configuration
|
||||
# Copy this file to .env and fill in your values
|
||||
# ============================================
|
||||
# Copy this file to .env (for local dev) or use
|
||||
# .env.development / .env.ci for specific environments
|
||||
|
||||
# ============================================
|
||||
# Database Configuration
|
||||
# ============================================
|
||||
# PostgreSQL connection string
|
||||
# Format: postgresql://username:password@host:port/database
|
||||
DATABASE_URL=postgresql://euchre:euchrepassword@localhost:5432/euchre_camp
|
||||
# IMPORTANT: Use the appropriate DATABASE_URL for your environment:
|
||||
#
|
||||
# - Development (ephemeral, synced from prod): euchre_camp_dev
|
||||
# - CI/Testing (reset before each run): euchre_camp_ci
|
||||
# - Production (DO NOT USE FOR TESTS): euchre_camp
|
||||
#
|
||||
# The .credentials file in the project root contains
|
||||
# the actual connection strings - DO NOT commit .credentials
|
||||
|
||||
# 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
|
||||
|
||||
# ============================================
|
||||
# Better Auth Configuration
|
||||
# ============================================
|
||||
# Secret key for session encryption (generate a strong random string)
|
||||
# Run: openssl rand -base64 32
|
||||
BETTER_AUTH_SECRET=your-secret-key-change-in-production
|
||||
# Generate a new secret with: openssl rand -base64 32
|
||||
BETTER_AUTH_SECRET=generate-new-secret-in-production
|
||||
|
||||
# Base URL for authentication callbacks
|
||||
# For production: https://your-domain.com
|
||||
# Base URL - update for production
|
||||
BETTER_AUTH_URL=http://localhost:3000
|
||||
|
||||
# ============================================
|
||||
# Application Configuration
|
||||
# ============================================
|
||||
# Environment: development, production, test
|
||||
NODE_ENV=production
|
||||
NODE_ENV=development
|
||||
|
||||
# Trusted origins for CORS and authentication
|
||||
# Add your domain(s) for production
|
||||
# Comma-separated list of trusted origins
|
||||
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)
|
||||
# DATABASE_URL=postgresql://user:pass@host:port/db
|
||||
|
||||
# If using external auth provider
|
||||
# BETTER_AUTH_URL=https://your-app.com
|
||||
|
||||
# ============================================
|
||||
# CasaOS Deployment Notes
|
||||
# ============================================
|
||||
# When deploying to CasaOS, set these via the UI:
|
||||
# 1. DATABASE_URL: Your PostgreSQL connection string
|
||||
# 2. BETTER_AUTH_SECRET: Generate with: openssl rand -base64 32
|
||||
# 3. BETTER_AUTH_URL: Your app's public URL
|
||||
# 4. TRUSTED_ORIGINS: Your app's public URL(s)
|
||||
# For development (.env.development):
|
||||
# DATABASE_URL from .credentials (euchre_camp_dev)
|
||||
# NODE_ENV=development
|
||||
# BETTER_AUTH_URL=http://localhost:3000
|
||||
#
|
||||
# For CI (.env.ci):
|
||||
# DATABASE_URL from .credentials (euchre_camp_ci)
|
||||
# NODE_ENV=test
|
||||
# BETTER_AUTH_URL=http://localhost:3000
|
||||
+1
-32
@@ -16,9 +16,6 @@ jobs:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Clear Bun cache
|
||||
run: bun pm cache rm || true
|
||||
|
||||
- name: Install dependencies
|
||||
run: bun install
|
||||
|
||||
@@ -30,37 +27,9 @@ jobs:
|
||||
- name: Run unit tests
|
||||
run: bun test src/__tests__/unit/ src/__tests__/*.test.tsx src/__tests__/auth-simple.test.ts
|
||||
|
||||
e2e-tests:
|
||||
runs-on: ubuntu-latest
|
||||
needs: unit-tests
|
||||
container:
|
||||
image: docker.notsosm.art/euchre-camp/ci-base:latest
|
||||
options: --user root
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Clear Bun cache
|
||||
run: bun pm cache rm || true
|
||||
|
||||
- name: Install dependencies
|
||||
run: bun install
|
||||
|
||||
- name: Generate Prisma client
|
||||
run: bun x prisma generate
|
||||
env:
|
||||
DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
|
||||
|
||||
- name: Run E2E tests
|
||||
run: npm run test:acceptance:cucumber:prod
|
||||
env:
|
||||
DATABASE_URL: postgresql://euchre_camp:${{ secrets.DB_PASSWORD }}@dhg.lol:5432/euchre_camp_dev
|
||||
DATABASE_PROVIDER: postgresql
|
||||
|
||||
analyze-bump-type:
|
||||
runs-on: ubuntu-latest
|
||||
needs: e2e-tests
|
||||
needs: unit-tests
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
|
||||
@@ -59,3 +59,4 @@ playwright-report/
|
||||
|
||||
cucumber-pretty
|
||||
.env.production
|
||||
.credentials
|
||||
|
||||
@@ -1,3 +1,25 @@
|
||||
## [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
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Merge branch 'main' of https://git.notsosm.art/david/euchre_camp
|
||||
- fix: resolve schedule test timing issues (#33)
|
||||
|
||||
## [0.1.17] - 2026-05-02
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -19,8 +19,6 @@ Feature: Tournament Schedule
|
||||
And I click the "Generate Schedule" button
|
||||
Then I should see "Generated"
|
||||
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
|
||||
And I should see round 2 matchups
|
||||
|
||||
@@ -31,8 +29,6 @@ Feature: Tournament Schedule
|
||||
When I go to the tournament schedule page
|
||||
And I click the "Generate Schedule" button
|
||||
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
|
||||
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
|
||||
And I click the "Generate Schedule" button
|
||||
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
|
||||
Then I should be on the match result entry page
|
||||
|
||||
@@ -564,10 +564,11 @@ Given('a tournament exists with {int} teams', async function (teamCount: number)
|
||||
When('I go to the tournament schedule page', async function () {
|
||||
console.log('🌍 Going to tournament schedule page');
|
||||
const tournamentId = world.tournament?.id || 1;
|
||||
await world.page.goto(`${world.baseURL}/admin/tournaments/${tournamentId}/schedule`);
|
||||
await world.page.waitForLoadState('load');
|
||||
// Wait for client components to hydrate
|
||||
await world.page.waitForTimeout(1000);
|
||||
const url = `${world.baseURL}/admin/tournaments/${tournamentId}/schedule?t=${Date.now()}`;
|
||||
await world.page.goto(url);
|
||||
await world.page.waitForLoadState('networkidle');
|
||||
// Wait for ScheduleDisplay client component to hydrate
|
||||
await world.page.waitForTimeout(2000);
|
||||
});
|
||||
|
||||
Given('a tournament has a generated schedule', async function () {
|
||||
|
||||
@@ -647,17 +647,14 @@ Then('I should be on the match detail page', async function () {
|
||||
// Tournament Schedule Steps
|
||||
Then('I should see round {int} matchups', async function (roundNumber: number) {
|
||||
const roundText = `Round ${roundNumber}`;
|
||||
await world.page.waitForTimeout(2000);
|
||||
const content = await world.page.content();
|
||||
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 });
|
||||
const roundHeader = world.page.locator(`h3:has-text("${roundText}")`);
|
||||
await expect(roundHeader).toBeVisible({ timeout: 30000 });
|
||||
console.log(`🌍 Verified round ${roundNumber} matchups are visible`);
|
||||
});
|
||||
|
||||
Then('I should see {int} rounds', async function (expectedRounds: number) {
|
||||
await world.page.waitForLoadState('networkidle');
|
||||
await world.page.waitForTimeout(2000);
|
||||
const roundHeaders = await world.page.locator('h3:has-text("Round")').count();
|
||||
expect(roundHeaders).toBe(expectedRounds);
|
||||
console.log(`🌍 Verified ${expectedRounds} rounds are visible`);
|
||||
|
||||
@@ -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('http://localhost:3000/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('http://localhost:3000/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('http://localhost:3000/rankings');
|
||||
|
||||
// Page should load without redirecting to login
|
||||
await expect(page).toHaveURL(/.*rankings.*/);
|
||||
await expect(page.locator('body')).toBeVisible();
|
||||
});
|
||||
});
|
||||
+52
-83
@@ -4,40 +4,27 @@
|
||||
*/
|
||||
|
||||
import { chromium, type FullConfig } from '@playwright/test';
|
||||
import { prisma } from '@/lib/prisma';
|
||||
import { cleanupAllTestData } from '@/__tests__/test-utils';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import path from 'path';
|
||||
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 adminAuthFile = 'playwright/.auth/admin.json';
|
||||
|
||||
// Check if we're using the dev database
|
||||
function isDevDatabase(): boolean {
|
||||
const dbUrl = process.env.DATABASE_URL || '';
|
||||
return dbUrl.includes('euchre_camp_dev');
|
||||
function isDatabase(url: string, name: string): boolean {
|
||||
return url.includes(name);
|
||||
}
|
||||
|
||||
function isProductionDatabase(): boolean {
|
||||
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()) {
|
||||
console.error('');
|
||||
console.error('='.repeat(80));
|
||||
@@ -46,59 +33,65 @@ if (isProductionDatabase()) {
|
||||
console.error('');
|
||||
console.error('Current DATABASE_URL:', process.env.DATABASE_URL);
|
||||
console.error('');
|
||||
console.error('Tests MUST run against the development database (euchre_camp_dev)');
|
||||
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('Tests MUST run against development (euchre_camp_dev) or CI (euchre_camp_ci)');
|
||||
console.error('');
|
||||
console.error('Aborting test execution to prevent data corruption.');
|
||||
console.error('');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
if (!isDevDatabase()) {
|
||||
console.warn('⚠️ WARNING: DATABASE_URL does not contain euchre_camp_dev');
|
||||
console.warn(' Current DATABASE_URL:', process.env.DATABASE_URL);
|
||||
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;
|
||||
GRANT ALL ON SCHEMA public TO postgres;
|
||||
GRANT ALL ON SCHEMA public TO public;
|
||||
`);
|
||||
console.log(`Dropped ${tables.length} tables`);
|
||||
}
|
||||
|
||||
console.log('Running migrations...');
|
||||
const { execSync } = await import('child_process');
|
||||
execSync('bunx prisma migrate deploy', { stdio: 'inherit' });
|
||||
}
|
||||
|
||||
export default async function globalSetup(config: FullConfig) {
|
||||
async function createTestUsers(config: FullConfig) {
|
||||
const baseURL = config.projects[0]?.use?.baseURL || 'http://localhost:3000';
|
||||
|
||||
const browser = await chromium.launch();
|
||||
const context = await browser.newContext();
|
||||
const page = await context.newPage();
|
||||
|
||||
// Log all responses for debugging
|
||||
page.on('response', response => {
|
||||
if (response.url().includes('/api/auth')) {
|
||||
console.log('API Response:', response.status(), response.url());
|
||||
}
|
||||
});
|
||||
|
||||
// Generate unique test credentials
|
||||
const timestamp = Date.now();
|
||||
const testEmail = `setup-user-${timestamp}@example.com`;
|
||||
const testPassword = 'TestPassword1234!';
|
||||
const testName = 'Setup User';
|
||||
|
||||
try {
|
||||
// Navigate to registration page
|
||||
console.log('Navigating to registration page...');
|
||||
await page.goto(`${baseURL}/auth/register`);
|
||||
|
||||
// Fill in registration form
|
||||
await page.fill('input[name="name"]', testName);
|
||||
await page.fill('input[name="email"]', testEmail);
|
||||
await page.fill('input[name="password"]', testPassword);
|
||||
|
||||
// Submit the form
|
||||
console.log('Submitting registration form...');
|
||||
await page.click('button[type="submit"]');
|
||||
|
||||
// Wait for the sign-up API call to complete
|
||||
console.log('Waiting for sign-up API call...');
|
||||
try {
|
||||
await page.waitForResponse(response =>
|
||||
response.url().includes('/api/auth/sign-up/email') && response.status() === 200,
|
||||
@@ -109,40 +102,25 @@ export default async function globalSetup(config: FullConfig) {
|
||||
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);
|
||||
|
||||
// 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 });
|
||||
|
||||
console.log(`Created and authenticated test user: ${testEmail}`);
|
||||
|
||||
// Now create admin user
|
||||
const adminTimestamp = timestamp + 1;
|
||||
const adminEmail = `setup-admin-${adminTimestamp}@example.com`;
|
||||
const adminPassword = 'AdminPassword123!';
|
||||
const adminName = 'Setup Admin';
|
||||
|
||||
// Navigate to registration page again
|
||||
console.log('Navigating to registration page for admin...');
|
||||
await page.goto(`${baseURL}/auth/register`);
|
||||
|
||||
// Fill in registration form
|
||||
await page.fill('input[name="name"]', adminName);
|
||||
await page.fill('input[name="email"]', adminEmail);
|
||||
await page.fill('input[name="password"]', adminPassword);
|
||||
|
||||
// Submit the form
|
||||
console.log('Submitting admin registration form...');
|
||||
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 {
|
||||
await page.waitForResponse(response =>
|
||||
response.url().includes('/api/auth/sign-up/email') && response.status() === 200,
|
||||
@@ -153,14 +131,10 @@ export default async function globalSetup(config: FullConfig) {
|
||||
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);
|
||||
|
||||
// Update user role to admin via database
|
||||
const user = await prisma.user.findUnique({
|
||||
where: { email: adminEmail }
|
||||
});
|
||||
const prisma = new PrismaClient();
|
||||
const user = await prisma.user.findUnique({ where: { email: adminEmail } });
|
||||
|
||||
if (user) {
|
||||
await prisma.user.update({
|
||||
@@ -169,44 +143,39 @@ export default async function globalSetup(config: FullConfig) {
|
||||
});
|
||||
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...');
|
||||
await page.goto(`${baseURL}/admin`);
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
console.log('Admin page loaded:', page.url());
|
||||
|
||||
// Wait a bit to ensure session is refreshed
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// Refresh the page to force session reload
|
||||
await page.reload();
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
console.log('Page reloaded');
|
||||
|
||||
// Save the authentication state
|
||||
await context.storageState({ path: adminAuthFile });
|
||||
|
||||
console.log(`Created and authenticated admin user: ${adminEmail}`);
|
||||
|
||||
} catch (error) {
|
||||
console.error('Global setup error:', error);
|
||||
throw error;
|
||||
} finally {
|
||||
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 = new PrismaClient();
|
||||
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,126 @@
|
||||
/**
|
||||
* 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 { 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%',
|
||||
],
|
||||
events: [
|
||||
'%Test%',
|
||||
'%Setup%',
|
||||
'%Recent%',
|
||||
'%Test Tournament%',
|
||||
'%Cucumber%',
|
||||
],
|
||||
users: [
|
||||
'%test%',
|
||||
'%setup%',
|
||||
'%cucumber%',
|
||||
'%TestUser%',
|
||||
]
|
||||
};
|
||||
|
||||
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 ');
|
||||
}
|
||||
|
||||
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;
|
||||
GRANT ALL ON SCHEMA public TO postgres;
|
||||
GRANT ALL ON SCHEMA public TO 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 events WHERE (${eventWhere});`);
|
||||
console.log('Deleted test events');
|
||||
|
||||
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 = new PrismaClient();
|
||||
await resetDatabaseSchema(prisma);
|
||||
await prisma.$disconnect();
|
||||
} else if (isProductionDatabase()) {
|
||||
console.log('Production environment - selective cleanup of test records');
|
||||
const prisma = new PrismaClient();
|
||||
await cleanupTestRecords(prisma);
|
||||
} else {
|
||||
console.log('Development environment - selective cleanup of test records');
|
||||
const prisma = new PrismaClient();
|
||||
await cleanupTestRecords(prisma);
|
||||
}
|
||||
|
||||
console.log('=== Global Teardown Complete ===\n');
|
||||
}
|
||||
@@ -0,0 +1,110 @@
|
||||
import { test, expect } from '@playwright/test'
|
||||
import { prisma } from '@/lib/prisma'
|
||||
|
||||
test.describe('Home Page', () => {
|
||||
const createdIds = {
|
||||
players: [] as number[],
|
||||
events: [] as number[],
|
||||
matches: [] as number[],
|
||||
users: [] as string[],
|
||||
}
|
||||
|
||||
test.afterEach(async () => {
|
||||
await prisma.match.deleteMany({ where: { id: { in: createdIds.matches } } })
|
||||
await prisma.event.deleteMany({ where: { id: { in: createdIds.events } } })
|
||||
await prisma.player.deleteMany({ id: { in: createdIds.players } })
|
||||
await prisma.user.deleteMany({ where: { id: { in: createdIds.users } } })
|
||||
createdIds.players = []
|
||||
createdIds.events = []
|
||||
createdIds.matches = []
|
||||
createdIds.users = []
|
||||
})
|
||||
|
||||
test('displays top 10 players section', async ({ page }) => {
|
||||
const timestamp = Date.now()
|
||||
|
||||
for (let i = 0; i < 3; i++) {
|
||||
const player = 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,
|
||||
},
|
||||
})
|
||||
createdIds.players.push(player.id)
|
||||
}
|
||||
|
||||
await page.goto('/')
|
||||
|
||||
await expect(page.locator('text=Top 10 Players')).toBeVisible()
|
||||
await expect(
|
||||
page.locator(`a:has-text("Home Test Player ${timestamp} 1")`)
|
||||
).toBeVisible()
|
||||
})
|
||||
|
||||
test('displays club president section', async ({ page }) => {
|
||||
const timestamp = Date.now()
|
||||
const user = await prisma.user.create({
|
||||
data: {
|
||||
email: `president-${timestamp}@example.com`,
|
||||
name: `Club President ${timestamp}`,
|
||||
role: 'club_admin',
|
||||
},
|
||||
})
|
||||
createdIds.users.push(user.id)
|
||||
|
||||
await page.goto('/')
|
||||
|
||||
await expect(page.locator('text=Club President')).toBeVisible()
|
||||
})
|
||||
|
||||
test('displays most recent tournament section', async ({ page }) => {
|
||||
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',
|
||||
},
|
||||
})
|
||||
createdIds.events.push(tournament.id)
|
||||
|
||||
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 },
|
||||
})
|
||||
createdIds.players.push(p1.id, p2.id, p3.id, p4.id)
|
||||
|
||||
const match = 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(),
|
||||
},
|
||||
})
|
||||
createdIds.matches.push(match.id)
|
||||
|
||||
await page.goto('/')
|
||||
|
||||
await expect(page.locator('text=Most Recent Tournament')).toBeVisible()
|
||||
await expect(page.locator(`text=Recent Tournament ${timestamp}`)).toBeVisible()
|
||||
})
|
||||
})
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "euchre_camp",
|
||||
"version": "0.1.17",
|
||||
"version": "0.1.20",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "NEXT_PUBLIC_GIT_COMMIT=$(git rev-parse --short HEAD) next dev",
|
||||
|
||||
Reference in New Issue
Block a user