Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 38771a86cb | |||
| 005cf7293d | |||
| e08c2bbdfd | |||
| ab376e97b4 | |||
| 29292e697b | |||
| a0872d07ef | |||
| feca7067b8 | |||
| f34dc23661 | |||
| f16ad054dd |
@@ -40,12 +40,12 @@ jobs:
|
||||
|
||||
# Wait for production site to be healthy
|
||||
echo "Waiting for production site to be healthy..."
|
||||
for i in {1..30}; do
|
||||
for i in {1..6}; 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
|
||||
sleep 15
|
||||
done
|
||||
echo "❌ Production deployment failed"
|
||||
docker compose logs app
|
||||
|
||||
@@ -83,14 +83,16 @@ jobs:
|
||||
|
||||
- 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"
|
||||
echo "Waiting for Next.js to start..."
|
||||
sleep 20
|
||||
for i in {1..6}; do
|
||||
if curl -sf https://euchre-ci.notsosm.art/api/health > /dev/null 2>&1; then
|
||||
echo "CI site is healthy"
|
||||
exit 0
|
||||
fi
|
||||
sleep 2
|
||||
sleep 15
|
||||
done
|
||||
echo "CI site container failed to start"
|
||||
echo "CI site failed to become healthy after 90 seconds"
|
||||
docker compose -f /apps/euchre_camp_ci/docker-compose.yml logs app
|
||||
exit 1
|
||||
|
||||
|
||||
@@ -177,12 +177,12 @@ jobs:
|
||||
|
||||
# Wait for container to be healthy
|
||||
echo "Waiting for dev site to be healthy..."
|
||||
for i in {1..30}; do
|
||||
for i in {1..6}; do
|
||||
if curl -sf https://euchre-dev.notsosm.art/api/health > /dev/null 2>&1; then
|
||||
echo "✅ Dev environment successfully deployed with version ${{ steps.version.outputs.new_version }}"
|
||||
exit 0
|
||||
fi
|
||||
sleep 0.5
|
||||
sleep 15
|
||||
done
|
||||
echo "❌ Dev environment deployment failed"
|
||||
docker compose logs app
|
||||
|
||||
@@ -74,7 +74,7 @@ test.describe.serial('Account Lifecycle Acceptance Test', () => {
|
||||
await page.waitForURL(/\/players\/\d+\/profile/, { timeout: 10000 });
|
||||
|
||||
// Wait a moment for the user to be saved to database
|
||||
await page.waitForTimeout(1000);
|
||||
await page.waitForTimeout(200);
|
||||
|
||||
// Verify user was created in database
|
||||
const user = await prisma.user.findUnique({
|
||||
|
||||
@@ -13,6 +13,7 @@ import path from 'path';
|
||||
test.describe('CSV Upload Player Deduplication', () => {
|
||||
let testTournamentId: number;
|
||||
const testPlayerIds: number[] = [];
|
||||
const ts = Date.now();
|
||||
|
||||
test.beforeAll(async () => {
|
||||
// Create a test tournament
|
||||
@@ -47,12 +48,14 @@ test.describe('CSV Upload Player Deduplication', () => {
|
||||
});
|
||||
}
|
||||
|
||||
// Delete test players (those with "Dedupe" in the name)
|
||||
// Delete test players (those with "Dedupe" or "Aggregate Test" in the name)
|
||||
await prisma.player.deleteMany({
|
||||
where: {
|
||||
name: {
|
||||
contains: 'Dedupe',
|
||||
},
|
||||
OR: [
|
||||
{ name: { contains: 'Dedupe' } },
|
||||
{ name: { contains: 'Aggregate Test' } },
|
||||
{ name: { contains: 'Whitespace' } },
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
@@ -82,6 +85,9 @@ test.describe('CSV Upload Player Deduplication', () => {
|
||||
multipart: formData,
|
||||
});
|
||||
|
||||
if (!response.ok()) {
|
||||
console.log('CSV upload failed:', response.status(), await response.text());
|
||||
}
|
||||
expect(response.ok()).toBeTruthy();
|
||||
|
||||
// Check that only 4 unique players were created (not 8)
|
||||
@@ -136,6 +142,9 @@ test.describe('CSV Upload Player Deduplication', () => {
|
||||
multipart: formData,
|
||||
});
|
||||
|
||||
if (!response.ok()) {
|
||||
console.log('CSV upload failed:', response.status(), await response.text());
|
||||
}
|
||||
expect(response.ok()).toBeTruthy();
|
||||
|
||||
// Check that players were created without extra whitespace
|
||||
@@ -163,8 +172,8 @@ test.describe('CSV Upload Player Deduplication', () => {
|
||||
// First, create some players manually to simulate previous uploads
|
||||
const player1 = await prisma.player.create({
|
||||
data: {
|
||||
name: 'Aggregate Test',
|
||||
normalizedName: 'aggregate test',
|
||||
name: `Aggregate Test ${ts}`,
|
||||
normalizedName: `aggregate test ${ts}`,
|
||||
currentElo: 1050,
|
||||
gamesPlayed: 5,
|
||||
wins: 3,
|
||||
@@ -175,7 +184,7 @@ test.describe('CSV Upload Player Deduplication', () => {
|
||||
|
||||
// Upload a CSV with the same player name
|
||||
const csvContent = `Event #,Round,Table,Seat 1,Seat 3,Odds Points,Seat 2,Seat 4,Evens Points
|
||||
1,1,1,Aggregate Test,Test Player 1,5,Test Player 2,Test Player 3,3`;
|
||||
1,1,1,Aggregate Test ${ts},Test Player 1,5,Test Player 2,Test Player 3,3`;
|
||||
|
||||
const csvPath = path.join(__dirname, 'temp-aggregate-test.csv');
|
||||
fs.writeFileSync(csvPath, csvContent);
|
||||
@@ -193,12 +202,15 @@ test.describe('CSV Upload Player Deduplication', () => {
|
||||
multipart: formData,
|
||||
});
|
||||
|
||||
if (!response.ok()) {
|
||||
console.log('CSV upload failed:', response.status(), await response.text());
|
||||
}
|
||||
expect(response.ok()).toBeTruthy();
|
||||
|
||||
// Check that the existing player was updated (not duplicated)
|
||||
const aggregatePlayers = await prisma.player.findMany({
|
||||
where: {
|
||||
name: 'Aggregate Test',
|
||||
name: `Aggregate Test ${ts}`,
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
+19
-12
@@ -7,18 +7,25 @@ test.describe('Cucumber E2E Tests', () => {
|
||||
? 'https://euchre-ci.notsosm.art'
|
||||
: '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(),
|
||||
}
|
||||
);
|
||||
let result;
|
||||
try {
|
||||
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(),
|
||||
}
|
||||
);
|
||||
} catch (error: any) {
|
||||
console.log('Cucumber stderr:', error.stderr?.toString() || 'none');
|
||||
console.log('Cucumber stdout:', error.stdout?.toString() || 'none');
|
||||
throw error;
|
||||
}
|
||||
|
||||
console.log(result);
|
||||
});
|
||||
|
||||
@@ -17,8 +17,7 @@ module.exports = {
|
||||
|
||||
// Format options
|
||||
format: [
|
||||
'progress-bar',
|
||||
'pretty:cucumber-pretty'
|
||||
process.env.CI ? 'progress' : ['pretty', 'html:cucumber-report.html']
|
||||
],
|
||||
|
||||
// Output directory for reports
|
||||
|
||||
+43
-30
@@ -13,71 +13,84 @@ import path from 'path';
|
||||
test.describe('Elo Rating Updates', () => {
|
||||
test.beforeAll(async () => {
|
||||
// Clean up any existing test data
|
||||
const playerIds = await getEloTestPlayerIds();
|
||||
|
||||
// First delete matches that reference players
|
||||
await prisma.match.deleteMany({
|
||||
where: {
|
||||
OR: [
|
||||
{ player1P1Id: { in: await getEloTestPlayerIds() } },
|
||||
{ player1P2Id: { in: await getEloTestPlayerIds() } },
|
||||
{ player2P1Id: { in: await getEloTestPlayerIds() } },
|
||||
{ player2P2Id: { in: await getEloTestPlayerIds() } },
|
||||
{ player1P1Id: { in: playerIds } },
|
||||
{ player1P2Id: { in: playerIds } },
|
||||
{ player2P1Id: { in: playerIds } },
|
||||
{ player2P2Id: { in: playerIds } },
|
||||
]
|
||||
}
|
||||
});
|
||||
|
||||
// Then delete partnerships
|
||||
// Then delete partnerships that reference players
|
||||
await prisma.partnershipStat.deleteMany({
|
||||
where: {
|
||||
OR: [
|
||||
{ player1Id: { in: await getEloTestPlayerIds() } },
|
||||
{ player2Id: { in: await getEloTestPlayerIds() } },
|
||||
{ player1Id: { in: playerIds } },
|
||||
{ player2Id: { in: playerIds } },
|
||||
]
|
||||
}
|
||||
});
|
||||
|
||||
// Then delete event participants that reference players
|
||||
await prisma.eventParticipant.deleteMany({
|
||||
where: {
|
||||
playerId: { in: playerIds }
|
||||
}
|
||||
});
|
||||
|
||||
// Finally delete players
|
||||
await prisma.player.deleteMany({
|
||||
where: {
|
||||
name: {
|
||||
startsWith: 'Elo Test'
|
||||
}
|
||||
id: { in: playerIds }
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
test.afterAll(async () => {
|
||||
// Clean up test data
|
||||
const playerIds = await getEloTestPlayerIds();
|
||||
|
||||
// First delete matches that reference players
|
||||
await prisma.match.deleteMany({
|
||||
where: {
|
||||
OR: [
|
||||
{ player1P1Id: { in: await getEloTestPlayerIds() } },
|
||||
{ player1P2Id: { in: await getEloTestPlayerIds() } },
|
||||
{ player2P1Id: { in: await getEloTestPlayerIds() } },
|
||||
{ player2P2Id: { in: await getEloTestPlayerIds() } },
|
||||
{ player1P1Id: { in: playerIds } },
|
||||
{ player1P2Id: { in: playerIds } },
|
||||
{ player2P1Id: { in: playerIds } },
|
||||
{ player2P2Id: { in: playerIds } },
|
||||
]
|
||||
}
|
||||
});
|
||||
|
||||
// Then delete partnerships
|
||||
// Then delete partnerships that reference players
|
||||
await prisma.partnershipStat.deleteMany({
|
||||
where: {
|
||||
OR: [
|
||||
{ player1Id: { in: await getEloTestPlayerIds() } },
|
||||
{ player2Id: { in: await getEloTestPlayerIds() } },
|
||||
{ player1Id: { in: playerIds } },
|
||||
{ player2Id: { in: playerIds } },
|
||||
]
|
||||
}
|
||||
});
|
||||
|
||||
// Then delete event participants that reference players
|
||||
await prisma.eventParticipant.deleteMany({
|
||||
where: {
|
||||
playerId: { in: playerIds }
|
||||
}
|
||||
});
|
||||
|
||||
// Finally delete players
|
||||
await prisma.player.deleteMany({
|
||||
where: {
|
||||
name: {
|
||||
startsWith: 'Elo Test'
|
||||
}
|
||||
id: { in: playerIds }
|
||||
}
|
||||
});
|
||||
await prisma.$disconnect();
|
||||
});
|
||||
|
||||
async function getEloTestPlayerIds(): Promise<number[]> {
|
||||
@@ -240,13 +253,13 @@ test.describe('Elo Rating Updates', () => {
|
||||
|
||||
// Wait for page to load and tournaments to be fetched
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
await page.waitForTimeout(2000);
|
||||
await page.waitForTimeout(500);
|
||||
|
||||
// Wait for tournament dropdown to be ready
|
||||
await page.waitForSelector('select#tournament', { timeout: 5000 });
|
||||
await page.waitForSelector('select#tournament', { timeout: 3000 });
|
||||
|
||||
// Wait a bit for tournaments to load
|
||||
await page.waitForTimeout(2000);
|
||||
await page.waitForTimeout(500);
|
||||
|
||||
// Select the tournament manually
|
||||
const tournamentSelect = await page.locator('select#tournament');
|
||||
@@ -302,7 +315,7 @@ ${tournament.id},2,1,${player1.name},${player3.name},10,${player2.name},${player
|
||||
await page.click('button[type="submit"]');
|
||||
|
||||
// Wait for upload to complete
|
||||
await page.waitForTimeout(3000);
|
||||
await page.waitForTimeout(1000);
|
||||
|
||||
// Check for any error messages
|
||||
const uploadContentAfter = await page.content();
|
||||
@@ -315,11 +328,11 @@ ${tournament.id},2,1,${player1.name},${player3.name},10,${player2.name},${player
|
||||
// Navigate back to upload page for second match
|
||||
await page.goto('/admin/matches/upload');
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
await page.waitForTimeout(2000);
|
||||
await page.waitForTimeout(500);
|
||||
|
||||
// Re-select the tournament for the second upload
|
||||
await page.waitForSelector('select#tournament', { timeout: 5000 });
|
||||
await page.waitForTimeout(1000); // Wait for tournaments to load
|
||||
await page.waitForSelector('select#tournament', { timeout: 3000 });
|
||||
await page.waitForTimeout(200); // Wait for tournaments to load
|
||||
|
||||
const tournamentSelect2 = await page.locator('select#tournament');
|
||||
const currentSelection = await tournamentSelect2.inputValue();
|
||||
@@ -338,10 +351,10 @@ ${tournament.id},2,1,${player1.name},${player3.name},10,${player2.name},${player
|
||||
await page.setInputFiles('input[type="file"]', tmpFile2);
|
||||
await page.waitForTimeout(500);
|
||||
await page.click('button[type="submit"]');
|
||||
await page.waitForTimeout(2000);
|
||||
await page.waitForTimeout(500);
|
||||
fs.unlinkSync(tmpFile2);
|
||||
|
||||
await page.waitForTimeout(2000);
|
||||
await page.waitForTimeout(500);
|
||||
|
||||
// Verify ratings after multiple matches
|
||||
const updatedPlayer1 = await prisma.player.findUnique({
|
||||
|
||||
@@ -133,7 +133,7 @@ test.describe.serial('Epic 1: User Logout', () => {
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
|
||||
// Wait a moment for the navigation component to update
|
||||
await page.waitForTimeout(1000);
|
||||
await page.waitForTimeout(200);
|
||||
|
||||
// Debug: Check what's on the page
|
||||
const pageContent = await page.content();
|
||||
|
||||
@@ -89,7 +89,7 @@ test.describe.serial('Epic 1: User Registration', () => {
|
||||
});
|
||||
|
||||
// Wait a moment for JavaScript to be ready
|
||||
await page.waitForTimeout(1000);
|
||||
await page.waitForTimeout(200);
|
||||
|
||||
// Submit form
|
||||
const [response] = await Promise.all([
|
||||
|
||||
@@ -17,8 +17,8 @@ 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 page title or heading - use .first() since page may have both h1 and h2
|
||||
await expect(page.locator('h1, h2').first()).toContainText(/rankings?/i);
|
||||
|
||||
// Check for rankings table
|
||||
await expect(page.locator('table')).toBeVisible();
|
||||
|
||||
@@ -89,7 +89,7 @@ test.describe.serial('Epic 4: Tournament Creation', () => {
|
||||
await page.click('button[type="submit"]');
|
||||
|
||||
// Wait for redirect to admin or player profile (indicates successful login)
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 5000 });
|
||||
|
||||
// Navigate to new tournament page
|
||||
await page.goto('/admin/tournaments/new');
|
||||
@@ -106,13 +106,23 @@ test.describe.serial('Epic 4: Tournament Creation', () => {
|
||||
await page.click('button[type="submit"]');
|
||||
|
||||
// Wait for redirect to admin or player profile (indicates successful login)
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 5000 });
|
||||
|
||||
await page.goto('/admin/tournaments/new');
|
||||
|
||||
// Check for required fields
|
||||
// Wait for step 1 form to load
|
||||
await page.waitForSelector('input[name="name"]', { timeout: 5000 });
|
||||
|
||||
// Check for required fields on Step 1
|
||||
await expect(page.locator('input[name="name"]')).toBeVisible();
|
||||
await expect(page.locator('select[name="format"]')).toBeVisible();
|
||||
|
||||
// Fill in the required name field first so Next actually advances
|
||||
await page.fill('input[name="name"]', 'Test Tournament');
|
||||
|
||||
// Step through to Step 2 to check for submit button (only appears after clicking Next)
|
||||
await page.click('button:has-text("Next")');
|
||||
await page.waitForSelector('button[type="submit"]', { timeout: 5000 });
|
||||
await expect(page.locator('button[type="submit"]')).toBeVisible();
|
||||
});
|
||||
|
||||
@@ -124,7 +134,7 @@ test.describe.serial('Epic 4: Tournament Creation', () => {
|
||||
await page.click('button[type="submit"]');
|
||||
|
||||
// Wait for redirect to admin or player profile (indicates successful login)
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 5000 });
|
||||
|
||||
// Navigate to new tournament page
|
||||
await page.goto('/admin/tournaments/new');
|
||||
|
||||
+6
-6
@@ -98,17 +98,17 @@ async function createTestUsers(config: FullConfig) {
|
||||
console.log('Submitting registration form...');
|
||||
await page.click('button[type="submit"]');
|
||||
|
||||
try {
|
||||
try {
|
||||
await page.waitForResponse(response =>
|
||||
response.url().includes('/api/auth/sign-up/email') && response.status() === 200,
|
||||
{ timeout: 10000 }
|
||||
{ timeout: 5000 }
|
||||
);
|
||||
console.log('Sign-up API call successful');
|
||||
} catch {
|
||||
console.log('Sign-up API call failed or timed out');
|
||||
}
|
||||
|
||||
await page.waitForTimeout(2000);
|
||||
await page.waitForTimeout(500);
|
||||
await context.storageState({ path: authFile });
|
||||
console.log(`Created and authenticated test user: ${testEmail}`);
|
||||
|
||||
@@ -133,14 +133,14 @@ async function createTestUsers(config: FullConfig) {
|
||||
try {
|
||||
await page.waitForResponse(response =>
|
||||
response.url().includes('/api/auth/sign-up/email') && response.status() === 200,
|
||||
{ timeout: 10000 }
|
||||
{ timeout: 5000 }
|
||||
);
|
||||
console.log('Admin sign-up API call successful');
|
||||
} catch {
|
||||
console.log('Admin sign-up API call failed or timed out');
|
||||
}
|
||||
|
||||
await page.waitForTimeout(2000);
|
||||
await page.waitForTimeout(500);
|
||||
|
||||
const prisma = createPrismaClient();
|
||||
const user = await prisma.user.findUnique({ where: { email: adminEmail } });
|
||||
@@ -159,7 +159,7 @@ async function createTestUsers(config: FullConfig) {
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
console.log('Admin page loaded:', page.url());
|
||||
|
||||
await page.waitForTimeout(2000);
|
||||
await page.waitForTimeout(500);
|
||||
await page.reload();
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
console.log('Page reloaded');
|
||||
|
||||
@@ -133,13 +133,13 @@ test.describe.serial('Issue #7: Schedule Tab', () => {
|
||||
await page.fill('input[name="email"]', testEmail);
|
||||
await page.fill('input[name="password"]', testPassword);
|
||||
await page.click('button[type="submit"]');
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 5000 });
|
||||
|
||||
// Navigate to tournament detail
|
||||
await page.goto(`/admin/tournaments/${tournamentId}`);
|
||||
|
||||
// Check Schedule tab link exists
|
||||
const scheduleLink = page.locator('a', { hasText: 'Schedule' });
|
||||
// Check Schedule tab link exists - use button since page uses buttons for tabs
|
||||
const scheduleLink = page.locator('button', { hasText: 'Schedule' });
|
||||
await expect(scheduleLink).toBeVisible();
|
||||
});
|
||||
|
||||
@@ -149,7 +149,7 @@ test.describe.serial('Issue #7: Schedule Tab', () => {
|
||||
await page.fill('input[name="email"]', testEmail);
|
||||
await page.fill('input[name="password"]', testPassword);
|
||||
await page.click('button[type="submit"]');
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 5000 });
|
||||
|
||||
// Navigate to schedule page
|
||||
await page.goto(`/admin/tournaments/${tournamentId}/schedule`);
|
||||
@@ -166,7 +166,7 @@ test.describe.serial('Issue #7: Schedule Tab', () => {
|
||||
await page.fill('input[name="email"]', testEmail);
|
||||
await page.fill('input[name="password"]', testPassword);
|
||||
await page.click('button[type="submit"]');
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 5000 });
|
||||
|
||||
// Navigate to schedule page
|
||||
await page.goto(`/admin/tournaments/${tournamentId}/schedule`);
|
||||
@@ -175,7 +175,7 @@ test.describe.serial('Issue #7: Schedule Tab', () => {
|
||||
await page.click('button:has-text("Generate Schedule")');
|
||||
|
||||
// Wait for success message or page reload
|
||||
await page.waitForTimeout(3000);
|
||||
await page.waitForTimeout(500);
|
||||
|
||||
// Verify rounds were created in database
|
||||
const rounds = await prisma.tournamentRound.findMany({
|
||||
@@ -196,7 +196,7 @@ test.describe.serial('Issue #7: Schedule Tab', () => {
|
||||
await page.fill('input[name="email"]', testEmail);
|
||||
await page.fill('input[name="password"]', testPassword);
|
||||
await page.click('button[type="submit"]');
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 5000 });
|
||||
|
||||
// Navigate to schedule page
|
||||
await page.goto(`/admin/tournaments/${tournamentId}/schedule`);
|
||||
@@ -218,7 +218,7 @@ test.describe.serial('Issue #7: Schedule Tab', () => {
|
||||
await page.fill('input[name="email"]', testEmail);
|
||||
await page.fill('input[name="password"]', testPassword);
|
||||
await page.click('button[type="submit"]');
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 5000 });
|
||||
|
||||
// Call the schedule API
|
||||
const response = await page.request.get(
|
||||
|
||||
@@ -82,7 +82,7 @@ test.describe.serial('Issue #22: Team Configuration', () => {
|
||||
await page.fill('input[name="email"]', testEmail);
|
||||
await page.fill('input[name="password"]', testPassword);
|
||||
await page.click('button[type="submit"]');
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 5000 });
|
||||
|
||||
// Navigate to tournament creation
|
||||
await page.goto('/admin/tournaments/new');
|
||||
@@ -105,7 +105,7 @@ test.describe.serial('Issue #22: Team Configuration', () => {
|
||||
await page.fill('input[name="email"]', testEmail);
|
||||
await page.fill('input[name="password"]', testPassword);
|
||||
await page.click('button[type="submit"]');
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 5000 });
|
||||
|
||||
// Navigate to tournament creation
|
||||
await page.goto('/admin/tournaments/new');
|
||||
@@ -126,7 +126,8 @@ test.describe.serial('Issue #22: Team Configuration', () => {
|
||||
const playerName3 = `Player ${Date.now() + 2}`;
|
||||
const playerName4 = `Player ${Date.now() + 3}`;
|
||||
|
||||
// Create first player
|
||||
// Create first player - wait for search input to appear first
|
||||
await page.waitForSelector('input[placeholder*="Search"]', { timeout: 5000 });
|
||||
await page.fill('input[placeholder*="Search"]', playerName1);
|
||||
await page.waitForTimeout(500);
|
||||
await page.click(`text=+ Create "${playerName1}" as new player`);
|
||||
@@ -180,7 +181,7 @@ test.describe.serial('Issue #22: Team Configuration', () => {
|
||||
await page.fill('input[name="email"]', testEmail);
|
||||
await page.fill('input[name="password"]', testPassword);
|
||||
await page.click('button[type="submit"]');
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 5000 });
|
||||
|
||||
// Navigate to tournament creation
|
||||
await page.goto('/admin/tournaments/new');
|
||||
@@ -258,7 +259,7 @@ test.describe.serial('Issue #22: Team Configuration', () => {
|
||||
await page.fill('input[name="email"]', testEmail);
|
||||
await page.fill('input[name="password"]', testPassword);
|
||||
await page.click('button[type="submit"]');
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 5000 });
|
||||
|
||||
// Navigate to edit tournament page
|
||||
await page.goto(`/admin/tournaments/${tournamentId}/edit`);
|
||||
|
||||
@@ -189,7 +189,7 @@ test.describe.serial('Tournament with 10 Participants and Variable Team Durabili
|
||||
await page.click('button:has-text("Add")');
|
||||
|
||||
// Wait for the player to be added and UI to update
|
||||
await page.waitForTimeout(1000);
|
||||
await page.waitForTimeout(200);
|
||||
}
|
||||
|
||||
// Verify 10 players are added
|
||||
|
||||
@@ -11,11 +11,54 @@
|
||||
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { prisma } from '@/lib/prisma';
|
||||
const BASE_URL = process.env.CI ? 'https://euchre-ci.notsosm.art' : 'http://localhost:3000';
|
||||
|
||||
function getTestCredentials() {
|
||||
const timestamp = Date.now();
|
||||
return {
|
||||
email: `allowties-admin-${timestamp}@example.com`,
|
||||
password: 'AdminPassword123!',
|
||||
name: `AllowTies Admin ${timestamp}`,
|
||||
};
|
||||
}
|
||||
|
||||
test.describe('Tournament Edit - allowTies functionality', () => {
|
||||
let tournamentId: number;
|
||||
let testEmail: string;
|
||||
let testPassword: string;
|
||||
|
||||
test.beforeAll(async () => {
|
||||
// Create admin user via API
|
||||
const credentials = getTestCredentials();
|
||||
testEmail = credentials.email;
|
||||
testPassword = credentials.password;
|
||||
|
||||
const response = await fetch(`${BASE_URL}/api/auth/sign-up/email`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Origin: BASE_URL,
|
||||
},
|
||||
body: JSON.stringify({
|
||||
email: testEmail,
|
||||
password: testPassword,
|
||||
name: credentials.name,
|
||||
}),
|
||||
});
|
||||
|
||||
console.log('allowTies test user creation response:', response.status);
|
||||
|
||||
// Update user to club_admin role
|
||||
const user = await prisma.user.findUnique({
|
||||
where: { email: testEmail },
|
||||
});
|
||||
if (user) {
|
||||
await prisma.user.update({
|
||||
where: { id: user.id },
|
||||
data: { role: 'club_admin' },
|
||||
});
|
||||
}
|
||||
|
||||
// Create a test tournament for editing
|
||||
const tournament = await prisma.event.create({
|
||||
data: {
|
||||
@@ -25,6 +68,7 @@ test.describe('Tournament Edit - allowTies functionality', () => {
|
||||
status: 'planned',
|
||||
allowTies: false,
|
||||
targetScore: 5,
|
||||
ownerId: user?.id,
|
||||
createdAt: new Date(),
|
||||
updatedAt: new Date(),
|
||||
},
|
||||
@@ -37,16 +81,28 @@ test.describe('Tournament Edit - allowTies functionality', () => {
|
||||
if (tournamentId) {
|
||||
await prisma.event.delete({
|
||||
where: { id: tournamentId },
|
||||
});
|
||||
}).catch(() => {});
|
||||
}
|
||||
// Clean up user
|
||||
const user = await prisma.user.findUnique({ where: { email: testEmail } });
|
||||
if (user) {
|
||||
await prisma.user.delete({ where: { id: user.id } });
|
||||
}
|
||||
});
|
||||
|
||||
test('should display allowTies checkbox on edit form @chromium-admin', async ({ page }) => {
|
||||
// Login first
|
||||
await page.goto('/auth/login');
|
||||
await page.fill('input[name="email"]', testEmail);
|
||||
await page.fill('input[name="password"]', testPassword);
|
||||
await page.click('button[type="submit"]');
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 5000 });
|
||||
|
||||
// Navigate to tournament edit page
|
||||
await page.goto(`/admin/tournaments/${tournamentId}/edit`);
|
||||
|
||||
// Wait for form to load
|
||||
await expect(page.locator('text=Tournament Name')).toBeVisible();
|
||||
// Wait for form to load - edit page shows "Edit Tournament" heading
|
||||
await expect(page.locator('text=Edit Tournament')).toBeVisible({ timeout: 5000 });
|
||||
|
||||
// Check that allowTies checkbox exists
|
||||
const allowTiesCheckbox = page.locator('input[name="allowTies"]');
|
||||
@@ -55,11 +111,18 @@ test.describe('Tournament Edit - allowTies functionality', () => {
|
||||
});
|
||||
|
||||
test('should save allowTies when toggled to true @chromium-admin', async ({ page }) => {
|
||||
// Login first
|
||||
await page.goto('/auth/login');
|
||||
await page.fill('input[name="email"]', testEmail);
|
||||
await page.fill('input[name="password"]', testPassword);
|
||||
await page.click('button[type="submit"]');
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 5000 });
|
||||
|
||||
// Navigate to tournament edit page
|
||||
await page.goto(`/admin/tournaments/${tournamentId}/edit`);
|
||||
|
||||
// Wait for form to load
|
||||
await expect(page.locator('text=Tournament Name')).toBeVisible();
|
||||
await expect(page.locator('text=Edit Tournament')).toBeVisible({ timeout: 5000 });
|
||||
|
||||
// Toggle allowTies checkbox
|
||||
const allowTiesCheckbox = page.locator('input[name="allowTies"]');
|
||||
@@ -87,11 +150,18 @@ test.describe('Tournament Edit - allowTies functionality', () => {
|
||||
data: { allowTies: true },
|
||||
});
|
||||
|
||||
// Login first
|
||||
await page.goto('/auth/login');
|
||||
await page.fill('input[name="email"]', testEmail);
|
||||
await page.fill('input[name="password"]', testPassword);
|
||||
await page.click('button[type="submit"]');
|
||||
await page.waitForURL(/\/(admin|players)/, { timeout: 5000 });
|
||||
|
||||
// Navigate to tournament edit page
|
||||
await page.goto(`/admin/tournaments/${tournamentId}/edit`);
|
||||
|
||||
// Wait for form to load
|
||||
await expect(page.locator('text=Tournament Name')).toBeVisible();
|
||||
await expect(page.locator('text=Edit Tournament')).toBeVisible({ timeout: 5000 });
|
||||
|
||||
// Verify checkbox is checked
|
||||
const allowTiesCheckbox = page.locator('input[name="allowTies"]');
|
||||
@@ -114,4 +184,4 @@ test.describe('Tournament Edit - allowTies functionality', () => {
|
||||
|
||||
expect(updatedTournament?.allowTies).toBe(false);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -259,12 +259,12 @@ deploy-prod version:
|
||||
docker compose pull app && \
|
||||
docker compose up -d app && \
|
||||
echo "Waiting for production site to be healthy..." && \
|
||||
for i in {1..30}; do \
|
||||
for i in {1..6}; 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; \
|
||||
sleep 15; \
|
||||
done && \
|
||||
echo "❌ Production deployment failed - health check timed out"; \
|
||||
docker compose logs app; \
|
||||
|
||||
@@ -4,16 +4,12 @@ export default defineConfig({
|
||||
testDir: './e2e',
|
||||
timeout: 30000,
|
||||
expect: {
|
||||
timeout: 5000
|
||||
timeout: 2000
|
||||
},
|
||||
// Run tests sequentially to avoid database conflicts
|
||||
fullyParallel: false,
|
||||
// Fail the build on CI if you accidentally left test.only in the source code.
|
||||
forbidOnly: !!process.env.CI,
|
||||
// Retry on CI only.
|
||||
retries: process.env.CI ? 1 : 0,
|
||||
// Use 1 worker in CI to avoid database conflicts between parallel projects
|
||||
workers: 1,
|
||||
// Run tests in parallel for speed - database isolation is per-test via unique data
|
||||
fullyParallel: true,
|
||||
// Use multiple workers in CI to speed up test execution
|
||||
workers: process.env.CI ? 10 : 1,
|
||||
// Reporter to use
|
||||
reporter: 'html',
|
||||
// Global setup and teardown
|
||||
|
||||
Reference in New Issue
Block a user