From faf39abaf18286fe7ed4734c69f97136b1f17681 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Fri, 11 Jul 2025 21:18:51 +0100 Subject: [PATCH 01/28] feat: create base tests --- .github/workflows/e2e-tests.yml | 95 +++++ .gitignore | 10 + docs/TESTING.md | 228 ++++++++++ package-lock.json | 401 ++++++++++++++++++ package.json | 13 +- playwright.config.ts | 78 ++++ scripts/rename-migrations.sh | 76 ++++ scripts/setup-local-supabase.sh | 44 ++ scripts/setup-test-data.ts | 83 ++++ scripts/setup-test-env.sh | 28 ++ ...> 20250620065433_create_artists_table.sql} | 0 ...8-4e724988-f7f5-49ea-9f51-e16c1d708d6c.sql | 52 --- .../20250620080928_seed_artists_data.sql | 73 ++++ ...=> 20250620101328_update_artists_data.sql} | 0 ...=> 20250620104828_update_artists_data.sql} | 0 ...d9f8c.sql => 20250620120553_migration.sql} | 0 ...=> 20250620121419_update_artists_data.sql} | 0 ...f7da4.sql => 20250620121752_migration.sql} | 0 ...=> 20250620124207_create_rls_policies.sql} | 0 ...=> 20250620140128_create_rls_policies.sql} | 0 ...2135f.sql => 20250620144024_migration.sql} | 0 ...02898.sql => 20250620144942_migration.sql} | 0 ...a28e2.sql => 20250620150443_migration.sql} | 0 ...6b93b.sql => 20250620150938_migration.sql} | 0 ...=> 20250620152102_create_groups_table.sql} | 0 ...ql => 20250621073509_create_functions.sql} | 0 ...=> 20250621073724_create_rls_policies.sql} | 0 ...0f4.sql => 20250621074013_add_columns.sql} | 0 ...ql => 20250621090428_create_functions.sql} | 0 ...=> 20250621090745_create_rls_policies.sql} | 0 ...ql => 20250621102522_create_functions.sql} | 0 ...=> 20250621123057_create_rls_policies.sql} | 0 ...ql => 20250621125212_create_functions.sql} | 0 ...=> 20250622081538_update_artists_data.sql} | 0 ...a90ae.sql => 20250622090351_migration.sql} | 0 ...32e8b.sql => 20250623102838_migration.sql} | 0 ...ql => 20250702170434_create_functions.sql} | 0 ...b85.sql => 20250702171021_add_columns.sql} | 0 ...250709094304_create_admin_roles_table.sql} | 0 ...ql => 20250709105808_create_functions.sql} | 0 ...ql => 20250709114513_create_functions.sql} | 0 tests/README.md | 227 ++++++++++ tests/config/test-env.ts | 28 ++ tests/e2e/artists.spec.ts | 90 ++++ tests/e2e/auth.spec.ts | 26 ++ tests/e2e/navigation.spec.ts | 38 ++ tests/utils/test-helpers.ts | 107 +++++ 47 files changed, 1644 insertions(+), 53 deletions(-) create mode 100644 .github/workflows/e2e-tests.yml create mode 100644 docs/TESTING.md create mode 100644 playwright.config.ts create mode 100755 scripts/rename-migrations.sh create mode 100755 scripts/setup-local-supabase.sh create mode 100644 scripts/setup-test-data.ts create mode 100755 scripts/setup-test-env.sh rename supabase/migrations/{20250620065433-e1f45078-3943-49f0-ba19-8ffead5ea774.sql => 20250620065433_create_artists_table.sql} (100%) delete mode 100644 supabase/migrations/20250620080928-4e724988-f7f5-49ea-9f51-e16c1d708d6c.sql create mode 100644 supabase/migrations/20250620080928_seed_artists_data.sql rename supabase/migrations/{20250620101328-8cc5335f-3fa0-4e5a-b4dd-e6817ef139ec.sql => 20250620101328_update_artists_data.sql} (100%) rename supabase/migrations/{20250620104828-a53d52a1-01ce-486a-80a4-6e3eb7887ede.sql => 20250620104828_update_artists_data.sql} (100%) rename supabase/migrations/{20250620120553-85bb003f-0c5d-474e-bcd6-972e831d9f8c.sql => 20250620120553_migration.sql} (100%) rename supabase/migrations/{20250620121419-d69f0339-d3f5-4902-b17e-a66b005d4241.sql => 20250620121419_update_artists_data.sql} (100%) rename supabase/migrations/{20250620121752-63ca65fd-cc42-4a74-9cd9-2689c97f7da4.sql => 20250620121752_migration.sql} (100%) rename supabase/migrations/{20250620124207-ce5e5d71-e73d-44c5-9b5b-4063e276c99d.sql => 20250620124207_create_rls_policies.sql} (100%) rename supabase/migrations/{20250620140128-121ae6c3-5683-4e3d-a493-514f58ae3eac.sql => 20250620140128_create_rls_policies.sql} (100%) rename supabase/migrations/{20250620144024-2d610f4f-9403-412c-b591-03ee0d42135f.sql => 20250620144024_migration.sql} (100%) rename supabase/migrations/{20250620144942-2b4fdd7c-a5c2-4d3d-b775-f6747ad02898.sql => 20250620144942_migration.sql} (100%) rename supabase/migrations/{20250620150443-22890c5f-7261-46ee-8bbd-ea5d618a28e2.sql => 20250620150443_migration.sql} (100%) rename supabase/migrations/{20250620150938-ecfcf638-44d5-478e-96c9-12d10036b93b.sql => 20250620150938_migration.sql} (100%) rename supabase/migrations/{20250620152102-be540ea3-97fa-4d67-b6d6-4d785cb2a9ff.sql => 20250620152102_create_groups_table.sql} (100%) rename supabase/migrations/{20250621073509-db815051-e170-4580-af7d-a776b479597b.sql => 20250621073509_create_functions.sql} (100%) rename supabase/migrations/{20250621073724-f8406649-493b-4e7e-8cde-c91d4d33e58d.sql => 20250621073724_create_rls_policies.sql} (100%) rename supabase/migrations/{20250621074013-e2672162-160e-471c-a4a5-a5575f98d0f4.sql => 20250621074013_add_columns.sql} (100%) rename supabase/migrations/{20250621090428-e766e82c-d0b4-4e52-85b3-30e90d50cde1.sql => 20250621090428_create_functions.sql} (100%) rename supabase/migrations/{20250621090745-debae17c-3d32-496f-a0b9-f040e9e0df88.sql => 20250621090745_create_rls_policies.sql} (100%) rename supabase/migrations/{20250621102522-02c403c3-d223-48ab-b999-a53dc74e0974.sql => 20250621102522_create_functions.sql} (100%) rename supabase/migrations/{20250621123057-c3f84bbb-201e-4627-b0e7-3724d79febbf.sql => 20250621123057_create_rls_policies.sql} (100%) rename supabase/migrations/{20250621125212-4eec42a8-7f25-48b5-90e2-eaffe2b82a0b.sql => 20250621125212_create_functions.sql} (100%) rename supabase/migrations/{20250622081538-e032edff-06a4-4b8a-9c2d-138ee95afb9f.sql => 20250622081538_update_artists_data.sql} (100%) rename supabase/migrations/{20250622090351-886b099e-d041-4e57-b977-d6747d5a90ae.sql => 20250622090351_migration.sql} (100%) rename supabase/migrations/{20250623102838-6a39f191-b0fd-4e1c-bca0-3a444cd32e8b.sql => 20250623102838_migration.sql} (100%) rename supabase/migrations/{20250702170434-77406ce2-1f37-43a7-bafc-ab1035dc58b6.sql => 20250702170434_create_functions.sql} (100%) rename supabase/migrations/{20250702171021-960893c6-99c3-4282-8f78-50220e431b85.sql => 20250702171021_add_columns.sql} (100%) rename supabase/migrations/{20250709094304-82d62de8-95be-4eb3-b4f7-d26b47e72697.sql => 20250709094304_create_admin_roles_table.sql} (100%) rename supabase/migrations/{20250709105808-4f5c63f1-5579-4b44-ab86-73483ed13626.sql => 20250709105808_create_functions.sql} (100%) rename supabase/migrations/{20250709114513-4feafdd7-2114-4e8d-8f60-3c43e89b6acc.sql => 20250709114513_create_functions.sql} (100%) create mode 100644 tests/README.md create mode 100644 tests/config/test-env.ts create mode 100644 tests/e2e/artists.spec.ts create mode 100644 tests/e2e/auth.spec.ts create mode 100644 tests/e2e/navigation.spec.ts create mode 100644 tests/utils/test-helpers.ts diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml new file mode 100644 index 00000000..e4045eb3 --- /dev/null +++ b/.github/workflows/e2e-tests.yml @@ -0,0 +1,95 @@ +name: E2E Tests + +on: + push: + branches: [ main, develop ] + pull_request: + branches: [ main, develop ] + +jobs: + test: + timeout-minutes: 60 + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + shardIndex: [1, 2, 3, 4] + shardTotal: [4] + # Add shardIndex: [1, 2, 3, 4, 5, 6, 7, 8] and shardTotal: [8] for more shards + + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-node@v4 + with: + node-version: 18 + cache: 'npm' + + - name: Install dependencies + run: npm ci + + - name: Install Playwright Browsers + run: npx playwright install --with-deps + + - name: Setup Supabase + run: | + npm install -g supabase + supabase start + sleep 10 + supabase db reset + + - name: Setup test data + run: npm run test:data + env: + TEST_SUPABASE_URL: http://localhost:54321 + TEST_SUPABASE_ANON_KEY: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0 + + - name: Build project + run: npm run build + + - name: Run Playwright tests + run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} + env: + TEST_SUPABASE_URL: http://localhost:54321 + TEST_SUPABASE_ANON_KEY: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0 + + - uses: actions/upload-artifact@v4 + if: always() + with: + name: playwright-report-${{ matrix.shardIndex }} + path: | + playwright-report/ + test-results/ + retention-days: 30 + + report: + needs: test + runs-on: ubuntu-latest + if: always() + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-node@v4 + with: + node-version: 18 + cache: 'npm' + + - name: Install dependencies + run: npm ci + + - name: Install Playwright Browsers + run: npx playwright install --with-deps + + - name: Download all results + uses: actions/download-artifact@v4 + with: + path: all-results/ + + - name: Merge results + run: npx playwright merge-reports ./all-results --reporter html + + - uses: actions/upload-artifact@v4 + with: + name: playwright-report + path: playwright-report/ + retention-days: 30 \ No newline at end of file diff --git a/.gitignore b/.gitignore index d362a7a0..ff9a8b2b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,13 @@ dist-ssr *.sw? supabase/.temp + +# Test artifacts +playwright-report/ +test-results/ +tests/screenshots/ + +.env + +supabase/.temp +supabase/.branches diff --git a/docs/TESTING.md b/docs/TESTING.md new file mode 100644 index 00000000..79cc186d --- /dev/null +++ b/docs/TESTING.md @@ -0,0 +1,228 @@ +# Testing Setup for Boom Voter + +This document outlines the complete testing infrastructure we've set up for the Boom Voter application. + +## ๐ŸŽฏ What We've Added + +### 1. **Playwright E2E Testing** +- **Framework**: Playwright for end-to-end testing +- **Browsers**: Chrome, Firefox, Safari, Mobile Chrome, Mobile Safari +- **Features**: Screenshots, videos, traces, parallel execution +- **Configuration**: `playwright.config.ts` + +### 2. **Local Supabase Testing Environment** +- **Local Database**: Supabase running on Docker +- **Test Data**: Automated setup with sample artists, genres, groups +- **Isolation**: Separate from production environment +- **Scripts**: Easy setup and teardown + +### 3. **Test Infrastructure** +- **Test Helpers**: Common utilities for authentication, navigation, etc. +- **Test Data**: Consistent test scenarios +- **Environment Config**: Flexible configuration for different environments +- **CI/CD Integration**: GitHub Actions workflow + +## ๐Ÿ“ New Files Created + +``` +โ”œโ”€โ”€ playwright.config.ts # Playwright configuration +โ”œโ”€โ”€ tests/ +โ”‚ โ”œโ”€โ”€ e2e/ # E2E test files +โ”‚ โ”‚ โ”œโ”€โ”€ auth.spec.ts # Authentication tests +โ”‚ โ”‚ โ”œโ”€โ”€ navigation.spec.ts # Navigation tests +โ”‚ โ”‚ โ””โ”€โ”€ artists.spec.ts # Artist functionality tests +โ”‚ โ”œโ”€โ”€ config/ +โ”‚ โ”‚ โ””โ”€โ”€ test-env.ts # Test environment configuration +โ”‚ โ”œโ”€โ”€ utils/ +โ”‚ โ”‚ โ””โ”€โ”€ test-helpers.ts # Common test utilities +โ”‚ โ”œโ”€โ”€ screenshots/ # Test screenshots directory +โ”‚ โ””โ”€โ”€ README.md # Testing documentation +โ”œโ”€โ”€ scripts/ +โ”‚ โ”œโ”€โ”€ setup-test-env.sh # Local Supabase setup script +โ”‚ โ””โ”€โ”€ setup-test-data.ts # Test data population script +โ”œโ”€โ”€ .github/workflows/ +โ”‚ โ””โ”€โ”€ e2e-tests.yml # CI/CD workflow +โ””โ”€โ”€ docs/ + โ””โ”€โ”€ TESTING.md # This file +``` + +## ๐Ÿš€ Getting Started + +### Prerequisites +1. **Node.js 18+** +2. **Docker** (for local Supabase) +3. **Supabase CLI**: `npm install -g supabase` + +### Quick Setup +```bash +# Install dependencies +npm install + +# Setup local Supabase +npm run test:setup + +# Populate test data +npm run test:data + +# Run tests +npm run test:e2e +``` + +## ๐Ÿงช Available Commands + +| Command | Description | +|---------|-------------| +| `npm run test:e2e` | Run all tests (headless) | +| `npm run test:e2e:ui` | Run tests with Playwright UI | +| `npm run test:e2e:headed` | Run tests with visible browser | +| `npm run test:e2e:debug` | Run tests in debug mode | +| `npm run test:e2e:report` | Open test report | +| `npm run test:setup` | Setup local Supabase | +| `npm run test:data` | Setup test data | + +## ๐Ÿ”ง Configuration + +### Environment Variables +- `TEST_SUPABASE_URL`: Local Supabase URL +- `TEST_SUPABASE_ANON_KEY`: Local Supabase anon key +- `PLAYWRIGHT_BASE_URL`: App base URL +- `TEST_USER_EMAIL`: Test user email +- `TEST_USER_PASSWORD`: Test user password + +### Test Data +The setup creates: +- **3 test artists** with different genres and schedules +- **5 test genres** (Rock, Pop, Jazz, Electronic, Hip Hop) +- **3 test groups** +- **2 test users** (regular + admin) + +## ๐ŸŽฏ Test Coverage + +### Current Tests +1. **Authentication** + - Sign in dialog display + - Page title verification + +2. **Navigation** + - Page routing + - 404 handling + +3. **Artists** + - Artists list display + - Filtering functionality + - Artist detail navigation + - Empty state handling + +### Planned Tests +- User registration +- Voting functionality +- Group management +- Schedule viewing +- Admin features +- Mobile responsiveness +- Offline functionality + +## ๐Ÿ”„ CI/CD Integration + +### GitHub Actions Workflow +- **Triggers**: Push to main/develop, PRs +- **Parallel Execution**: 4 shards for faster runs +- **Artifacts**: Test reports, screenshots, videos +- **Environment**: Local Supabase in CI + +### Workflow Steps +1. Setup Node.js and dependencies +2. Install Playwright browsers +3. Start local Supabase +4. Populate test data +5. Build application +6. Run tests in parallel +7. Generate and upload reports + +## ๐Ÿ—„๏ธ Local Supabase + +### Access Points +- **API**: http://localhost:54321 +- **Studio**: http://localhost:54323 +- **Anon Key**: `eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...` + +### Management +```bash +# Start +supabase start + +# Stop +supabase stop + +# Status +supabase status + +# Logs +supabase logs +``` + +## ๐Ÿ“Š Test Reports + +### HTML Report +After running tests, view the interactive report: +```bash +npm run test:e2e:report +``` + +### Report Features +- Test results and timing +- Screenshots and videos +- Traces for debugging +- Error details and stack traces +- Filtering and search + +## ๐Ÿ› Debugging + +### Debug Mode +```bash +npm run test:e2e:debug +``` + +### UI Mode +```bash +npm run test:e2e:ui +``` + +### Screenshots +Tests automatically capture screenshots on failure in `tests/screenshots/` + +## ๐Ÿ”ฎ Next Steps + +### Immediate +1. **Run initial tests** to verify setup +2. **Add more test scenarios** based on app features +3. **Configure test users** in local Supabase +4. **Add data-testid attributes** to components + +### Future Enhancements +1. **Visual regression testing** +2. **Performance testing** +3. **Accessibility testing** +4. **API testing** with separate test suite +5. **Load testing** for critical user flows + +## ๐Ÿšจ Troubleshooting + +### Common Issues +1. **Supabase not starting**: Check Docker is running +2. **Tests timing out**: Increase timeouts in config +3. **Element not found**: Update selectors to match UI +4. **Authentication failing**: Verify test user setup + +### Getting Help +1. Check Playwright docs: https://playwright.dev/ +2. Review test logs and screenshots +3. Use debug mode for step-by-step debugging +4. Check Supabase logs: `supabase logs` + +## ๐Ÿ“š Resources + +- [Playwright Documentation](https://playwright.dev/) +- [Supabase Local Development](https://supabase.com/docs/guides/cli/local-development) +- [GitHub Actions Documentation](https://docs.github.com/en/actions) +- [Testing Best Practices](https://playwright.dev/docs/best-practices) \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index c62e66f6..08085194 100644 --- a/package-lock.json +++ b/package-lock.json @@ -70,6 +70,7 @@ }, "devDependencies": { "@eslint/js": "^9.9.0", + "@playwright/test": "^1.54.1", "@tailwindcss/typography": "^0.5.15", "@types/node": "^22.5.5", "@types/react": "^18.3.3", @@ -82,7 +83,9 @@ "globals": "^15.9.0", "lovable-tagger": "^1.1.7", "postcss": "^8.4.47", + "supabase": "^2.30.4", "tailwindcss": "^3.4.11", + "tsx": "^4.20.3", "typescript": "^5.5.3", "typescript-eslint": "^8.0.1", "vite": "^5.4.1" @@ -2346,6 +2349,19 @@ "node": ">=12" } }, + "node_modules/@isaacs/fs-minipass": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", + "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.4" + }, + "engines": { + "node": ">=18.0.0" + } + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.12", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz", @@ -2436,6 +2452,22 @@ "node": ">=14" } }, + "node_modules/@playwright/test": { + "version": "1.54.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.54.1.tgz", + "integrity": "sha512-FS8hQ12acieG2dYSksmLOF7BNxnVf2afRJdCuM1eMSxj6QTSE6G4InGF7oApGgDb65MX7AwMVlIkpru0yZA4Xw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "playwright": "1.54.1" + }, + "bin": { + "playwright": "cli.js" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@radix-ui/number": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.1.tgz", @@ -4985,6 +5017,16 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/agent-base": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", + "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 14" + } + }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -5241,6 +5283,23 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "license": "MIT" }, + "node_modules/bin-links": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-5.0.0.tgz", + "integrity": "sha512-sdleLVfCjBtgO5cNjA2HVRvWBJAHs4zwenaCPMNJAJU0yNxpzj80IpjOIimkpkr+mhlA+how5poQtt53PygbHA==", + "dev": true, + "license": "ISC", + "dependencies": { + "cmd-shim": "^7.0.0", + "npm-normalize-package-bin": "^4.0.0", + "proc-log": "^5.0.0", + "read-cmd-shim": "^5.0.0", + "write-file-atomic": "^6.0.0" + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" + } + }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", @@ -5451,6 +5510,16 @@ "node": ">= 6" } }, + "node_modules/chownr": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", + "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" + } + }, "node_modules/class-variance-authority": { "version": "0.7.1", "resolved": "https://registry.npmjs.org/class-variance-authority/-/class-variance-authority-0.7.1.tgz", @@ -5472,6 +5541,16 @@ "node": ">=6" } }, + "node_modules/cmd-shim": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-7.0.0.tgz", + "integrity": "sha512-rtpaCbr164TPPh+zFdkWpCyZuKkjpAzODfaZCf/SVJZzJN+4bHQb/LP3Jzq5/+84um3XXY8r548XiWKSborwVw==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" + } + }, "node_modules/cmdk": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.1.1.tgz", @@ -5711,6 +5790,16 @@ "node": ">=12" } }, + "node_modules/data-uri-to-buffer": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", + "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 12" + } + }, "node_modules/data-view-buffer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", @@ -6431,6 +6520,30 @@ "reusify": "^1.0.4" } }, + "node_modules/fetch-blob": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", + "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/jimmywarting" + }, + { + "type": "paypal", + "url": "https://paypal.me/jimmywarting" + } + ], + "license": "MIT", + "dependencies": { + "node-domexception": "^1.0.0", + "web-streams-polyfill": "^3.0.3" + }, + "engines": { + "node": "^12.20 || >= 14.13" + } + }, "node_modules/file-entry-cache": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", @@ -6555,6 +6668,19 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/formdata-polyfill": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", + "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fetch-blob": "^3.1.2" + }, + "engines": { + "node": ">=12.20.0" + } + }, "node_modules/fraction.js": { "version": "4.3.7", "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz", @@ -6720,6 +6846,19 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/get-tsconfig": { + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz", + "integrity": "sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, + "funding": { + "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" + } + }, "node_modules/glob": { "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", @@ -6917,6 +7056,20 @@ "node": ">= 0.4" } }, + "node_modules/https-proxy-agent": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/idb": { "version": "8.0.3", "resolved": "https://registry.npmjs.org/idb/-/idb-8.0.3.tgz", @@ -7806,6 +7959,35 @@ "node": ">=16 || 14 >=14.17" } }, + "node_modules/minizlib": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz", + "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^7.1.2" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/mkdirp": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", + "dev": true, + "license": "MIT", + "bin": { + "mkdirp": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -7858,6 +8040,46 @@ "react-dom": "^16.8 || ^17 || ^18" } }, + "node_modules/node-domexception": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", + "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", + "deprecated": "Use your platform's native DOMException instead", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/jimmywarting" + }, + { + "type": "github", + "url": "https://paypal.me/jimmywarting" + } + ], + "license": "MIT", + "engines": { + "node": ">=10.5.0" + } + }, + "node_modules/node-fetch": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", + "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", + "dev": true, + "license": "MIT", + "dependencies": { + "data-uri-to-buffer": "^4.0.0", + "fetch-blob": "^3.1.4", + "formdata-polyfill": "^4.0.10" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/node-fetch" + } + }, "node_modules/node-releases": { "version": "2.0.19", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", @@ -7883,6 +8105,16 @@ "node": ">=0.10.0" } }, + "node_modules/npm-normalize-package-bin": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz", + "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -8123,6 +8355,53 @@ "node": ">= 6" } }, + "node_modules/playwright": { + "version": "1.54.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.54.1.tgz", + "integrity": "sha512-peWpSwIBmSLi6aW2auvrUtf2DqY16YYcCMO8rTVx486jKmDTJg7UAhyrraP98GB8BoPURZP8+nxO7TSd4cPr5g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "playwright-core": "1.54.1" + }, + "bin": { + "playwright": "cli.js" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "fsevents": "2.3.2" + } + }, + "node_modules/playwright-core": { + "version": "1.54.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.54.1.tgz", + "integrity": "sha512-Nbjs2zjj0htNhzgiy5wu+3w09YetDx5pkrpI/kZotDlDUaYk0HVA5xrBVPdow4SAUIlhgKcJeJg4GRKW6xHusA==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "playwright-core": "cli.js" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/playwright/node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/possible-typed-array-names": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", @@ -8311,6 +8590,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/proc-log": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz", + "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" + } + }, "node_modules/prop-types": { "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", @@ -8585,6 +8874,16 @@ "pify": "^2.3.0" } }, + "node_modules/read-cmd-shim": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-5.0.0.tgz", + "integrity": "sha512-SEbJV7tohp3DAAILbEMPXavBjAnMN0tVnh4+9G8ihV4Pq3HYF9h8QNez9zkJ1ILkv9G2BjdzwctznGZXgu/HGw==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" + } + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -8775,6 +9074,16 @@ "node": ">=4" } }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, "node_modules/reusify": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", @@ -9440,6 +9749,26 @@ "node": ">=16 || 14 >=14.17" } }, + "node_modules/supabase": { + "version": "2.30.4", + "resolved": "https://registry.npmjs.org/supabase/-/supabase-2.30.4.tgz", + "integrity": "sha512-AOCyd2vmBBMTXbnahiCU0reRNxKS4n5CrPciUF2tcTrQ8dLzl1HwcLfe5DrG8E0QRcKHPDdzprmh/2+y4Ta5MA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "bin-links": "^5.0.0", + "https-proxy-agent": "^7.0.2", + "node-fetch": "^3.3.2", + "tar": "7.4.3" + }, + "bin": { + "supabase": "bin/supabase" + }, + "engines": { + "npm": ">=8" + } + }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -9533,6 +9862,34 @@ "node": ">=4" } }, + "node_modules/tar": { + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", + "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", + "dev": true, + "license": "ISC", + "dependencies": { + "@isaacs/fs-minipass": "^4.0.0", + "chownr": "^3.0.0", + "minipass": "^7.1.2", + "minizlib": "^3.0.1", + "mkdirp": "^3.0.1", + "yallist": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/tar/node_modules/yallist": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", + "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" + } + }, "node_modules/temp-dir": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz", @@ -9696,6 +10053,26 @@ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "license": "0BSD" }, + "node_modules/tsx": { + "version": "4.20.3", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.20.3.tgz", + "integrity": "sha512-qjbnuR9Tr+FJOMBqJCW5ehvIo/buZq7vH7qD7JziU98h6l3qGy0a/yPFjwO+y0/T7GFpNgNAvEcPPVfyT8rrPQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "esbuild": "~0.25.0", + "get-tsconfig": "^4.7.5" + }, + "bin": { + "tsx": "dist/cli.mjs" + }, + "engines": { + "node": ">=18.0.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.3" + } + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -10555,6 +10932,16 @@ "@esbuild/win32-x64": "0.21.5" } }, + "node_modules/web-streams-polyfill": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", + "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, "node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", @@ -11139,6 +11526,20 @@ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "license": "ISC" }, + "node_modules/write-file-atomic": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-6.0.0.tgz", + "integrity": "sha512-GmqrO8WJ1NuzJ2DrziEI2o57jKAVIQNf8a18W3nCYU3H7PNWqCCVTeH6/NQE93CIllIgQS98rrmVkYgTX9fFJQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" + } + }, "node_modules/ws": { "version": "8.18.3", "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz", diff --git a/package.json b/package.json index f6b92f01..9325f534 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,15 @@ "build": "vite build", "build:dev": "vite build --mode development", "lint": "eslint .", - "preview": "vite preview" + "preview": "vite preview", + "test:e2e": "playwright test", + "test:e2e:ui": "playwright test --ui", + "test:e2e:headed": "playwright test --headed", + "test:e2e:debug": "playwright test --debug", + "test:e2e:report": "playwright show-report", + "test:setup": "bash scripts/setup-test-env.sh", + "test:setup:full": "bash scripts/setup-local-supabase.sh", + "test:data": "tsx scripts/setup-test-data.ts" }, "dependencies": { "@hookform/resolvers": "^3.9.0", @@ -73,6 +81,7 @@ }, "devDependencies": { "@eslint/js": "^9.9.0", + "@playwright/test": "^1.54.1", "@tailwindcss/typography": "^0.5.15", "@types/node": "^22.5.5", "@types/react": "^18.3.3", @@ -85,7 +94,9 @@ "globals": "^15.9.0", "lovable-tagger": "^1.1.7", "postcss": "^8.4.47", + "supabase": "^2.30.4", "tailwindcss": "^3.4.11", + "tsx": "^4.20.3", "typescript": "^5.5.3", "typescript-eslint": "^8.0.1", "vite": "^5.4.1" diff --git a/playwright.config.ts b/playwright.config.ts new file mode 100644 index 00000000..29f9ebc7 --- /dev/null +++ b/playwright.config.ts @@ -0,0 +1,78 @@ +import { defineConfig, devices } from '@playwright/test'; + +/** + * @see https://playwright.dev/docs/test-configuration + */ +export default defineConfig({ + testDir: './tests/e2e', + /* Run tests in files in parallel */ + fullyParallel: true, + /* 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 ? 2 : 0, + /* Opt out of parallel tests on CI. */ + workers: process.env.CI ? 1 : undefined, + /* Reporter to use. See https://playwright.dev/docs/test-reporters */ + reporter: 'html', + /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */ + use: { + /* Base URL to use in actions like `await page.goto('/')`. */ + baseURL: process.env.PLAYWRIGHT_BASE_URL || 'http://localhost:5173', + + /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */ + trace: 'on-first-retry', + + /* Take screenshot on failure */ + screenshot: 'only-on-failure', + + /* Record video on failure */ + video: 'retain-on-failure', + }, + + /* Configure projects for major browsers */ + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + + { + name: 'firefox', + use: { ...devices['Desktop Firefox'] }, + }, + + { + name: 'webkit', + use: { ...devices['Desktop Safari'] }, + }, + + /* Test against mobile viewports. */ + { + name: 'Mobile Chrome', + use: { ...devices['Pixel 5'] }, + }, + { + name: 'Mobile Safari', + use: { ...devices['iPhone 12'] }, + }, + + /* Test against branded browsers. */ + // { + // name: 'Microsoft Edge', + // use: { ...devices['Desktop Edge'], channel: 'msedge' }, + // }, + // { + // name: 'Google Chrome', + // use: { ...devices['Desktop Chrome'], channel: 'chrome' }, + // }, + ], + + /* Run your local dev server before starting the tests */ + webServer: { + command: 'npm run dev', + url: 'http://localhost:5173', + reuseExistingServer: !process.env.CI, + timeout: 120 * 1000, + }, +}); \ No newline at end of file diff --git a/scripts/rename-migrations.sh b/scripts/rename-migrations.sh new file mode 100755 index 00000000..258dc741 --- /dev/null +++ b/scripts/rename-migrations.sh @@ -0,0 +1,76 @@ +#!/bin/bash + +# Script to rename migration files with descriptive names + +echo "๐Ÿ”„ Renaming migration files to follow Supabase naming convention..." + +cd supabase/migrations + +# Function to get descriptive name based on file content +get_migration_name() { + local file="$1" + local content=$(head -20 "$file" | tr '[:upper:]' '[:lower:]') + + # Check for common patterns in the migration content + if echo "$content" | grep -q "create table.*artists"; then + echo "create_artists_table" + elif echo "$content" | grep -q "create table.*votes"; then + echo "create_votes_table" + elif echo "$content" | grep -q "create table.*profiles"; then + echo "create_profiles_table" + elif echo "$content" | grep -q "create table.*music_genres"; then + echo "create_music_genres_table" + elif echo "$content" | grep -q "create table.*groups"; then + echo "create_groups_table" + elif echo "$content" | grep -q "create table.*admin_roles"; then + echo "create_admin_roles_table" + elif echo "$content" | grep -q "alter table.*add column"; then + echo "add_columns" + elif echo "$content" | grep -q "insert into.*artists"; then + echo "seed_artists_data" + elif echo "$content" | grep -q "insert into.*music_genres"; then + echo "seed_genres_data" + elif echo "$content" | grep -q "create.*function"; then + echo "create_functions" + elif echo "$content" | grep -q "create.*policy"; then + echo "create_rls_policies" + elif echo "$content" | grep -q "enable.*row level security"; then + echo "enable_rls" + elif echo "$content" | grep -q "create.*trigger"; then + echo "create_triggers" + elif echo "$content" | grep -q "alter.*replica identity"; then + echo "setup_realtime" + elif echo "$content" | grep -q "update.*artists"; then + echo "update_artists_data" + elif echo "$content" | grep -q "fix.*search_path"; then + echo "fix_search_path_security" + else + echo "migration" + fi +} + +# Rename each migration file +for file in *.sql; do + if [[ -f "$file" ]]; then + # Extract timestamp (first 14 characters) + timestamp=$(echo "$file" | cut -c1-14) + + # Get descriptive name + name=$(get_migration_name "$file") + + # Create new filename + new_filename="${timestamp}_${name}.sql" + + # Rename the file + if [[ "$file" != "$new_filename" ]]; then + echo "Renaming: $file -> $new_filename" + mv "$file" "$new_filename" + fi + fi +done + +echo "โœ… Migration files renamed successfully!" +echo "" +echo "๐Ÿ“‹ New migration files:" +ls -la *.sql | head -10 +echo "..." \ No newline at end of file diff --git a/scripts/setup-local-supabase.sh b/scripts/setup-local-supabase.sh new file mode 100755 index 00000000..dfb74862 --- /dev/null +++ b/scripts/setup-local-supabase.sh @@ -0,0 +1,44 @@ +#!/bin/bash + +# Comprehensive local Supabase setup script + +echo "๐Ÿš€ Setting up local Supabase environment..." + +# Check if Supabase CLI is installed +if ! command -v supabase &> /dev/null; then + echo "โŒ Supabase CLI not found. Please install it first:" + echo " npm install -g supabase" + exit 1 +fi + +# Check if Docker is running +if ! docker info &> /dev/null; then + echo "โŒ Docker is not running. Please start Docker first." + exit 1 +fi + +# Stop any existing Supabase instance +echo "๐Ÿ›‘ Stopping any existing Supabase instances..." +supabase stop 2>/dev/null || true + +# Start local Supabase +echo "๐Ÿ“ฆ Starting local Supabase..." +supabase start + +# Wait for Supabase to be ready +echo "โณ Waiting for Supabase to be ready..." +sleep 15 + +# Check if Supabase is running +if ! supabase status &> /dev/null; then + echo "โŒ Failed to start Supabase. Please check Docker and try again." + exit 1 +fi + +# Run migrations +echo "๐Ÿ”„ Running database migrations..." +supabase db reset + +# Verify migrations +echo "โœ… Verifying database schema..." +supabase db diff --schema public diff --git a/scripts/setup-test-data.ts b/scripts/setup-test-data.ts new file mode 100644 index 00000000..003173f7 --- /dev/null +++ b/scripts/setup-test-data.ts @@ -0,0 +1,83 @@ +import { createClient } from '@supabase/supabase-js'; + +const SUPABASE_URL = process.env.TEST_SUPABASE_URL || 'http://localhost:54321'; +const SUPABASE_ANON_KEY = process.env.TEST_SUPABASE_ANON_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0'; + +const supabase = createClient(SUPABASE_URL, SUPABASE_ANON_KEY); + +const testData = { + artists: [ + { name: 'Test Artist 1', description: 'Test artist for e2e testing', genre: 'Electronic' }, + { name: 'Test Artist 2', description: 'Another test artist', genre: 'Psytrance' }, + { name: 'Test Artist 3', description: 'Third test artist', genre: 'Techno' }, + ], + genres: ['Electronic', 'Psytrance', 'Techno', 'House', 'Ambient', 'Downtempo'], + users: [ + { email: 'test@example.com', password: 'testpassword123' }, + { email: 'admin@example.com', password: 'adminpassword123' }, + ], +}; + +async function setupTestData() { + console.log('๐Ÿš€ Setting up test data...'); + + try { + // Insert test genres + console.log('๐Ÿ“ Inserting test genres...'); + for (const genre of testData.genres) { + const { error } = await supabase + .from('genres') + .insert({ name: genre }); + + if (error && !error.message.includes('duplicate key')) { + console.error(`Error inserting genre ${genre}:`, error); + } + } + + // Insert test artists + console.log('๐ŸŽต Inserting test artists...'); + for (const artist of testData.artists) { + // First get the genre ID + const { data: genreData } = await supabase + .from('music_genres') + .select('id') + .eq('name', artist.genre) + .single(); + + if (genreData) { + const { error } = await supabase + .from('artists') + .insert({ + name: artist.name, + description: artist.description, + genre_id: genreData.id, + added_by: '00000000-0000-0000-0000-000000000000', // Placeholder UUID + }); + + if (error && !error.message.includes('duplicate key')) { + console.error(`Error inserting artist ${artist.name}:`, error); + } + } else { + console.warn(`Genre ${artist.genre} not found for artist ${artist.name}`); + } + } + + console.log('โœ… Test data setup completed!'); + console.log(''); + console.log('๐Ÿ“‹ Test Data Summary:'); + console.log(` Artists: ${testData.artists.length}`); + console.log(` Genres: ${testData.genres.length}`); + console.log(''); + console.log('๐Ÿงช Test Users:'); + testData.users.forEach(user => { + console.log(` Email: ${user.email}, Password: ${user.password}`); + }); + + } catch (error) { + console.error('โŒ Error setting up test data:', error); + process.exit(1); + } +} + +// Run the setup +setupTestData(); \ No newline at end of file diff --git a/scripts/setup-test-env.sh b/scripts/setup-test-env.sh new file mode 100755 index 00000000..9f1dcbc3 --- /dev/null +++ b/scripts/setup-test-env.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +# Setup script for local Supabase test environment + +echo "๐Ÿš€ Setting up local Supabase test environment..." + +# Check if Supabase CLI is installed +if ! command -v supabase &> /dev/null; then + echo "โŒ Supabase CLI not found. Please install it first:" + echo " npm install -g supabase" + exit 1 +fi + +# Start local Supabase +echo "๐Ÿ“ฆ Starting local Supabase..." +supabase start + +# Wait for Supabase to be ready +echo "โณ Waiting for Supabase to be ready..." +sleep 10 + +# Run migrations +echo "๐Ÿ”„ Running database migrations..." +supabase db reset + +# Get the local credentials +echo "๐Ÿ”‘ Getting local Supabase credentials..." +supabase status diff --git a/supabase/migrations/20250620065433-e1f45078-3943-49f0-ba19-8ffead5ea774.sql b/supabase/migrations/20250620065433_create_artists_table.sql similarity index 100% rename from supabase/migrations/20250620065433-e1f45078-3943-49f0-ba19-8ffead5ea774.sql rename to supabase/migrations/20250620065433_create_artists_table.sql diff --git a/supabase/migrations/20250620080928-4e724988-f7f5-49ea-9f51-e16c1d708d6c.sql b/supabase/migrations/20250620080928-4e724988-f7f5-49ea-9f51-e16c1d708d6c.sql deleted file mode 100644 index 5674d97a..00000000 --- a/supabase/migrations/20250620080928-4e724988-f7f5-49ea-9f51-e16c1d708d6c.sql +++ /dev/null @@ -1,52 +0,0 @@ - --- First, add the missing "Tribal/bass" genre (only if it doesn't exist) -INSERT INTO public.music_genres (name, created_by) -SELECT 'Tribal/bass', NULL -WHERE NOT EXISTS (SELECT 1 FROM public.music_genres WHERE name = 'Tribal/bass'); - --- Get the first available user ID from the profiles table for adding artists --- Now insert all the artists with proper genre mapping using the first available user -INSERT INTO public.artists (name, description, genre_id, added_by) VALUES --- Artists with Downtempo genre -('Merkaba', '', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), (SELECT id FROM public.profiles LIMIT 1)), -('Twofold', 'Up Downtempo. Maybe house? I have no idea', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), (SELECT id FROM public.profiles LIMIT 1)), -('Imanu', 'D&B', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), (SELECT id FROM public.profiles LIMIT 1)), -('Bayawaka', '', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), (SELECT id FROM public.profiles LIMIT 1)), -('SensoRythm', '', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), (SELECT id FROM public.profiles LIMIT 1)), -('Goopsteppa', '', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), (SELECT id FROM public.profiles LIMIT 1)), -('Drrtywulvz', '', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), (SELECT id FROM public.profiles LIMIT 1)), -('Kalya Scintilla', '', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), (SELECT id FROM public.profiles LIMIT 1)), - --- Artists with Techno genre -('Carbon', '', (SELECT id FROM public.music_genres WHERE name = 'Techno'), (SELECT id FROM public.profiles LIMIT 1)), -('Frida Darko', '', (SELECT id FROM public.music_genres WHERE name = 'Techno'), (SELECT id FROM public.profiles LIMIT 1)), -('Richie Hawtin', '', (SELECT id FROM public.music_genres WHERE name = 'Techno'), (SELECT id FROM public.profiles LIMIT 1)), - --- Artists with Trance genre -('Digicult', 'Can be aggressive', (SELECT id FROM public.music_genres WHERE name = 'Trance'), (SELECT id FROM public.profiles LIMIT 1)), -('Ace Ventura', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), (SELECT id FROM public.profiles LIMIT 1)), -('Astrix', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), (SELECT id FROM public.profiles LIMIT 1)), -('Atmos', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), (SELECT id FROM public.profiles LIMIT 1)), -('Tristan', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), (SELECT id FROM public.profiles LIMIT 1)), -('Tsuyoshi Suzuki', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), (SELECT id FROM public.profiles LIMIT 1)), -('John Fleming', 'I think a bit pop but fun', (SELECT id FROM public.music_genres WHERE name = 'Trance'), (SELECT id FROM public.profiles LIMIT 1)), -('Akari System', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), (SELECT id FROM public.profiles LIMIT 1)), -('Miles from Mars', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), (SELECT id FROM public.profiles LIMIT 1)), -('Neurolabz', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), (SELECT id FROM public.profiles LIMIT 1)), - --- Artists with Tribal/bass genre -('Tor', '', (SELECT id FROM public.music_genres WHERE name = 'Tribal/bass'), (SELECT id FROM public.profiles LIMIT 1)), -('Liquid Bloom', 'Can be chillout', (SELECT id FROM public.music_genres WHERE name = 'Tribal/bass'), (SELECT id FROM public.profiles LIMIT 1)), -('Nyrus', '', (SELECT id FROM public.music_genres WHERE name = 'Tribal/bass'), (SELECT id FROM public.profiles LIMIT 1)), - --- Artists with Psytrance genre (researched missing genres) -('Kliment', '', (SELECT id FROM public.music_genres WHERE name = 'Psytrance'), (SELECT id FROM public.profiles LIMIT 1)), -('Prometheus', '', (SELECT id FROM public.music_genres WHERE name = 'Psytrance'), (SELECT id FROM public.profiles LIMIT 1)), -('Atia', '', (SELECT id FROM public.music_genres WHERE name = 'Psytrance'), (SELECT id FROM public.profiles LIMIT 1)), -('Dnox and Becker', '', (SELECT id FROM public.music_genres WHERE name = 'Psytrance'), (SELECT id FROM public.profiles LIMIT 1)), -('Freedom Fighters', '', (SELECT id FROM public.music_genres WHERE name = 'Psytrance'), (SELECT id FROM public.profiles LIMIT 1)), -('Krumelur', '', (SELECT id FROM public.music_genres WHERE name = 'Psytrance'), (SELECT id FROM public.profiles LIMIT 1)), -('Ritmo', '', (SELECT id FROM public.music_genres WHERE name = 'Psytrance'), (SELECT id FROM public.profiles LIMIT 1)), - --- Artists with Progressive genre -('Boundless', '', (SELECT id FROM public.music_genres WHERE name = 'Progressive'), (SELECT id FROM public.profiles LIMIT 1)); diff --git a/supabase/migrations/20250620080928_seed_artists_data.sql b/supabase/migrations/20250620080928_seed_artists_data.sql new file mode 100644 index 00000000..16f821fa --- /dev/null +++ b/supabase/migrations/20250620080928_seed_artists_data.sql @@ -0,0 +1,73 @@ + +-- First, add the missing "Tribal/bass" genre (only if it doesn't exist) +INSERT INTO public.music_genres (name, created_by) +SELECT 'Tribal/bass', NULL +WHERE NOT EXISTS (SELECT 1 FROM public.music_genres WHERE name = 'Tribal/bass'); + +-- Create a system user in auth.users if no profiles exist +INSERT INTO auth.users (id, email, encrypted_password, email_confirmed_at, created_at, updated_at, raw_user_meta_data, is_super_admin, confirmation_token, recovery_token) +SELECT + '00000000-0000-0000-0000-000000000000'::uuid, + 'system@boom-voter.local', + crypt('system-password', gen_salt('bf')), + now(), + now(), + now(), + '{"username": "system"}'::jsonb, + false, + '', + '' +WHERE NOT EXISTS (SELECT 1 FROM public.profiles LIMIT 1); + +-- Create the corresponding profile for the system user +INSERT INTO public.profiles (id, username) +SELECT + '00000000-0000-0000-0000-000000000000'::uuid, + 'system' +WHERE NOT EXISTS (SELECT 1 FROM public.profiles LIMIT 1); + +-- Now insert all the artists with proper genre mapping using the system user +INSERT INTO public.artists (name, description, genre_id, added_by) VALUES +-- Artists with Downtempo genre +('Merkaba', '', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), '00000000-0000-0000-0000-000000000000'::uuid), +('Twofold', 'Up Downtempo. Maybe house? I have no idea', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), '00000000-0000-0000-0000-000000000000'::uuid), +('Imanu', 'D&B', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), '00000000-0000-0000-0000-000000000000'::uuid), +('Bayawaka', '', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), '00000000-0000-0000-0000-000000000000'::uuid), +('SensoRythm', '', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), '00000000-0000-0000-0000-000000000000'::uuid), +('Goopsteppa', '', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), '00000000-0000-0000-0000-000000000000'::uuid), +('Drrtywulvz', '', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), '00000000-0000-0000-0000-000000000000'::uuid), +('Kalya Scintilla', '', (SELECT id FROM public.music_genres WHERE name = 'Downtempo'), '00000000-0000-0000-0000-000000000000'::uuid), + +-- Artists with Techno genre +('Carbon', '', (SELECT id FROM public.music_genres WHERE name = 'Techno'), '00000000-0000-0000-0000-000000000000'::uuid), +('Frida Darko', '', (SELECT id FROM public.music_genres WHERE name = 'Techno'), '00000000-0000-0000-0000-000000000000'::uuid), +('Richie Hawtin', '', (SELECT id FROM public.music_genres WHERE name = 'Techno'), '00000000-0000-0000-0000-000000000000'::uuid), + +-- Artists with Trance genre +('Digicult', 'Can be aggressive', (SELECT id FROM public.music_genres WHERE name = 'Trance'), '00000000-0000-0000-0000-000000000000'::uuid), +('Ace Ventura', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), '00000000-0000-0000-0000-000000000000'::uuid), +('Astrix', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), '00000000-0000-0000-0000-000000000000'::uuid), +('Atmos', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), '00000000-0000-0000-0000-000000000000'::uuid), +('Tristan', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), '00000000-0000-0000-0000-000000000000'::uuid), +('Tsuyoshi Suzuki', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), '00000000-0000-0000-0000-000000000000'::uuid), +('John Fleming', 'I think a bit pop but fun', (SELECT id FROM public.music_genres WHERE name = 'Trance'), '00000000-0000-0000-0000-000000000000'::uuid), +('Akari System', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), '00000000-0000-0000-0000-000000000000'::uuid), +('Miles from Mars', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), '00000000-0000-0000-0000-000000000000'::uuid), +('Neurolabz', '', (SELECT id FROM public.music_genres WHERE name = 'Trance'), '00000000-0000-0000-0000-000000000000'::uuid), + +-- Artists with Tribal/bass genre +('Tor', '', (SELECT id FROM public.music_genres WHERE name = 'Tribal/bass'), '00000000-0000-0000-0000-000000000000'::uuid), +('Liquid Bloom', 'Can be chillout', (SELECT id FROM public.music_genres WHERE name = 'Tribal/bass'), '00000000-0000-0000-0000-000000000000'::uuid), +('Nyrus', '', (SELECT id FROM public.music_genres WHERE name = 'Tribal/bass'), '00000000-0000-0000-0000-000000000000'::uuid), + +-- Artists with Psytrance genre (researched missing genres) +('Kliment', '', (SELECT id FROM public.music_genres WHERE name = 'Psytrance'), '00000000-0000-0000-0000-000000000000'::uuid), +('Prometheus', '', (SELECT id FROM public.music_genres WHERE name = 'Psytrance'), '00000000-0000-0000-0000-000000000000'::uuid), +('Atia', '', (SELECT id FROM public.music_genres WHERE name = 'Psytrance'), '00000000-0000-0000-0000-000000000000'::uuid), +('Dnox and Becker', '', (SELECT id FROM public.music_genres WHERE name = 'Psytrance'), '00000000-0000-0000-0000-000000000000'::uuid), +('Freedom Fighters', '', (SELECT id FROM public.music_genres WHERE name = 'Psytrance'), '00000000-0000-0000-0000-000000000000'::uuid), +('Krumelur', '', (SELECT id FROM public.music_genres WHERE name = 'Psytrance'), '00000000-0000-0000-0000-000000000000'::uuid), +('Ritmo', '', (SELECT id FROM public.music_genres WHERE name = 'Psytrance'), '00000000-0000-0000-0000-000000000000'::uuid), + +-- Artists with Progressive genre +('Boundless', '', (SELECT id FROM public.music_genres WHERE name = 'Progressive'), '00000000-0000-0000-0000-000000000000'::uuid); diff --git a/supabase/migrations/20250620101328-8cc5335f-3fa0-4e5a-b4dd-e6817ef139ec.sql b/supabase/migrations/20250620101328_update_artists_data.sql similarity index 100% rename from supabase/migrations/20250620101328-8cc5335f-3fa0-4e5a-b4dd-e6817ef139ec.sql rename to supabase/migrations/20250620101328_update_artists_data.sql diff --git a/supabase/migrations/20250620104828-a53d52a1-01ce-486a-80a4-6e3eb7887ede.sql b/supabase/migrations/20250620104828_update_artists_data.sql similarity index 100% rename from supabase/migrations/20250620104828-a53d52a1-01ce-486a-80a4-6e3eb7887ede.sql rename to supabase/migrations/20250620104828_update_artists_data.sql diff --git a/supabase/migrations/20250620120553-85bb003f-0c5d-474e-bcd6-972e831d9f8c.sql b/supabase/migrations/20250620120553_migration.sql similarity index 100% rename from supabase/migrations/20250620120553-85bb003f-0c5d-474e-bcd6-972e831d9f8c.sql rename to supabase/migrations/20250620120553_migration.sql diff --git a/supabase/migrations/20250620121419-d69f0339-d3f5-4902-b17e-a66b005d4241.sql b/supabase/migrations/20250620121419_update_artists_data.sql similarity index 100% rename from supabase/migrations/20250620121419-d69f0339-d3f5-4902-b17e-a66b005d4241.sql rename to supabase/migrations/20250620121419_update_artists_data.sql diff --git a/supabase/migrations/20250620121752-63ca65fd-cc42-4a74-9cd9-2689c97f7da4.sql b/supabase/migrations/20250620121752_migration.sql similarity index 100% rename from supabase/migrations/20250620121752-63ca65fd-cc42-4a74-9cd9-2689c97f7da4.sql rename to supabase/migrations/20250620121752_migration.sql diff --git a/supabase/migrations/20250620124207-ce5e5d71-e73d-44c5-9b5b-4063e276c99d.sql b/supabase/migrations/20250620124207_create_rls_policies.sql similarity index 100% rename from supabase/migrations/20250620124207-ce5e5d71-e73d-44c5-9b5b-4063e276c99d.sql rename to supabase/migrations/20250620124207_create_rls_policies.sql diff --git a/supabase/migrations/20250620140128-121ae6c3-5683-4e3d-a493-514f58ae3eac.sql b/supabase/migrations/20250620140128_create_rls_policies.sql similarity index 100% rename from supabase/migrations/20250620140128-121ae6c3-5683-4e3d-a493-514f58ae3eac.sql rename to supabase/migrations/20250620140128_create_rls_policies.sql diff --git a/supabase/migrations/20250620144024-2d610f4f-9403-412c-b591-03ee0d42135f.sql b/supabase/migrations/20250620144024_migration.sql similarity index 100% rename from supabase/migrations/20250620144024-2d610f4f-9403-412c-b591-03ee0d42135f.sql rename to supabase/migrations/20250620144024_migration.sql diff --git a/supabase/migrations/20250620144942-2b4fdd7c-a5c2-4d3d-b775-f6747ad02898.sql b/supabase/migrations/20250620144942_migration.sql similarity index 100% rename from supabase/migrations/20250620144942-2b4fdd7c-a5c2-4d3d-b775-f6747ad02898.sql rename to supabase/migrations/20250620144942_migration.sql diff --git a/supabase/migrations/20250620150443-22890c5f-7261-46ee-8bbd-ea5d618a28e2.sql b/supabase/migrations/20250620150443_migration.sql similarity index 100% rename from supabase/migrations/20250620150443-22890c5f-7261-46ee-8bbd-ea5d618a28e2.sql rename to supabase/migrations/20250620150443_migration.sql diff --git a/supabase/migrations/20250620150938-ecfcf638-44d5-478e-96c9-12d10036b93b.sql b/supabase/migrations/20250620150938_migration.sql similarity index 100% rename from supabase/migrations/20250620150938-ecfcf638-44d5-478e-96c9-12d10036b93b.sql rename to supabase/migrations/20250620150938_migration.sql diff --git a/supabase/migrations/20250620152102-be540ea3-97fa-4d67-b6d6-4d785cb2a9ff.sql b/supabase/migrations/20250620152102_create_groups_table.sql similarity index 100% rename from supabase/migrations/20250620152102-be540ea3-97fa-4d67-b6d6-4d785cb2a9ff.sql rename to supabase/migrations/20250620152102_create_groups_table.sql diff --git a/supabase/migrations/20250621073509-db815051-e170-4580-af7d-a776b479597b.sql b/supabase/migrations/20250621073509_create_functions.sql similarity index 100% rename from supabase/migrations/20250621073509-db815051-e170-4580-af7d-a776b479597b.sql rename to supabase/migrations/20250621073509_create_functions.sql diff --git a/supabase/migrations/20250621073724-f8406649-493b-4e7e-8cde-c91d4d33e58d.sql b/supabase/migrations/20250621073724_create_rls_policies.sql similarity index 100% rename from supabase/migrations/20250621073724-f8406649-493b-4e7e-8cde-c91d4d33e58d.sql rename to supabase/migrations/20250621073724_create_rls_policies.sql diff --git a/supabase/migrations/20250621074013-e2672162-160e-471c-a4a5-a5575f98d0f4.sql b/supabase/migrations/20250621074013_add_columns.sql similarity index 100% rename from supabase/migrations/20250621074013-e2672162-160e-471c-a4a5-a5575f98d0f4.sql rename to supabase/migrations/20250621074013_add_columns.sql diff --git a/supabase/migrations/20250621090428-e766e82c-d0b4-4e52-85b3-30e90d50cde1.sql b/supabase/migrations/20250621090428_create_functions.sql similarity index 100% rename from supabase/migrations/20250621090428-e766e82c-d0b4-4e52-85b3-30e90d50cde1.sql rename to supabase/migrations/20250621090428_create_functions.sql diff --git a/supabase/migrations/20250621090745-debae17c-3d32-496f-a0b9-f040e9e0df88.sql b/supabase/migrations/20250621090745_create_rls_policies.sql similarity index 100% rename from supabase/migrations/20250621090745-debae17c-3d32-496f-a0b9-f040e9e0df88.sql rename to supabase/migrations/20250621090745_create_rls_policies.sql diff --git a/supabase/migrations/20250621102522-02c403c3-d223-48ab-b999-a53dc74e0974.sql b/supabase/migrations/20250621102522_create_functions.sql similarity index 100% rename from supabase/migrations/20250621102522-02c403c3-d223-48ab-b999-a53dc74e0974.sql rename to supabase/migrations/20250621102522_create_functions.sql diff --git a/supabase/migrations/20250621123057-c3f84bbb-201e-4627-b0e7-3724d79febbf.sql b/supabase/migrations/20250621123057_create_rls_policies.sql similarity index 100% rename from supabase/migrations/20250621123057-c3f84bbb-201e-4627-b0e7-3724d79febbf.sql rename to supabase/migrations/20250621123057_create_rls_policies.sql diff --git a/supabase/migrations/20250621125212-4eec42a8-7f25-48b5-90e2-eaffe2b82a0b.sql b/supabase/migrations/20250621125212_create_functions.sql similarity index 100% rename from supabase/migrations/20250621125212-4eec42a8-7f25-48b5-90e2-eaffe2b82a0b.sql rename to supabase/migrations/20250621125212_create_functions.sql diff --git a/supabase/migrations/20250622081538-e032edff-06a4-4b8a-9c2d-138ee95afb9f.sql b/supabase/migrations/20250622081538_update_artists_data.sql similarity index 100% rename from supabase/migrations/20250622081538-e032edff-06a4-4b8a-9c2d-138ee95afb9f.sql rename to supabase/migrations/20250622081538_update_artists_data.sql diff --git a/supabase/migrations/20250622090351-886b099e-d041-4e57-b977-d6747d5a90ae.sql b/supabase/migrations/20250622090351_migration.sql similarity index 100% rename from supabase/migrations/20250622090351-886b099e-d041-4e57-b977-d6747d5a90ae.sql rename to supabase/migrations/20250622090351_migration.sql diff --git a/supabase/migrations/20250623102838-6a39f191-b0fd-4e1c-bca0-3a444cd32e8b.sql b/supabase/migrations/20250623102838_migration.sql similarity index 100% rename from supabase/migrations/20250623102838-6a39f191-b0fd-4e1c-bca0-3a444cd32e8b.sql rename to supabase/migrations/20250623102838_migration.sql diff --git a/supabase/migrations/20250702170434-77406ce2-1f37-43a7-bafc-ab1035dc58b6.sql b/supabase/migrations/20250702170434_create_functions.sql similarity index 100% rename from supabase/migrations/20250702170434-77406ce2-1f37-43a7-bafc-ab1035dc58b6.sql rename to supabase/migrations/20250702170434_create_functions.sql diff --git a/supabase/migrations/20250702171021-960893c6-99c3-4282-8f78-50220e431b85.sql b/supabase/migrations/20250702171021_add_columns.sql similarity index 100% rename from supabase/migrations/20250702171021-960893c6-99c3-4282-8f78-50220e431b85.sql rename to supabase/migrations/20250702171021_add_columns.sql diff --git a/supabase/migrations/20250709094304-82d62de8-95be-4eb3-b4f7-d26b47e72697.sql b/supabase/migrations/20250709094304_create_admin_roles_table.sql similarity index 100% rename from supabase/migrations/20250709094304-82d62de8-95be-4eb3-b4f7-d26b47e72697.sql rename to supabase/migrations/20250709094304_create_admin_roles_table.sql diff --git a/supabase/migrations/20250709105808-4f5c63f1-5579-4b44-ab86-73483ed13626.sql b/supabase/migrations/20250709105808_create_functions.sql similarity index 100% rename from supabase/migrations/20250709105808-4f5c63f1-5579-4b44-ab86-73483ed13626.sql rename to supabase/migrations/20250709105808_create_functions.sql diff --git a/supabase/migrations/20250709114513-4feafdd7-2114-4e8d-8f60-3c43e89b6acc.sql b/supabase/migrations/20250709114513_create_functions.sql similarity index 100% rename from supabase/migrations/20250709114513-4feafdd7-2114-4e8d-8f60-3c43e89b6acc.sql rename to supabase/migrations/20250709114513_create_functions.sql diff --git a/tests/README.md b/tests/README.md new file mode 100644 index 00000000..8616a058 --- /dev/null +++ b/tests/README.md @@ -0,0 +1,227 @@ +# E2E Testing with Playwright + +This directory contains end-to-end tests for the Boom Voter application using Playwright. + +## ๐Ÿš€ Quick Start + +### Prerequisites + +1. **Node.js 18+** installed +2. **Supabase CLI** installed globally: + ```bash + npm install -g supabase + ``` + +### Setup + +1. **Install dependencies:** + ```bash + npm install + ``` + +2. **Setup local Supabase test environment:** + ```bash + npm run test:setup + ``` + +3. **Setup test data:** + ```bash + npm run test:data + ``` + +4. **Run tests:** + ```bash + npm run test:e2e + ``` + +## ๐Ÿ“ Directory Structure + +``` +tests/ +โ”œโ”€โ”€ e2e/ # E2E test files +โ”‚ โ”œโ”€โ”€ auth.spec.ts # Authentication tests +โ”‚ โ”œโ”€โ”€ navigation.spec.ts # Navigation tests +โ”‚ โ””โ”€โ”€ artists.spec.ts # Artist functionality tests +โ”œโ”€โ”€ config/ +โ”‚ โ””โ”€โ”€ test-env.ts # Test environment configuration +โ”œโ”€โ”€ utils/ +โ”‚ โ””โ”€โ”€ test-helpers.ts # Common test utilities +โ””โ”€โ”€ README.md # This file +``` + +## ๐Ÿงช Available Test Commands + +| Command | Description | +|---------|-------------| +| `npm run test:e2e` | Run all tests in headless mode | +| `npm run test:e2e:ui` | Run tests with Playwright UI | +| `npm run test:e2e:headed` | Run tests in headed mode (visible browser) | +| `npm run test:e2e:debug` | Run tests in debug mode | +| `npm run test:e2e:report` | Open test report | +| `npm run test:setup` | Setup local Supabase environment | +| `npm run test:data` | Setup test data in local Supabase | + +## ๐Ÿ”ง Configuration + +### Environment Variables + +The tests use the following environment variables: + +- `TEST_SUPABASE_URL`: Local Supabase URL (default: `http://localhost:54321`) +- `TEST_SUPABASE_ANON_KEY`: Local Supabase anon key +- `PLAYWRIGHT_BASE_URL`: App base URL (default: `http://localhost:5173`) +- `TEST_USER_EMAIL`: Test user email (default: `test@example.com`) +- `TEST_USER_PASSWORD`: Test user password (default: `testpassword123`) + +### Test Data + +The test data setup script creates: + +- **Artists**: 3 test artists with different genres and schedules +- **Genres**: 5 test genres (Rock, Pop, Jazz, Electronic, Hip Hop) +- **Groups**: 3 test groups +- **Users**: 2 test users (regular user and admin) + +## ๐ŸŽฏ Writing Tests + +### Basic Test Structure + +```typescript +import { test, expect } from '@playwright/test'; +import { TestHelpers } from '../utils/test-helpers'; + +test.describe('Feature Name', () => { + let testHelpers: TestHelpers; + + test.beforeEach(async ({ page }) => { + testHelpers = new TestHelpers(page); + }); + + test('should do something', async ({ page }) => { + await testHelpers.navigateTo('/'); + // Your test logic here + }); +}); +``` + +### Using Test Helpers + +The `TestHelpers` class provides common utilities: + +```typescript +// Sign in +await testHelpers.signIn('user@example.com', 'password'); + +// Navigate to page +await testHelpers.navigateTo('/artists'); + +// Wait for page load +await testHelpers.waitForPageLoad(); + +// Check authentication status +const isAuth = await testHelpers.isAuthenticated(); + +// Take screenshot +await testHelpers.takeScreenshot('test-name'); +``` + +### Best Practices + +1. **Use semantic selectors**: Prefer `getByRole`, `getByLabel`, `getByText` over CSS selectors +2. **Handle async operations**: Always wait for network requests and UI updates +3. **Test user flows**: Focus on complete user journeys rather than isolated components +4. **Use test data**: Leverage the test data setup for consistent scenarios +5. **Handle conditional elements**: Use `.isVisible()` checks for optional UI elements + +## ๐Ÿ› Debugging + +### Debug Mode + +Run tests in debug mode to step through them: + +```bash +npm run test:e2e:debug +``` + +### UI Mode + +Use Playwright's UI for interactive debugging: + +```bash +npm run test:e2e:ui +``` + +### Screenshots and Videos + +Tests automatically capture: +- Screenshots on failure +- Videos on failure +- Traces on retry + +View them in the `playwright-report/` directory after running tests. + +## ๐Ÿ”„ CI/CD Integration + +The tests are configured to run in GitHub Actions on: +- Push to `main` and `develop` branches +- Pull requests to `main` and `develop` branches + +The CI pipeline: +1. Sets up local Supabase +2. Populates test data +3. Runs tests in parallel (sharded) +4. Generates and uploads test reports + +## ๐Ÿ—„๏ธ Local Supabase + +### Starting Local Supabase + +```bash +supabase start +``` + +### Stopping Local Supabase + +```bash +supabase stop +``` + +### Accessing Local Supabase + +- **API URL**: http://localhost:54321 +- **Studio URL**: http://localhost:54323 +- **Anon Key**: `eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0` + +### Database Schema + +The local Supabase instance uses the same schema as your production database, defined in `supabase/migrations/`. + +## ๐Ÿ“Š Test Reports + +After running tests, view the HTML report: + +```bash +npm run test:e2e:report +``` + +The report includes: +- Test results and timing +- Screenshots and videos +- Traces for debugging +- Error details and stack traces + +## ๐Ÿšจ Troubleshooting + +### Common Issues + +1. **Supabase not starting**: Ensure Docker is running +2. **Tests timing out**: Increase timeouts in `playwright.config.ts` +3. **Element not found**: Check if selectors match the current UI +4. **Authentication failing**: Verify test user credentials in Supabase + +### Getting Help + +1. Check the Playwright documentation: https://playwright.dev/ +2. Review test logs and screenshots +3. Use debug mode to step through failing tests +4. Check Supabase logs: `supabase logs` \ No newline at end of file diff --git a/tests/config/test-env.ts b/tests/config/test-env.ts new file mode 100644 index 00000000..798379e4 --- /dev/null +++ b/tests/config/test-env.ts @@ -0,0 +1,28 @@ +// Test environment configuration +export const TEST_CONFIG = { + // Local Supabase test instance + SUPABASE_URL: process.env.TEST_SUPABASE_URL || 'http://localhost:54321', + SUPABASE_ANON_KEY: process.env.TEST_SUPABASE_ANON_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0', + + // Test user credentials + TEST_USER_EMAIL: process.env.TEST_USER_EMAIL || 'test@example.com', + TEST_USER_PASSWORD: process.env.TEST_USER_PASSWORD || 'testpassword123', + + // App configuration + BASE_URL: process.env.PLAYWRIGHT_BASE_URL || 'http://localhost:5173', + + // Test data + TEST_ARTIST_NAME: 'Test Artist', + TEST_GENRE_NAME: 'Test Genre', + TEST_GROUP_NAME: 'Test Group', +}; + +// Test data setup helpers +export const TEST_DATA = { + artists: [ + { name: 'Test Artist 1', genre: 'Rock' }, + { name: 'Test Artist 2', genre: 'Pop' }, + { name: 'Test Artist 3', genre: 'Jazz' }, + ], + genres: ['Electronic', 'Psytrance', 'Techno', 'House', 'Ambient', 'Downtempo'], +}; \ No newline at end of file diff --git a/tests/e2e/artists.spec.ts b/tests/e2e/artists.spec.ts new file mode 100644 index 00000000..e854564f --- /dev/null +++ b/tests/e2e/artists.spec.ts @@ -0,0 +1,90 @@ +import { test, expect } from '@playwright/test'; +import { TestHelpers } from '../utils/test-helpers'; +import { TEST_DATA } from '../config/test-env'; + +test.describe('Artists', () => { + let testHelpers: TestHelpers; + + test.beforeEach(async ({ page }) => { + testHelpers = new TestHelpers(page); + }); + + test('should display artists list', async ({ page }) => { + await testHelpers.navigateTo('/'); + + // Look for artists content + const artistsContent = page.getByText(/artists/i).or( + page.locator('[data-testid="artists-list"]') + ).or( + page.locator('.artists-panel') + ); + + // If artists are loaded, they should be visible + if (await artistsContent.isVisible()) { + await expect(artistsContent).toBeVisible(); + } + }); + + test('should filter artists', async ({ page }) => { + await testHelpers.navigateTo('/'); + + // Look for filter controls + const filterInput = page.getByPlaceholder(/search/i).or( + page.getByLabel(/search/i) + ); + + if (await filterInput.isVisible()) { + await filterInput.fill('test'); + await testHelpers.waitForPageLoad(); + + // Should show filtered results + const results = page.locator('[data-testid="artist-item"]').or( + page.locator('.artist-card') + ); + + if (await results.count() > 0) { + await expect(results.first()).toBeVisible(); + } + } + }); + + test('should navigate to artist detail page', async ({ page }) => { + await testHelpers.navigateTo('/'); + + // Look for artist cards/items + const artistCard = page.locator('[data-testid="artist-card"]').or( + page.locator('.artist-card') + ).or( + page.getByRole('link').first() + ); + + if (await artistCard.isVisible()) { + const artistName = await artistCard.textContent(); + await artistCard.click(); + + // Should navigate to artist detail page + await expect(page).toHaveURL(/\/artist\//); + + // Should show artist name in detail page + if (artistName) { + await expect(page.getByText(artistName.trim())).toBeVisible(); + } + } + }); + + test('should handle empty artists state', async ({ page }) => { + await testHelpers.navigateTo('/'); + + // Look for empty state message + const emptyState = page.getByText(/no artists/i).or( + page.getByText(/empty/i) + ).or( + page.locator('[data-testid="empty-state"]') + ); + + // If no artists are loaded, should show empty state + if (await emptyState.isVisible()) { + await expect(emptyState).toBeVisible(); + } + }); +}); \ No newline at end of file diff --git a/tests/e2e/auth.spec.ts b/tests/e2e/auth.spec.ts new file mode 100644 index 00000000..bf3ea42f --- /dev/null +++ b/tests/e2e/auth.spec.ts @@ -0,0 +1,26 @@ +import { test, expect } from '@playwright/test'; + +test.describe('Authentication', () => { + test('should show login dialog when clicking sign in', async ({ page }) => { + await page.goto('/'); + + // Look for a sign in button or link + const signInButton = page.getByRole('button', { name: /sign in/i }).or( + page.getByRole('link', { name: /sign in/i }) + ).or( + page.getByText(/sign in/i) + ); + + await expect(signInButton).toBeVisible(); + await signInButton.click(); + + // Should show auth dialog + const authDialog = page.getByRole('dialog'); + await expect(authDialog).toBeVisible(); + }); + + test('should have proper page title', async ({ page }) => { + await page.goto('/'); + await expect(page).toHaveTitle(/boom voter/i); + }); +}); \ No newline at end of file diff --git a/tests/e2e/navigation.spec.ts b/tests/e2e/navigation.spec.ts new file mode 100644 index 00000000..77b504ab --- /dev/null +++ b/tests/e2e/navigation.spec.ts @@ -0,0 +1,38 @@ +import { test, expect } from '@playwright/test'; + +test.describe('Navigation', () => { + test('should navigate to different pages', async ({ page }) => { + await page.goto('/'); + + // Test navigation to different pages if they exist + const navigationLinks = [ + { name: /artists/i, path: '/' }, + { name: /schedule/i, path: '/schedule' }, + { name: /groups/i, path: '/groups' }, + ]; + + for (const link of navigationLinks) { + const navLink = page.getByRole('link', { name: link.name }).or( + page.getByRole('button', { name: link.name }) + ); + + if (await navLink.isVisible()) { + await navLink.click(); + await expect(page).toHaveURL(new RegExp(link.path)); + } + } + }); + + test('should handle 404 page', async ({ page }) => { + await page.goto('/non-existent-page'); + + // Should show 404 or error page + const errorContent = page.getByText(/not found/i).or( + page.getByText(/404/i) + ).or( + page.getByText(/page not found/i) + ); + + await expect(errorContent).toBeVisible(); + }); +}); \ No newline at end of file diff --git a/tests/utils/test-helpers.ts b/tests/utils/test-helpers.ts new file mode 100644 index 00000000..03d98e2c --- /dev/null +++ b/tests/utils/test-helpers.ts @@ -0,0 +1,107 @@ +import { Page, expect } from '@playwright/test'; +import { TEST_CONFIG } from '../config/test-env'; + +export class TestHelpers { + constructor(private page: Page) {} + + /** + * Sign in with test credentials + */ + async signIn(email = TEST_CONFIG.TEST_USER_EMAIL, password = TEST_CONFIG.TEST_USER_PASSWORD) { + await this.page.goto('/'); + + // Click sign in button + const signInButton = this.page.getByRole('button', { name: /sign in/i }).or( + this.page.getByRole('link', { name: /sign in/i }) + ).or( + this.page.getByText(/sign in/i) + ); + + await signInButton.click(); + + // Wait for auth dialog + const authDialog = this.page.getByRole('dialog'); + await expect(authDialog).toBeVisible(); + + // Fill in credentials + const emailInput = this.page.getByLabel(/email/i).or(this.page.getByPlaceholder(/email/i)); + const passwordInput = this.page.getByLabel(/password/i).or(this.page.getByPlaceholder(/password/i)); + + await emailInput.fill(email); + await passwordInput.fill(password); + + // Submit form + const submitButton = this.page.getByRole('button', { name: /sign in/i }).or( + this.page.getByRole('button', { name: /login/i }) + ); + + await submitButton.click(); + + // Wait for successful sign in (user menu or avatar should appear) + await expect(this.page.getByRole('button', { name: /user/i }).or( + this.page.locator('[data-testid="user-avatar"]') + )).toBeVisible({ timeout: 10000 }); + } + + /** + * Sign out + */ + async signOut() { + const userMenu = this.page.getByRole('button', { name: /user/i }).or( + this.page.locator('[data-testid="user-avatar"]') + ); + + if (await userMenu.isVisible()) { + await userMenu.click(); + + const signOutButton = this.page.getByRole('button', { name: /sign out/i }).or( + this.page.getByText(/sign out/i) + ); + + await signOutButton.click(); + + // Wait for sign out to complete + await expect(this.page.getByRole('button', { name: /sign in/i })).toBeVisible(); + } + } + + /** + * Wait for page to be fully loaded + */ + async waitForPageLoad() { + await this.page.waitForLoadState('networkidle'); + } + + /** + * Check if user is authenticated + */ + async isAuthenticated(): Promise { + const userMenu = this.page.getByRole('button', { name: /user/i }).or( + this.page.locator('[data-testid="user-avatar"]') + ); + + return await userMenu.isVisible(); + } + + /** + * Navigate to a specific page + */ + async navigateTo(path: string) { + await this.page.goto(path); + await this.waitForPageLoad(); + } + + /** + * Wait for a specific element to be visible + */ + async waitForElement(selector: string, timeout = 5000) { + await this.page.waitForSelector(selector, { timeout }); + } + + /** + * Take a screenshot for debugging + */ + async takeScreenshot(name: string) { + await this.page.screenshot({ path: `tests/screenshots/${name}.png` }); + } +} \ No newline at end of file From 8acd7b0db972fcbfafa7f5154131f424c133e232 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Fri, 11 Jul 2025 21:24:34 +0100 Subject: [PATCH 02/28] remove setup data --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 9325f534..1c656fe9 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,7 @@ "test:e2e:debug": "playwright test --debug", "test:e2e:report": "playwright show-report", "test:setup": "bash scripts/setup-test-env.sh", - "test:setup:full": "bash scripts/setup-local-supabase.sh", - "test:data": "tsx scripts/setup-test-data.ts" + "test:setup:full": "bash scripts/setup-local-supabase.sh" }, "dependencies": { "@hookform/resolvers": "^3.9.0", From 758eb1f8921140f1018cd26d734b8358ddbba0bf Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Sat, 26 Jul 2025 19:13:22 +0100 Subject: [PATCH 03/28] fix running tests --- playwright.config.ts | 4 +- src/components/Index/ArtistsPanel.tsx | 11 +-- ...=> 20250713203107_create_rls_policies.sql} | 0 tests/e2e/artists.spec.ts | 92 +++++++++---------- 4 files changed, 49 insertions(+), 58 deletions(-) rename supabase/migrations/{20250713203107-58e24b4b-71a7-4c8d-842b-b1bdf0e68b3e.sql => 20250713203107_create_rls_policies.sql} (100%) diff --git a/playwright.config.ts b/playwright.config.ts index 29f9ebc7..ec55565a 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -18,7 +18,7 @@ export default defineConfig({ /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */ use: { /* Base URL to use in actions like `await page.goto('/')`. */ - baseURL: process.env.PLAYWRIGHT_BASE_URL || 'http://localhost:5173', + baseURL: process.env.PLAYWRIGHT_BASE_URL || 'http://localhost:8080', /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */ trace: 'on-first-retry', @@ -71,7 +71,7 @@ export default defineConfig({ /* Run your local dev server before starting the tests */ webServer: { command: 'npm run dev', - url: 'http://localhost:5173', + url: 'http://localhost:8080', reuseExistingServer: !process.env.CI, timeout: 120 * 1000, }, diff --git a/src/components/Index/ArtistsPanel.tsx b/src/components/Index/ArtistsPanel.tsx index 9e0032fa..17a0722b 100644 --- a/src/components/Index/ArtistsPanel.tsx +++ b/src/components/Index/ArtistsPanel.tsx @@ -1,9 +1,7 @@ import { User } from "@supabase/supabase-js"; -import { useOfflineArtistData } from "@/hooks/useOfflineArtistData"; import { useOfflineVoting } from "@/hooks/useOfflineVoting"; import { Artist } from "@/services/queries"; -import { FilterSortState } from "@/hooks/useUrlState"; import { ArtistCard } from "./ArtistCard"; import { ArtistListItem } from "./ArtistListItem"; @@ -15,8 +13,7 @@ export function ArtistsPanel({ user, use24Hour, openAuthDialog, - fetchArtists, - archiveArtist, + onLockSort, }: { items: Array; @@ -24,8 +21,6 @@ export function ArtistsPanel({ user: User; use24Hour: boolean; openAuthDialog(): void; - fetchArtists(): void; - archiveArtist(artistId: string): Promise; onLockSort: () => void; }) { const handleVoteWithLock = async (artistId: string, voteType: number) => { @@ -47,7 +42,7 @@ export function ArtistsPanel({ if (isGrid) { return ( -
+
{items.map((artist) => ( +
{items.map((artist) => ( { +test.describe("Artists", () => { let testHelpers: TestHelpers; test.beforeEach(async ({ page }) => { testHelpers = new TestHelpers(page); }); - test('should display artists list', async ({ page }) => { - await testHelpers.navigateTo('/'); - + test("should display artists list", async ({ page }) => { + await testHelpers.navigateTo("/"); + // Look for artists content - const artistsContent = page.getByText(/artists/i).or( - page.locator('[data-testid="artists-list"]') - ).or( - page.locator('.artists-panel') - ); - + const artistsContent = page + .locator('[data-testid="artists-list"]') + .or(page.locator('[data-testid="artists-grid"]')); + // If artists are loaded, they should be visible if (await artistsContent.isVisible()) { await expect(artistsContent).toBeVisible(); } }); - test('should filter artists', async ({ page }) => { - await testHelpers.navigateTo('/'); - + test("should filter artists", async ({ page }) => { + await testHelpers.navigateTo("/"); + // Look for filter controls - const filterInput = page.getByPlaceholder(/search/i).or( - page.getByLabel(/search/i) - ); - + const filterInput = page + .getByPlaceholder(/search/i) + .or(page.getByLabel(/search/i)); + if (await filterInput.isVisible()) { - await filterInput.fill('test'); + await filterInput.fill("test"); await testHelpers.waitForPageLoad(); - + // Should show filtered results - const results = page.locator('[data-testid="artist-item"]').or( - page.locator('.artist-card') - ); - - if (await results.count() > 0) { + const results = page + .locator('[data-testid="artist-item"]') + .or(page.locator(".artist-card")); + + if ((await results.count()) > 0) { await expect(results.first()).toBeVisible(); } } }); - test('should navigate to artist detail page', async ({ page }) => { - await testHelpers.navigateTo('/'); - + test("should navigate to artist detail page", async ({ page }) => { + await testHelpers.navigateTo("/"); + // Look for artist cards/items - const artistCard = page.locator('[data-testid="artist-card"]').or( - page.locator('.artist-card') - ).or( - page.getByRole('link').first() - ); - + const artistCard = page + .locator('[data-testid="artist-card"]') + .or(page.locator(".artist-card")) + .or(page.getByRole("link").first()); + if (await artistCard.isVisible()) { const artistName = await artistCard.textContent(); await artistCard.click(); - + // Should navigate to artist detail page await expect(page).toHaveURL(/\/artist\//); - + // Should show artist name in detail page if (artistName) { await expect(page.getByText(artistName.trim())).toBeVisible(); @@ -72,19 +69,18 @@ test.describe('Artists', () => { } }); - test('should handle empty artists state', async ({ page }) => { - await testHelpers.navigateTo('/'); - + test("should handle empty artists state", async ({ page }) => { + await testHelpers.navigateTo("/"); + // Look for empty state message - const emptyState = page.getByText(/no artists/i).or( - page.getByText(/empty/i) - ).or( - page.locator('[data-testid="empty-state"]') - ); - + const emptyState = page + .getByText(/no artists/i) + .or(page.getByText(/empty/i)) + .or(page.locator('[data-testid="empty-state"]')); + // If no artists are loaded, should show empty state if (await emptyState.isVisible()) { await expect(emptyState).toBeVisible(); } }); -}); \ No newline at end of file +}); From d21a2556168040efc42b1301af8c16d9537b2f11 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Sat, 26 Jul 2025 19:28:18 +0100 Subject: [PATCH 04/28] fix issues with tests --- .../Index/filters/FilterSortControls.tsx | 10 +- src/components/Index/filters/SortControls.tsx | 115 +++++---- src/components/Index/useArtistFiltering.ts | 68 +----- .../schedule/ScheduleTimelineView.tsx | 224 ------------------ src/hooks/useAuth.ts | 8 +- src/pages/Index.tsx | 25 +- 6 files changed, 86 insertions(+), 364 deletions(-) delete mode 100644 src/components/schedule/ScheduleTimelineView.tsx diff --git a/src/components/Index/filters/FilterSortControls.tsx b/src/components/Index/filters/FilterSortControls.tsx index fe6b20ef..715ba6cc 100644 --- a/src/components/Index/filters/FilterSortControls.tsx +++ b/src/components/Index/filters/FilterSortControls.tsx @@ -76,7 +76,7 @@ export const FilterSortControls = ({ } > - Artists + Artists
@@ -109,7 +109,7 @@ export const FilterSortControls = ({ className="text-orange-300 border-orange-400/50 hover:bg-orange-400/20 hover:text-orange-200 flex items-center gap-2" > - Refresh + Refresh )} @@ -126,7 +126,7 @@ export const FilterSortControls = ({ }`} > - {groupDisplayText} + {groupDisplayText} @@ -168,7 +168,7 @@ export const FilterSortControls = ({ }`} > - Filters + Filters {hasActiveFilters && ( { - - - - - - - -
-

Sort Options Explained

- -
-
- -
- Name (A-Z): -

Sort artists alphabetically from A to Z

-
-
- -
- -
- Name (Z-A): -

Sort artists alphabetically from Z to A

-
-
- -
- -
- Highest Rated: -

Sort by weighted average rating based on votes (Must go = 2 points, Interested = 1 point, Won't go = -1 point)

-
-
- -
- -
- Most Popular: -

Sort by weighted popularity score (Must go = 2 points, Interested = 1 point)

-
-
- -
- -
- By Date: -

Sort by estimated performance date (earliest performances first)

-
-
+ + + + + +
+

Sort Options Explained

+ +
+
+ +
+ Name (A-Z): +

Sort artists alphabetically from A to Z

- - - - -

Click for sorting help

- - + +
+ +
+ Name (Z-A): +

Sort artists alphabetically from Z to A

+
+
+ +
+ +
+ Highest Rated: +

Sort by weighted average rating based on votes (Must go = 2 points, Interested = 1 point, Won't go = -1 point)

+
+
+ +
+ +
+ Most Popular: +

Sort by weighted popularity score (Must go = 2 points, Interested = 1 point)

+
+
+ +
+ +
+ By Date: +

Sort by estimated performance date (earliest performances first)

+
+
+
+
+ +
); }; diff --git a/src/components/Index/useArtistFiltering.ts b/src/components/Index/useArtistFiltering.ts index 24d7105f..ff54333e 100644 --- a/src/components/Index/useArtistFiltering.ts +++ b/src/components/Index/useArtistFiltering.ts @@ -1,9 +1,8 @@ -import { useEffect, useState, useMemo } from "react"; +import { useEffect, useState, useMemo, useCallback } from "react"; import { supabase } from "@/integrations/supabase/client"; import type { Artist } from "@/hooks/useOfflineArtistData"; import type { FilterSortState } from "../../hooks/useUrlState"; -import { STAGES } from "./filters/constants"; export const useArtistFiltering = (artists: Artist[], filterSortState?: FilterSortState) => { const [groupMemberIds, setGroupMemberIds] = useState([]); @@ -133,66 +132,23 @@ export const useArtistFiltering = (artists: Artist[], filterSortState?: FilterSo } return filtered; - }, [artists, filterSortState, groupMemberIds]); + }, [artists, filterSortState, groupMemberIds, lockedOrder]); - // Manage locked order snapshot separately to avoid circular dependency + // Update locked order when sort is unlocked useEffect(() => { if (!filterSortState?.sortLocked) { - // When sort is not locked, update the locked order with current results - const filtered = artists.map(artist => { - let filteredVotes = artist.votes; - if (filterSortState?.groupId && groupMemberIds.length > 0) { - filteredVotes = artist.votes.filter(vote => groupMemberIds.includes(vote.user_id)); - } - return { ...artist, votes: filteredVotes }; - }).filter(artist => { - if (filterSortState?.stages.length > 0 && artist.stage) { - if (!filterSortState.stages.includes(artist.stage)) return false; - } - if (filterSortState?.genres.length > 0 && artist.music_genres) { - if (!filterSortState.genres.includes(artist.genre_id)) return false; - } - if (filterSortState?.minRating > 0) { - const rating = calculateRating(artist); - if (rating < filterSortState.minRating) return false; - } - return true; - }); - - // Apply sorting - filtered.sort((a, b) => { - let primarySort = 0; - switch (filterSortState?.sort) { - case 'name-asc': - return a.name.localeCompare(b.name); - case 'name-desc': - return b.name.localeCompare(a.name); - case 'rating-desc': - primarySort = calculateRating(b) - calculateRating(a); - break; - case 'popularity-desc': - primarySort = getWeightedPopularityScore(b) - getWeightedPopularityScore(a); - break; - case 'date-asc': - if (!a.time_start && !b.time_start) { - primarySort = 0; - break; - } - if (!a.time_start) return 1; - if (!b.time_start) return -1; - primarySort = new Date(a.time_start).getTime() - new Date(b.time_start).getTime(); - break; - default: - primarySort = 0; - } - return primarySort !== 0 ? primarySort : a.name.localeCompare(b.name); - }); - - setLockedOrder(filtered); + setLockedOrder([]); } - }, [artists, filterSortState, groupMemberIds]); + }, [filterSortState?.sortLocked]); + + // Function to lock the current order and update URL state + const lockCurrentOrder = useCallback((updateUrlState: (state: Partial) => void) => { + setLockedOrder([...filteredAndSortedArtists]); + updateUrlState({ sortLocked: true }); + }, [filteredAndSortedArtists]); return { filteredAndSortedArtists, + lockCurrentOrder, }; }; diff --git a/src/components/schedule/ScheduleTimelineView.tsx b/src/components/schedule/ScheduleTimelineView.tsx deleted file mode 100644 index b7b9ba19..00000000 --- a/src/components/schedule/ScheduleTimelineView.tsx +++ /dev/null @@ -1,224 +0,0 @@ -import { useEffect, useRef, useState, useCallback } from "react"; -import { ArtistScheduleBlock } from "./ArtistScheduleBlock"; -import { DayDivider } from "./DayDivider"; -import { FloatingDateIndicator } from "./FloatingDateIndicator"; -import { TimelineProgress } from "./TimelineProgress"; -import { DateNavigation } from "./DateNavigation"; -import { useStreamingTimeline } from "@/hooks/useStreamingTimeline"; -import { useScheduleData } from "@/hooks/useScheduleData"; -import { format } from "date-fns"; -import ErrorBoundary from "../ErrorBoundary"; - -interface ScheduleTimelineViewProps { - userVotes: Record; - onVote: (artistId: string, voteType: number) => void; -} - -export const ScheduleTimelineView = ({ userVotes, onVote }: ScheduleTimelineViewProps) => { - const { streamingItems, totalArtists, loading, error } = useStreamingTimeline(); - const { scheduleDays } = useScheduleData(); - const containerRef = useRef(null); - const observerRef = useRef(null); - const [currentDateIndex, setCurrentDateIndex] = useState(0); - const [showFloatingDate, setShowFloatingDate] = useState(false); - const [visibleItemIndex, setVisibleItemIndex] = useState(0); - - // Enhanced Intersection Observer with proper cleanup - useEffect(() => { - const container = containerRef.current; - if (!container || !streamingItems || streamingItems.length === 0) { - - return; - } - - // Clean up existing observer - if (observerRef.current) { - observerRef.current.disconnect(); - observerRef.current = null; - } - - try { - const observer = new IntersectionObserver( - (entries) => { - entries.forEach((entry) => { - if (entry.isIntersecting) { - const itemIndex = parseInt(entry.target.getAttribute('data-index') || '0'); - - // Defensive check for item existence - if (itemIndex >= 0 && itemIndex < streamingItems.length) { - const item = streamingItems[itemIndex]; - - setVisibleItemIndex(itemIndex); - - if (item?.type === 'day-divider') { - setCurrentDateIndex(itemIndex); - setShowFloatingDate(true); - } - } - } - }); - }, - { - root: container, - rootMargin: '-20% 0px -70% 0px', - threshold: 0.1, - } - ); - - observerRef.current = observer; - - // Observe all items with defensive checks - const items = container.querySelectorAll('[data-index]'); - if (items.length > 0) { - items.forEach((item) => observer.observe(item)); - - } - } catch (err) { - console.error('ScheduleTimelineView - Error setting up intersection observer:', err); - } - - return () => { - if (observerRef.current) { - observerRef.current.disconnect(); - observerRef.current = null; - } - }; - }, [streamingItems]); - - const scrollToNow = useCallback(() => { - if (!streamingItems || streamingItems.length === 0) return; - - const now = new Date(); - const nowItem = streamingItems.find(item => { - if (item.type !== 'artist' || !item.artist?.startTime) return false; - return item.artist.startTime <= now; - }); - - if (nowItem && containerRef.current) { - const element = containerRef.current.querySelector(`[data-index="${nowItem.position}"]`); - element?.scrollIntoView({ behavior: 'smooth', block: 'start' }); - } - }, [streamingItems]); - - const scrollToDate = useCallback((dateIndex: number) => { - if (!streamingItems || streamingItems.length === 0 || !scheduleDays || dateIndex >= scheduleDays.length) return; - - const dayDividerItem = streamingItems.find(item => - item.type === 'day-divider' && - item.date === scheduleDays[dateIndex]?.date - ); - - if (dayDividerItem && containerRef.current) { - const element = containerRef.current.querySelector(`[data-index="${dayDividerItem.position}"]`); - element?.scrollIntoView({ behavior: 'smooth', block: 'start' }); - } - }, [streamingItems, scheduleDays]); - - if (loading) { - return ( -
-

Loading festival timeline...

-
- ); - } - - if (error) { - console.error('ScheduleTimelineView - Error:', error); - return ( -
-

Error loading schedule. Please try refreshing.

- -
- ); - } - - if (!streamingItems || streamingItems.length === 0) { - - return ( -
-

No performances scheduled.

-
- ); - } - - const currentDate = streamingItems[currentDateIndex]?.displayDate || ''; - - return ( - -
- 0} - /> - - - -
-
- {streamingItems.map((item, index) => { - if (!item) { - - return null; - } - - return ( -
- {item.type === 'day-divider' ? ( - - ) : item.artist ? ( -
-
-
- {item.artist.startTime ? format(item.artist.startTime, 'HH:mm') : '--:--'} -
- {item.artist.endTime && ( -
- {format(item.artist.endTime, 'HH:mm')} -
- )} -
- -
-
-
- -
- -
-
- ) : null} -
- ); - })} -
-
- - 10} - /> -
- - ); -}; \ No newline at end of file diff --git a/src/hooks/useAuth.ts b/src/hooks/useAuth.ts index fd841ba0..3682fab3 100644 --- a/src/hooks/useAuth.ts +++ b/src/hooks/useAuth.ts @@ -1,4 +1,4 @@ -import { useEffect, useState } from "react"; +import { useEffect, useMemo, useState } from "react"; import { supabase } from "@/integrations/supabase/client"; import { useProfileQuery } from "@/hooks/queries/useProfileQuery"; import { profileOfflineService } from "@/services/profileOfflineService"; @@ -95,13 +95,15 @@ export const useAuth = () => { await supabase.auth.signOut(); }; - function hasUsername() { + + + const hasUsername = useMemo(() => { return ( // loading || // profileQuery.isLoading || (profile?.username && profile?.username.trim() !== "") ); - } + }, [profile]); return { user, diff --git a/src/pages/Index.tsx b/src/pages/Index.tsx index bac16d22..be0cec4f 100644 --- a/src/pages/Index.tsx +++ b/src/pages/Index.tsx @@ -1,4 +1,4 @@ -import { useState, useEffect } from "react"; +import { useState, useEffect, useMemo } from "react"; import { useAuth } from "@/hooks/useAuth"; import { useProfileQuery } from "@/hooks/queries/useProfileQuery"; @@ -22,27 +22,20 @@ export default function Index() { const { inviteValidation, isValidating, hasValidInvite } = useInviteValidation(); const [showAuthDialog, setShowAuthDialog] = useState(false); - const [showUsernameSetup, setShowUsernameSetup] = useState(false); const { state: urlState, updateUrlState, clearFilters } = useUrlState(); const { artists, fetchArtists, archiveArtist } = useOfflineArtistData(); const { userVotes, handleVote } = useOfflineVoting(user); - const { filteredAndSortedArtists } = useArtistFiltering(artists, urlState); + const { filteredAndSortedArtists, lockCurrentOrder } = useArtistFiltering(artists, urlState); // Get profile loading state to prevent dialog flashing const { isLoading: profileLoading } = useProfileQuery(user?.id); - // Check if username setup is needed after authentication - useEffect(() => { - // Only show dialog when all data is loaded and user definitely needs username setup - if (user && !authLoading && !profileLoading && !hasUsername()) { - setShowUsernameSetup(true); - } - // Hide dialog when user gets a username or logs out or data is still loading - if (!user || (user && !authLoading && !profileLoading && hasUsername())) { - setShowUsernameSetup(false); - } + + + const showUsernameSetup = useMemo(() => { + return user && !authLoading && !profileLoading && !hasUsername; }, [user, authLoading, profileLoading, hasUsername]); // Show loading while validating invite @@ -128,9 +121,7 @@ export default function Index() { user={user} use24Hour={urlState.use24Hour} openAuthDialog={() => setShowAuthDialog(true)} - fetchArtists={fetchArtists} - archiveArtist={archiveArtist} - onLockSort={() => updateUrlState({ sortLocked: true })} + onLockSort={() => lockCurrentOrder(updateUrlState)} /> )} {urlState.mainView === 'timeline' && ( @@ -155,7 +146,7 @@ export default function Index() { open={showUsernameSetup} user={user} onSuccess={() => { - setShowUsernameSetup(false); + // setShowUsernameSetup(false); }} />
From 79167d05cfb64ec7e6ef1d9d5891f3802b7984b5 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 29 Jul 2025 17:01:41 +0100 Subject: [PATCH 05/28] fix(artists): fix tests --- src/components/Index/ArtistListItem.tsx | 2 +- tests/e2e/artists.spec.ts | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/Index/ArtistListItem.tsx b/src/components/Index/ArtistListItem.tsx index fbae84c0..1bc2e838 100644 --- a/src/components/Index/ArtistListItem.tsx +++ b/src/components/Index/ArtistListItem.tsx @@ -69,7 +69,7 @@ export const ArtistListItem = ({ artist, userVote, userKnowledge, votingLoading, }; return ( -
+
{/* Mobile Layout (sm and below) */}
{/* Top Row: Image + Basic Info */} diff --git a/tests/e2e/artists.spec.ts b/tests/e2e/artists.spec.ts index aec8aaa7..da6c55a7 100644 --- a/tests/e2e/artists.spec.ts +++ b/tests/e2e/artists.spec.ts @@ -1,6 +1,5 @@ import { test, expect } from "@playwright/test"; import { TestHelpers } from "../utils/test-helpers"; -import { TEST_DATA } from "../config/test-env"; test.describe("Artists", () => { let testHelpers: TestHelpers; @@ -51,13 +50,13 @@ test.describe("Artists", () => { // Look for artist cards/items const artistCard = page - .locator('[data-testid="artist-card"]') - .or(page.locator(".artist-card")) - .or(page.getByRole("link").first()); + .getByTestId("artist-item").first(); if (await artistCard.isVisible()) { - const artistName = await artistCard.textContent(); - await artistCard.click(); + + const artistName = await artistCard.getByRole("heading").textContent(); + const link = artistCard.getByRole("link"); + await link.click(); // Should navigate to artist detail page await expect(page).toHaveURL(/\/artist\//); From db87e7c752ba6a2fada206ef95b736743f84824d Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 29 Jul 2025 17:04:44 +0100 Subject: [PATCH 06/28] fix tests --- tests/e2e/auth.spec.ts | 4 ++-- tests/e2e/navigation.spec.ts | 44 ++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/e2e/auth.spec.ts b/tests/e2e/auth.spec.ts index bf3ea42f..b69f167f 100644 --- a/tests/e2e/auth.spec.ts +++ b/tests/e2e/auth.spec.ts @@ -9,7 +9,7 @@ test.describe('Authentication', () => { page.getByRole('link', { name: /sign in/i }) ).or( page.getByText(/sign in/i) - ); + ).first();; await expect(signInButton).toBeVisible(); await signInButton.click(); @@ -21,6 +21,6 @@ test.describe('Authentication', () => { test('should have proper page title', async ({ page }) => { await page.goto('/'); - await expect(page).toHaveTitle(/boom voter/i); + await expect(page).toHaveTitle(/UpLine/i); }); }); \ No newline at end of file diff --git a/tests/e2e/navigation.spec.ts b/tests/e2e/navigation.spec.ts index 77b504ab..ce6af8d5 100644 --- a/tests/e2e/navigation.spec.ts +++ b/tests/e2e/navigation.spec.ts @@ -1,21 +1,21 @@ -import { test, expect } from '@playwright/test'; +import { test, expect } from "@playwright/test"; + +test.describe("Navigation", () => { + test("should navigate to different pages", async ({ page }) => { + await page.goto("/"); -test.describe('Navigation', () => { - test('should navigate to different pages', async ({ page }) => { - await page.goto('/'); - // Test navigation to different pages if they exist const navigationLinks = [ - { name: /artists/i, path: '/' }, - { name: /schedule/i, path: '/schedule' }, - { name: /groups/i, path: '/groups' }, + { name: /artists/i, path: "/" }, + { name: /schedule/i, path: "/schedule" }, + { name: /groups/i, path: "/groups" }, ]; for (const link of navigationLinks) { - const navLink = page.getByRole('link', { name: link.name }).or( - page.getByRole('button', { name: link.name }) - ); - + const navLink = page + .getByRole("link", { name: link.name }) + .or(page.getByRole("button", { name: link.name })); + if (await navLink.isVisible()) { await navLink.click(); await expect(page).toHaveURL(new RegExp(link.path)); @@ -23,16 +23,16 @@ test.describe('Navigation', () => { } }); - test('should handle 404 page', async ({ page }) => { - await page.goto('/non-existent-page'); - + test("should handle 404 page", async ({ page }) => { + await page.goto("/non-existent-page"); + // Should show 404 or error page - const errorContent = page.getByText(/not found/i).or( - page.getByText(/404/i) - ).or( - page.getByText(/page not found/i) - ); - + const errorContent = page + .getByText(/not found/i) + .or(page.getByText(/404/i)) + .or(page.getByText(/page not found/i)) + .first(); + await expect(errorContent).toBeVisible(); }); -}); \ No newline at end of file +}); From 4be3c51fd16cfd2cd18ae59e64fbdcb126d9c37d Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 29 Jul 2025 17:16:09 +0100 Subject: [PATCH 07/28] review comments --- docs/TESTING.md | 179 ++----------------------------------- scripts/setup-test-data.ts | 83 ----------------- tests/README.md | 131 ++++++++++++++------------- tests/config/test-env.ts | 26 +----- 4 files changed, 76 insertions(+), 343 deletions(-) delete mode 100644 scripts/setup-test-data.ts diff --git a/docs/TESTING.md b/docs/TESTING.md index 79cc186d..0fbc5e60 100644 --- a/docs/TESTING.md +++ b/docs/TESTING.md @@ -1,6 +1,6 @@ # Testing Setup for Boom Voter -This document outlines the complete testing infrastructure we've set up for the Boom Voter application. +> For step-by-step E2E test instructions, test data, commands, coverage, debugging, troubleshooting, and next steps, see [tests/README.md](../tests/README.md). ## ๐ŸŽฏ What We've Added @@ -9,6 +9,7 @@ This document outlines the complete testing infrastructure we've set up for the - **Browsers**: Chrome, Firefox, Safari, Mobile Chrome, Mobile Safari - **Features**: Screenshots, videos, traces, parallel execution - **Configuration**: `playwright.config.ts` +- **How to run E2E tests, setup test data, and available commands:** See [tests/README.md](../tests/README.md) ### 2. **Local Supabase Testing Environment** - **Local Database**: Supabase running on Docker @@ -22,105 +23,18 @@ This document outlines the complete testing infrastructure we've set up for the - **Environment Config**: Flexible configuration for different environments - **CI/CD Integration**: GitHub Actions workflow -## ๐Ÿ“ New Files Created - -``` -โ”œโ”€โ”€ playwright.config.ts # Playwright configuration -โ”œโ”€โ”€ tests/ -โ”‚ โ”œโ”€โ”€ e2e/ # E2E test files -โ”‚ โ”‚ โ”œโ”€โ”€ auth.spec.ts # Authentication tests -โ”‚ โ”‚ โ”œโ”€โ”€ navigation.spec.ts # Navigation tests -โ”‚ โ”‚ โ””โ”€โ”€ artists.spec.ts # Artist functionality tests -โ”‚ โ”œโ”€โ”€ config/ -โ”‚ โ”‚ โ””โ”€โ”€ test-env.ts # Test environment configuration -โ”‚ โ”œโ”€โ”€ utils/ -โ”‚ โ”‚ โ””โ”€โ”€ test-helpers.ts # Common test utilities -โ”‚ โ”œโ”€โ”€ screenshots/ # Test screenshots directory -โ”‚ โ””โ”€โ”€ README.md # Testing documentation -โ”œโ”€โ”€ scripts/ -โ”‚ โ”œโ”€โ”€ setup-test-env.sh # Local Supabase setup script -โ”‚ โ””โ”€โ”€ setup-test-data.ts # Test data population script -โ”œโ”€โ”€ .github/workflows/ -โ”‚ โ””โ”€โ”€ e2e-tests.yml # CI/CD workflow -โ””โ”€โ”€ docs/ - โ””โ”€โ”€ TESTING.md # This file -``` ## ๐Ÿš€ Getting Started -### Prerequisites -1. **Node.js 18+** -2. **Docker** (for local Supabase) -3. **Supabase CLI**: `npm install -g supabase` - -### Quick Setup -```bash -# Install dependencies -npm install - -# Setup local Supabase -npm run test:setup - -# Populate test data -npm run test:data - -# Run tests -npm run test:e2e -``` +For E2E test setup, test data, and available commands, see [tests/README.md](../tests/README.md). ## ๐Ÿงช Available Commands -| Command | Description | -|---------|-------------| -| `npm run test:e2e` | Run all tests (headless) | -| `npm run test:e2e:ui` | Run tests with Playwright UI | -| `npm run test:e2e:headed` | Run tests with visible browser | -| `npm run test:e2e:debug` | Run tests in debug mode | -| `npm run test:e2e:report` | Open test report | -| `npm run test:setup` | Setup local Supabase | -| `npm run test:data` | Setup test data | +See [tests/README.md](../tests/README.md) for all E2E test commands and usage. ## ๐Ÿ”ง Configuration -### Environment Variables -- `TEST_SUPABASE_URL`: Local Supabase URL -- `TEST_SUPABASE_ANON_KEY`: Local Supabase anon key -- `PLAYWRIGHT_BASE_URL`: App base URL -- `TEST_USER_EMAIL`: Test user email -- `TEST_USER_PASSWORD`: Test user password - -### Test Data -The setup creates: -- **3 test artists** with different genres and schedules -- **5 test genres** (Rock, Pop, Jazz, Electronic, Hip Hop) -- **3 test groups** -- **2 test users** (regular + admin) - -## ๐ŸŽฏ Test Coverage - -### Current Tests -1. **Authentication** - - Sign in dialog display - - Page title verification - -2. **Navigation** - - Page routing - - 404 handling - -3. **Artists** - - Artists list display - - Filtering functionality - - Artist detail navigation - - Empty state handling - -### Planned Tests -- User registration -- Voting functionality -- Group management -- Schedule viewing -- Admin features -- Mobile responsiveness -- Offline functionality +For E2E environment variables and test data details, see [tests/README.md](../tests/README.md). ## ๐Ÿ”„ CI/CD Integration @@ -141,88 +55,9 @@ The setup creates: ## ๐Ÿ—„๏ธ Local Supabase -### Access Points -- **API**: http://localhost:54321 -- **Studio**: http://localhost:54323 -- **Anon Key**: `eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...` - -### Management -```bash -# Start -supabase start - -# Stop -supabase stop - -# Status -supabase status - -# Logs -supabase logs -``` - -## ๐Ÿ“Š Test Reports - -### HTML Report -After running tests, view the interactive report: -```bash -npm run test:e2e:report -``` - -### Report Features -- Test results and timing -- Screenshots and videos -- Traces for debugging -- Error details and stack traces -- Filtering and search - -## ๐Ÿ› Debugging - -### Debug Mode -```bash -npm run test:e2e:debug -``` - -### UI Mode -```bash -npm run test:e2e:ui -``` - -### Screenshots -Tests automatically capture screenshots on failure in `tests/screenshots/` - -## ๐Ÿ”ฎ Next Steps - -### Immediate -1. **Run initial tests** to verify setup -2. **Add more test scenarios** based on app features -3. **Configure test users** in local Supabase -4. **Add data-testid attributes** to components - -### Future Enhancements -1. **Visual regression testing** -2. **Performance testing** -3. **Accessibility testing** -4. **API testing** with separate test suite -5. **Load testing** for critical user flows - -## ๐Ÿšจ Troubleshooting - -### Common Issues -1. **Supabase not starting**: Check Docker is running -2. **Tests timing out**: Increase timeouts in config -3. **Element not found**: Update selectors to match UI -4. **Authentication failing**: Verify test user setup - -### Getting Help -1. Check Playwright docs: https://playwright.dev/ -2. Review test logs and screenshots -3. Use debug mode for step-by-step debugging -4. Check Supabase logs: `supabase logs` +For local Supabase usage in E2E, see [tests/README.md](../tests/README.md). ## ๐Ÿ“š Resources -- [Playwright Documentation](https://playwright.dev/) - [Supabase Local Development](https://supabase.com/docs/guides/cli/local-development) -- [GitHub Actions Documentation](https://docs.github.com/en/actions) -- [Testing Best Practices](https://playwright.dev/docs/best-practices) \ No newline at end of file +- [GitHub Actions Documentation](https://docs.github.com/en/actions) \ No newline at end of file diff --git a/scripts/setup-test-data.ts b/scripts/setup-test-data.ts deleted file mode 100644 index 003173f7..00000000 --- a/scripts/setup-test-data.ts +++ /dev/null @@ -1,83 +0,0 @@ -import { createClient } from '@supabase/supabase-js'; - -const SUPABASE_URL = process.env.TEST_SUPABASE_URL || 'http://localhost:54321'; -const SUPABASE_ANON_KEY = process.env.TEST_SUPABASE_ANON_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0'; - -const supabase = createClient(SUPABASE_URL, SUPABASE_ANON_KEY); - -const testData = { - artists: [ - { name: 'Test Artist 1', description: 'Test artist for e2e testing', genre: 'Electronic' }, - { name: 'Test Artist 2', description: 'Another test artist', genre: 'Psytrance' }, - { name: 'Test Artist 3', description: 'Third test artist', genre: 'Techno' }, - ], - genres: ['Electronic', 'Psytrance', 'Techno', 'House', 'Ambient', 'Downtempo'], - users: [ - { email: 'test@example.com', password: 'testpassword123' }, - { email: 'admin@example.com', password: 'adminpassword123' }, - ], -}; - -async function setupTestData() { - console.log('๐Ÿš€ Setting up test data...'); - - try { - // Insert test genres - console.log('๐Ÿ“ Inserting test genres...'); - for (const genre of testData.genres) { - const { error } = await supabase - .from('genres') - .insert({ name: genre }); - - if (error && !error.message.includes('duplicate key')) { - console.error(`Error inserting genre ${genre}:`, error); - } - } - - // Insert test artists - console.log('๐ŸŽต Inserting test artists...'); - for (const artist of testData.artists) { - // First get the genre ID - const { data: genreData } = await supabase - .from('music_genres') - .select('id') - .eq('name', artist.genre) - .single(); - - if (genreData) { - const { error } = await supabase - .from('artists') - .insert({ - name: artist.name, - description: artist.description, - genre_id: genreData.id, - added_by: '00000000-0000-0000-0000-000000000000', // Placeholder UUID - }); - - if (error && !error.message.includes('duplicate key')) { - console.error(`Error inserting artist ${artist.name}:`, error); - } - } else { - console.warn(`Genre ${artist.genre} not found for artist ${artist.name}`); - } - } - - console.log('โœ… Test data setup completed!'); - console.log(''); - console.log('๐Ÿ“‹ Test Data Summary:'); - console.log(` Artists: ${testData.artists.length}`); - console.log(` Genres: ${testData.genres.length}`); - console.log(''); - console.log('๐Ÿงช Test Users:'); - testData.users.forEach(user => { - console.log(` Email: ${user.email}, Password: ${user.password}`); - }); - - } catch (error) { - console.error('โŒ Error setting up test data:', error); - process.exit(1); - } -} - -// Run the setup -setupTestData(); \ No newline at end of file diff --git a/tests/README.md b/tests/README.md index 8616a058..8e5c1390 100644 --- a/tests/README.md +++ b/tests/README.md @@ -1,5 +1,8 @@ # E2E Testing with Playwright +> For a full overview of all testing infrastructure, CI/CD, and general troubleshooting, see [docs/TESTING.md](../docs/TESTING.md). +> All E2E test coverage, debugging, troubleshooting, and next steps are documented here. + This directory contains end-to-end tests for the Boom Voter application using Playwright. ## ๐Ÿš€ Quick Start @@ -133,6 +136,45 @@ await testHelpers.takeScreenshot('test-name'); 4. **Use test data**: Leverage the test data setup for consistent scenarios 5. **Handle conditional elements**: Use `.isVisible()` checks for optional UI elements +## ๐Ÿ“‹ Test Coverage + +### Current Tests +1. **Authentication** + - Sign in dialog display + - Page title verification +2. **Navigation** + - Page routing + - 404 handling +3. **Artists** + - Artists list display + - Filtering functionality + - Artist detail navigation + - Empty state handling + +### Planned Tests +- User registration +- Voting functionality +- Group management +- Schedule viewing +- Admin features +- Mobile responsiveness +- Offline functionality + +## ๐Ÿ“Š Test Reports + +### HTML Report +After running tests, view the interactive report: +```bash +npm run test:e2e:report +``` + +### Report Features +- Test results and timing +- Screenshots and videos +- Traces for debugging +- Error details and stack traces +- Filtering and search + ## ๐Ÿ› Debugging ### Debug Mode @@ -151,77 +193,38 @@ Use Playwright's UI for interactive debugging: npm run test:e2e:ui ``` -### Screenshots and Videos - -Tests automatically capture: -- Screenshots on failure -- Videos on failure -- Traces on retry - -View them in the `playwright-report/` directory after running tests. - -## ๐Ÿ”„ CI/CD Integration - -The tests are configured to run in GitHub Actions on: -- Push to `main` and `develop` branches -- Pull requests to `main` and `develop` branches +### Screenshots +Tests automatically capture screenshots on failure in `tests/screenshots/` -The CI pipeline: -1. Sets up local Supabase -2. Populates test data -3. Runs tests in parallel (sharded) -4. Generates and uploads test reports +## ๐Ÿ”ฎ Next Steps -## ๐Ÿ—„๏ธ Local Supabase +### Immediate +1. **Run initial tests** to verify setup +2. **Add more test scenarios** based on app features +3. **Configure test users** in local Supabase +4. **Add data-testid attributes** to components -### Starting Local Supabase - -```bash -supabase start -``` - -### Stopping Local Supabase - -```bash -supabase stop -``` - -### Accessing Local Supabase - -- **API URL**: http://localhost:54321 -- **Studio URL**: http://localhost:54323 -- **Anon Key**: `eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0` - -### Database Schema - -The local Supabase instance uses the same schema as your production database, defined in `supabase/migrations/`. - -## ๐Ÿ“Š Test Reports - -After running tests, view the HTML report: - -```bash -npm run test:e2e:report -``` - -The report includes: -- Test results and timing -- Screenshots and videos -- Traces for debugging -- Error details and stack traces +### Future Enhancements +1. **Visual regression testing** +2. **Performance testing** +3. **Accessibility testing** +4. **API testing** with separate test suite +5. **Load testing** for critical user flows ## ๐Ÿšจ Troubleshooting ### Common Issues - -1. **Supabase not starting**: Ensure Docker is running -2. **Tests timing out**: Increase timeouts in `playwright.config.ts` -3. **Element not found**: Check if selectors match the current UI -4. **Authentication failing**: Verify test user credentials in Supabase +1. **Supabase not starting**: Check Docker is running +2. **Tests timing out**: Increase timeouts in config +3. **Element not found**: Update selectors to match UI +4. **Authentication failing**: Verify test user setup ### Getting Help - -1. Check the Playwright documentation: https://playwright.dev/ +1. Check Playwright docs: https://playwright.dev/ 2. Review test logs and screenshots -3. Use debug mode to step through failing tests -4. Check Supabase logs: `supabase logs` \ No newline at end of file +3. Use debug mode for step-by-step debugging +4. Check Supabase logs: `supabase logs` + +## ๐Ÿ† Playwright & Testing Best Practices +- [Playwright Documentation](https://playwright.dev/) +- [Testing Best Practices](https://playwright.dev/docs/best-practices) \ No newline at end of file diff --git a/tests/config/test-env.ts b/tests/config/test-env.ts index 798379e4..17698335 100644 --- a/tests/config/test-env.ts +++ b/tests/config/test-env.ts @@ -1,28 +1,6 @@ // Test environment configuration export const TEST_CONFIG = { - // Local Supabase test instance - SUPABASE_URL: process.env.TEST_SUPABASE_URL || 'http://localhost:54321', - SUPABASE_ANON_KEY: process.env.TEST_SUPABASE_ANON_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0', - // Test user credentials - TEST_USER_EMAIL: process.env.TEST_USER_EMAIL || 'test@example.com', - TEST_USER_PASSWORD: process.env.TEST_USER_PASSWORD || 'testpassword123', - - // App configuration - BASE_URL: process.env.PLAYWRIGHT_BASE_URL || 'http://localhost:5173', - - // Test data - TEST_ARTIST_NAME: 'Test Artist', - TEST_GENRE_NAME: 'Test Genre', - TEST_GROUP_NAME: 'Test Group', + TEST_USER_EMAIL: process.env.TEST_USER_EMAIL || "test@example.com", + TEST_USER_PASSWORD: process.env.TEST_USER_PASSWORD || "testpassword123", }; - -// Test data setup helpers -export const TEST_DATA = { - artists: [ - { name: 'Test Artist 1', genre: 'Rock' }, - { name: 'Test Artist 2', genre: 'Pop' }, - { name: 'Test Artist 3', genre: 'Jazz' }, - ], - genres: ['Electronic', 'Psytrance', 'Techno', 'House', 'Ambient', 'Downtempo'], -}; \ No newline at end of file From 603e912d8d71181240010cea5a8baa231e83ae00 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 29 Jul 2025 17:22:27 +0100 Subject: [PATCH 08/28] try to fix tests --- .github/workflows/e2e-tests.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index e4045eb3..19524774 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -33,16 +33,10 @@ jobs: - name: Setup Supabase run: | - npm install -g supabase - supabase start + npx supabase start sleep 10 - supabase db reset + npx supabase db reset - - name: Setup test data - run: npm run test:data - env: - TEST_SUPABASE_URL: http://localhost:54321 - TEST_SUPABASE_ANON_KEY: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0 - name: Build project run: npm run build From fc47512000bb57b72e9c768ad30e97588cdb6596 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 29 Jul 2025 17:47:49 +0100 Subject: [PATCH 09/28] fix(db): fix seed --- src/pages/Index.tsx | 4 ++-- .../migrations/20250729173025_add_artist_dates.sql | 13 +++++++++++++ supabase/seed.sql | 10 ++-------- 3 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 supabase/migrations/20250729173025_add_artist_dates.sql diff --git a/src/pages/Index.tsx b/src/pages/Index.tsx index be0cec4f..138b8a2d 100644 --- a/src/pages/Index.tsx +++ b/src/pages/Index.tsx @@ -24,7 +24,7 @@ export default function Index() { const [showAuthDialog, setShowAuthDialog] = useState(false); const { state: urlState, updateUrlState, clearFilters } = useUrlState(); - const { artists, fetchArtists, archiveArtist } = useOfflineArtistData(); + const { artists, loading: artistsLoading } = useOfflineArtistData(); const { userVotes, handleVote } = useOfflineVoting(user); const { filteredAndSortedArtists, lockCurrentOrder } = useArtistFiltering(artists, urlState); @@ -78,7 +78,7 @@ export default function Index() { ); } - if (authLoading) { + if (authLoading || artistsLoading) { return (
Loading...
diff --git a/supabase/migrations/20250729173025_add_artist_dates.sql b/supabase/migrations/20250729173025_add_artist_dates.sql new file mode 100644 index 00000000..930dd045 --- /dev/null +++ b/supabase/migrations/20250729173025_add_artist_dates.sql @@ -0,0 +1,13 @@ +-- Add time_start and time_end columns to artists table (for performance scheduling) +ALTER TABLE public.artists +ADD COLUMN time_start TIMESTAMP WITH TIME ZONE, +ADD COLUMN time_end TIMESTAMP WITH TIME ZONE; + +-- Create index for better query performance on time ranges +CREATE INDEX idx_artists_time_start ON public.artists(time_start); +CREATE INDEX idx_artists_time_end ON public.artists(time_end); + +-- Add constraint to ensure time_end is after time_start when both are set +ALTER TABLE public.artists +ADD CONSTRAINT check_artist_time_order +CHECK (time_start IS NULL OR time_end IS NULL OR time_start <= time_end); \ No newline at end of file diff --git a/supabase/seed.sql b/supabase/seed.sql index b74c3df6..915e289d 100644 --- a/supabase/seed.sql +++ b/supabase/seed.sql @@ -25,14 +25,8 @@ INSERT INTO auth.users ( ('55555555-5555-5555-5555-555555555555', '00000000-0000-0000-0000-000000000000', 'diana@example.com', '$2a$10$example_hash', now(), now(), now(), '{"username": "diana_dance"}', false, 'authenticated'), ('66666666-6666-6666-6666-666666666666', '00000000-0000-0000-0000-000000000000', 'eve@example.com', '$2a$10$example_hash', now(), now(), now(), '{"username": "eve_electronic"}', false, 'authenticated'); --- Insert profiles for all test users -INSERT INTO public.profiles (id, username, email, created_at) VALUES - ('11111111-1111-1111-1111-111111111111', 'admin', 'admin@festival.com', now()), - ('22222222-2222-2222-2222-222222222222', 'alice_music', 'alice@example.com', now()), - ('33333333-3333-3333-3333-333333333333', 'bob_beats', 'bob@example.com', now()), - ('44444444-4444-4444-4444-444444444444', 'charlie_vibes', 'charlie@example.com', now()), - ('55555555-5555-5555-5555-555555555555', 'diana_dance', 'diana@example.com', now()), - ('66666666-6666-6666-6666-666666666666', 'eve_electronic', 'eve@example.com', now()); +-- Profiles are automatically created by the handle_new_user() trigger +-- when users are inserted into auth.users, so no manual insertion needed -- Create admin role for the admin user INSERT INTO public.admin_roles (user_id, role, created_by, created_at) VALUES From 25bb49e1a0a8aa4798187b0e1aefc0a1004bfbee Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 29 Jul 2025 18:09:12 +0100 Subject: [PATCH 10/28] fix(ci); try to merge tests --- .github/workflows/e2e-tests.yml | 3 ++- playwright.config.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 19524774..7ff7cb43 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -54,6 +54,7 @@ jobs: path: | playwright-report/ test-results/ + blob-report/ retention-days: 30 report: @@ -80,7 +81,7 @@ jobs: path: all-results/ - name: Merge results - run: npx playwright merge-reports ./all-results --reporter html + run: npx playwright merge-reports ./all-results/playwright-report-*/blob-report --reporter html - uses: actions/upload-artifact@v4 with: diff --git a/playwright.config.ts b/playwright.config.ts index ec55565a..5bdbb496 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -14,7 +14,7 @@ export default defineConfig({ /* Opt out of parallel tests on CI. */ workers: process.env.CI ? 1 : undefined, /* Reporter to use. See https://playwright.dev/docs/test-reporters */ - reporter: 'html', + reporter: process.env.CI ? [['blob'], ['html']] : 'html', /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */ use: { /* Base URL to use in actions like `await page.goto('/')`. */ From 54ea5ed6c37bc361b38adab3f08a0456584ec56d Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 29 Jul 2025 18:24:22 +0100 Subject: [PATCH 11/28] fix(ci): merge reports --- .github/workflows/e2e-tests.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 7ff7cb43..4b498267 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -72,16 +72,15 @@ jobs: - name: Install dependencies run: npm ci - - name: Install Playwright Browsers - run: npx playwright install --with-deps - - - name: Download all results + - name: Download blob reports from GitHub Actions Artifacts uses: actions/download-artifact@v4 with: - path: all-results/ + path: all-blob-reports + pattern: playwright-report-* + merge-multiple: true - - name: Merge results - run: npx playwright merge-reports ./all-results/playwright-report-*/blob-report --reporter html + - name: Merge into HTML Report + run: npx playwright merge-reports --reporter html ./all-blob-reports - uses: actions/upload-artifact@v4 with: From 2fb106b10a79b6afe9b25b0fa965f42924ad4547 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 29 Jul 2025 18:26:22 +0100 Subject: [PATCH 12/28] fix(ci): merge reports - change name of report --- .github/workflows/e2e-tests.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 4b498267..c3ed3e77 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -48,14 +48,11 @@ jobs: TEST_SUPABASE_ANON_KEY: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0 - uses: actions/upload-artifact@v4 - if: always() + if: ${{ !cancelled() }} with: - name: playwright-report-${{ matrix.shardIndex }} - path: | - playwright-report/ - test-results/ - blob-report/ - retention-days: 30 + name: blob-report-${{ matrix.shardIndex }} + path: blob-report + retention-days: 1 report: needs: test From c06f2931476409a3bf4778ecff7ec034c7101e6f Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 29 Jul 2025 18:26:29 +0100 Subject: [PATCH 13/28] fix(artists): show user votes --- .../ArtistDetail/ArtistInfoCard.tsx | 3 - .../ArtistDetail/useArtistDetail.ts | 46 +++---------- src/components/EditArtistDialog.tsx | 26 ++++---- src/hooks/useOfflineArtistData.ts | 65 +++++++++++-------- src/hooks/useOfflineVoting.ts | 3 +- src/pages/ArtistDetail.tsx | 2 - src/services/queries.ts | 4 +- 7 files changed, 64 insertions(+), 85 deletions(-) diff --git a/src/components/ArtistDetail/ArtistInfoCard.tsx b/src/components/ArtistDetail/ArtistInfoCard.tsx index e77d3d5f..3b252e33 100644 --- a/src/components/ArtistDetail/ArtistInfoCard.tsx +++ b/src/components/ArtistDetail/ArtistInfoCard.tsx @@ -21,7 +21,6 @@ interface ArtistInfoCardProps { netVoteScore: number; onVote: (voteType: number) => void; getVoteCount: (voteType: number) => number; - onArtistUpdate: () => void; onArchiveArtist?: () => Promise; use24Hour?: boolean; } @@ -33,7 +32,6 @@ export const ArtistInfoCard = ({ netVoteScore, onVote, getVoteCount, - onArtistUpdate, onArchiveArtist, use24Hour = false, }: ArtistInfoCardProps) => { @@ -98,7 +96,6 @@ export const ArtistInfoCard = ({
{ @@ -11,37 +9,14 @@ export const useArtistDetail = (id: string | undefined) => { const { data: canEdit = false, isLoading: isLoadingPermissions } = useUserPermissionsQuery(user?.id, "edit_artists"); - const [artist, setArtist] = useState(null); - const [loading, setLoading] = useState(true); - const { toast } = useToast(); - - const { archiveArtist: archiveArtistOffline } = useOfflineArtistData(); + const { artists, loading: artistsLoading, archiveArtist: archiveArtistOffline } = useOfflineArtistData(); const { userVotes, handleVote } = useOfflineVoting(user); - useEffect(() => { - if (id) { - loadArtist(); - } - }, [id]); - - const loadArtist = async () => { - if (!id) return; - - setLoading(true); - try { - const artistData = await offlineStorage.getArtist(id); - setArtist(artistData); - } catch (error) { - console.error("Error loading artist:", error); - toast({ - title: "Error", - description: "Failed to load artist data", - variant: "destructive", - }); - } finally { - setLoading(false); - } - }; + // Find the artist from offline-first data + const artist = useMemo(() => { + if (!id || !artists.length) return null; + return artists.find((a) => a.id === id) || null; + }, [id, artists]); const handleVoteAction = async (voteType: number) => { if (!id) return; @@ -50,7 +25,7 @@ export const useArtistDetail = (id: string | undefined) => { const getVoteCount = (voteType: number) => { if (!artist) return 0; - return artist.votes.filter((vote) => vote.vote_type === voteType).length; + return artist.votes?.filter((vote) => vote.vote_type === voteType).length || 0; }; const netVoteScore = artist ? getVoteCount(1) - getVoteCount(-1) : 0; @@ -66,12 +41,11 @@ export const useArtistDetail = (id: string | undefined) => { artist, user, userVote, - loading: authLoading || isLoadingPermissions || loading, + loading: authLoading || isLoadingPermissions || artistsLoading, canEdit, handleVote: handleVoteAction, getVoteCount, netVoteScore, - fetchArtist: loadArtist, archiveArtist, }; }; diff --git a/src/components/EditArtistDialog.tsx b/src/components/EditArtistDialog.tsx index b19868f6..0b39103b 100644 --- a/src/components/EditArtistDialog.tsx +++ b/src/components/EditArtistDialog.tsx @@ -21,7 +21,7 @@ import { useToast } from "@/hooks/use-toast"; import { supabase } from "@/integrations/supabase/client"; import { useGroups } from "@/hooks/useGroups"; import { Edit } from "lucide-react"; -import { Artist } from "@/services/queries"; +import { Artist, artistQueries } from "@/services/queries"; import { useGenres } from "@/hooks/queries/useGenresQuery"; import { toZonedTime, fromZonedTime } from "date-fns-tz"; import { StageSelector } from "./StageSelector"; @@ -29,14 +29,14 @@ import { formatISO } from "date-fns"; import { useUserPermissionsQuery } from "@/hooks/queries/useGroupsQuery"; import { useAuth } from "@/hooks/useAuth"; import { toDatetimeLocal, toISOString } from "@/lib/timeUtils"; - +import { useQueryClient } from "@tanstack/react-query"; // Helper function to subtract one hour from datetime-local string const subtractOneHour = (datetimeLocal: string): string => { if (!datetimeLocal) return ""; const date = new Date(datetimeLocal); date.setHours(date.getHours() - 1); - + const year = date.getFullYear(); const month = String(date.getMonth() + 1).padStart(2, "0"); const day = String(date.getDate()).padStart(2, "0"); @@ -54,17 +54,13 @@ interface EditArtistDialogProps { export const EditArtistDialog = ({ artist, - onSuccess, trigger, }: EditArtistDialogProps) => { + const queryClient = useQueryClient(); const { user, loading: authLoading } = useAuth(); - const { data: canEdit = false, isLoading: isLoadingPermissions } = useUserPermissionsQuery( - user?.id, - "edit_artists" - ); + const { data: canEdit = false, isLoading: isLoadingPermissions } = + useUserPermissionsQuery(user?.id, "edit_artists"); - - const [open, setOpen] = useState(false); const [loading, setLoading] = useState(false); const [formData, setFormData] = useState({ @@ -127,7 +123,7 @@ export const EditArtistDialog = ({ }); setOpen(false); - onSuccess?.(); + queryClient.invalidateQueries({ queryKey: artistQueries.all() }); } catch (error) { console.error("Error updating artist:", error); toast({ @@ -216,8 +212,12 @@ export const EditArtistDialog = ({ if (formData.time_start || formData.time_end) { setFormData({ ...formData, - time_start: formData.time_start ? subtractOneHour(formData.time_start) : "", - time_end: formData.time_end ? subtractOneHour(formData.time_end) : "", + time_start: formData.time_start + ? subtractOneHour(formData.time_start) + : "", + time_end: formData.time_end + ? subtractOneHour(formData.time_end) + : "", }); } }} diff --git a/src/hooks/useOfflineArtistData.ts b/src/hooks/useOfflineArtistData.ts index 4a87959d..433a6f28 100644 --- a/src/hooks/useOfflineArtistData.ts +++ b/src/hooks/useOfflineArtistData.ts @@ -1,21 +1,26 @@ import { useEffect, useRef, useState, useCallback } from "react"; import { useQueryClient } from "@tanstack/react-query"; import { supabase } from "@/integrations/supabase/client"; -import { useArtistsQuery, useArchiveArtistMutation } from "./queries/useArtistsQuery"; +import { + useArtistsQuery, + useArchiveArtistMutation, +} from "./queries/useArtistsQuery"; import { artistQueries, voteQueries } from "@/services/queries"; import { useOnlineStatus, useOfflineData } from "./useOffline"; import { offlineStorage } from "@/lib/offlineStorage"; import type { Artist } from "@/services/queries"; +import { RealtimeChannel } from "@supabase/supabase-js"; export const useOfflineArtistData = () => { const queryClient = useQueryClient(); const { data: artists = [], isLoading, error, refetch } = useArtistsQuery(); const archiveArtistMutation = useArchiveArtistMutation(); - const channelRef = useRef(null); + const channelRef = useRef(null); const isOnline = useOnlineStatus(); - const { offlineReady, saveArtistsOffline, getArtistsOffline } = useOfflineData(); + const { offlineReady, saveArtistsOffline, getArtistsOffline } = + useOfflineData(); const [offlineArtists, setOfflineArtists] = useState([]); - const [dataSource, setDataSource] = useState<'online' | 'offline'>('online'); + const [dataSource, setDataSource] = useState<"online" | "offline">("online"); // Load offline data when ready useEffect(() => { @@ -37,45 +42,50 @@ export const useOfflineArtistData = () => { // Clean up any existing channel first if (channelRef.current) { - supabase.removeChannel(channelRef.current); channelRef.current = null; } // Create unique channel name to prevent conflicts - const channelName = `artists-changes-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`; - - + const channelName = `artists-changes-${Date.now()}-${Math.random() + .toString(36) + .substr(2, 9)}`; + try { const artistsChannel = supabase .channel(channelName) - .on('postgres_changes', { event: '*', schema: 'public', table: 'artists' }, (payload) => { - - queryClient.invalidateQueries({ queryKey: artistQueries.lists() }); - }) - .on('postgres_changes', { event: '*', schema: 'public', table: 'votes' }, (payload) => { - - queryClient.invalidateQueries({ queryKey: artistQueries.lists() }); - queryClient.invalidateQueries({ queryKey: voteQueries.all() }); - }) + .on( + "postgres_changes", + { event: "*", schema: "public", table: "artists" }, + (payload) => { + queryClient.invalidateQueries({ queryKey: artistQueries.lists() }); + } + ) + .on( + "postgres_changes", + { event: "*", schema: "public", table: "votes" }, + (payload) => { + queryClient.invalidateQueries({ queryKey: artistQueries.lists() }); + queryClient.invalidateQueries({ queryKey: voteQueries.all() }); + } + ) .subscribe((status, err) => { if (err) { - console.error('Subscription error:', err); + console.error("Subscription error:", err); } }); channelRef.current = artistsChannel; } catch (err) { - console.error('Failed to create subscription channel:', err); + console.error("Failed to create subscription channel:", err); } return () => { if (channelRef.current) { - try { supabase.removeChannel(channelRef.current); } catch (err) { - console.error('Error cleaning up channel:', err); + console.error("Error cleaning up channel:", err); } channelRef.current = null; } @@ -87,11 +97,10 @@ export const useOfflineArtistData = () => { const cachedArtists = await getArtistsOffline(); if (cachedArtists.length > 0) { setOfflineArtists(cachedArtists); - setDataSource('offline'); - + setDataSource("offline"); } } catch (error) { - console.error('Error loading offline artists:', error); + console.error("Error loading offline artists:", error); } }, [getArtistsOffline]); @@ -109,14 +118,14 @@ export const useOfflineArtistData = () => { } else { // When offline, queue the action await offlineStorage.saveSetting(`archive_${artistId}`, { - action: 'archive', + action: "archive", artistId, timestamp: Date.now(), synced: false, }); - + // Update local data - const updatedArtists = offlineArtists.map(artist => + const updatedArtists = offlineArtists.map((artist) => artist.id === artistId ? { ...artist, archived: true } : artist ); setOfflineArtists(updatedArtists); @@ -140,4 +149,4 @@ export const useOfflineArtistData = () => { }; }; -export type { Artist }; \ No newline at end of file +export type { Artist }; diff --git a/src/hooks/useOfflineVoting.ts b/src/hooks/useOfflineVoting.ts index 479eba60..0b309469 100644 --- a/src/hooks/useOfflineVoting.ts +++ b/src/hooks/useOfflineVoting.ts @@ -3,8 +3,9 @@ import { supabase } from "@/integrations/supabase/client"; import { useToast } from "@/components/ui/use-toast"; import { offlineStorage } from '@/lib/offlineStorage'; import { useOnlineStatus, useOfflineQueue } from './useOffline'; +import { User } from '@supabase/supabase-js'; -export const useOfflineVoting = (user: any, onVoteUpdate?: () => void) => { +export const useOfflineVoting = (user: User, onVoteUpdate?: () => void) => { const [userVotes, setUserVotes] = useState>({}); const [votingLoading, setVotingLoading] = useState>({}); const { toast } = useToast(); diff --git a/src/pages/ArtistDetail.tsx b/src/pages/ArtistDetail.tsx index 6e5e94bb..295c8d75 100644 --- a/src/pages/ArtistDetail.tsx +++ b/src/pages/ArtistDetail.tsx @@ -23,7 +23,6 @@ const ArtistDetail = () => { handleVote, getVoteCount, netVoteScore, - fetchArtist, archiveArtist, } = useArtistDetail(id); @@ -60,7 +59,6 @@ const ArtistDetail = () => { netVoteScore={netVoteScore} onVote={handleVote} getVoteCount={getVoteCount} - onArtistUpdate={fetchArtist} onArchiveArtist={canEdit ? handleArchiveArtist : undefined} use24Hour={urlState.use24Hour} /> diff --git a/src/services/queries.ts b/src/services/queries.ts index d4a93180..d5ad4b8a 100644 --- a/src/services/queries.ts +++ b/src/services/queries.ts @@ -21,7 +21,7 @@ type ArtistNote = { export const artistQueries = { all: () => ['artists'] as const, lists: () => [...artistQueries.all(), 'list'] as const, - list: (filters?: any) => [...artistQueries.lists(), filters] as const, + list: (filters?: unknown) => [...artistQueries.lists(), filters] as const, details: () => [...artistQueries.all(), 'detail'] as const, detail: (id: string) => [...artistQueries.details(), id] as const, notes: (artistId: string) => [...artistQueries.detail(artistId), 'notes'] as const, @@ -527,7 +527,7 @@ export const mutationFunctions = { return true; }, - async updateProfile(variables: { userId: string; updates: any }) { + async updateProfile(variables: { userId: string; updates: unknown }) { const { userId, updates } = variables; const { data, error } = await supabase From 57ed9ed40df7a237ba27d1286de6b0d7824718a8 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 29 Jul 2025 18:26:34 +0100 Subject: [PATCH 14/28] add claude --- CLAUDE.md | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 CLAUDE.md diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 00000000..1814bb1b --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,108 @@ +# CLAUDE.md + +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. + +## Essential Commands + +### Development +- `npm run dev` - Start development server on port 8080 +- `npm run build` - Production build +- `npm run build:dev` - Development build +- `npm run lint` - Run ESLint +- `npm run preview` - Preview production build + +### Testing +- `npm run test:e2e` - Run Playwright end-to-end tests +- `npm run test:e2e:ui` - Run tests with Playwright UI +- `npm run test:e2e:headed` - Run tests in headed mode +- `npm run test:e2e:debug` - Debug tests +- `npm run test:e2e:report` - Show test report +- `npm run test:setup` - Setup test environment +- `npm run test:setup:full` - Setup full local Supabase + +## Architecture Overview + +### Tech Stack +- **Frontend**: React 18 + TypeScript + Vite +- **UI**: shadcn/ui components with Radix UI primitives +- **Styling**: Tailwind CSS with custom design system +- **Database**: Supabase PostgreSQL with Row Level Security +- **State Management**: TanStack Query for server state +- **Authentication**: Supabase Auth (magic links + OTP) +- **Testing**: Playwright for E2E tests + +### Project Structure +``` +src/ +โ”œโ”€โ”€ components/ # Reusable UI components +โ”‚ โ”œโ”€โ”€ ui/ # shadcn/ui base components +โ”‚ โ”œโ”€โ”€ Admin/ # Admin dashboard components +โ”‚ โ”œโ”€โ”€ ArtistDetail/ # Artist detail page components +โ”‚ โ”œโ”€โ”€ Index/ # Main page components +โ”‚ โ””โ”€โ”€ legal/ # Legal pages (privacy, terms) +โ”œโ”€โ”€ hooks/ # Custom React hooks +โ”‚ โ”œโ”€โ”€ queries/ # TanStack Query hooks +โ”‚ โ””โ”€โ”€ useAuth.ts # Authentication logic +โ”œโ”€โ”€ integrations/ +โ”‚ โ””โ”€โ”€ supabase/ # Supabase client and types +โ”œโ”€โ”€ lib/ # Utility functions +โ”œโ”€โ”€ pages/ # Route components +โ”œโ”€โ”€ services/ # Business logic services +โ””โ”€โ”€ types/ # TypeScript type definitions +``` + +### Core Application Concepts + +**VibeTribe** is a collaborative festival voting platform with these key features: + +1. **Artist Management**: Core team can add/edit artists with genres, stages, and metadata +2. **Voting System**: Three vote types - "Must Go" (2), "Interested" (1), "Won't Go" (-1) +3. **Group System**: Users can create groups for collaborative decision-making +4. **Real-time Updates**: Live vote counts and artist changes via Supabase subscriptions +5. **Authentication**: Passwordless login with magic links and OTP backup + +### Database Schema +- `artists` - Artist information with genres, stages, performance times +- `votes` - User votes linked to artists and groups +- `artist_notes` - Collaborative notes visible to group members +- `groups` - Voting groups with invite system +- `group_members` - Group membership with roles +- `profiles` - Extended user information + +### Key Architectural Patterns + +1. **Component Architecture**: Functional components with TypeScript, using custom hooks for business logic +2. **State Management**: Server state via TanStack Query, URL state for filters, local state for UI +3. **Real-time Features**: Supabase subscriptions for live updates +4. **Security**: Row Level Security policies, role-based permissions (Anonymous, Authenticated, Group Creator, Core Team) +5. **Offline Support**: PWA configuration with service worker caching + +### Development Guidelines + +1. **TypeScript**: Full type coverage with generated Supabase types +2. **Styling**: Use Tailwind utilities and existing component patterns +3. **Components**: Follow shadcn/ui patterns for new UI components +4. **Data Fetching**: Use TanStack Query hooks in `hooks/queries/` +5. **Authentication**: Use `useAuth` hook for auth state and actions +6. **Routing**: Add new routes to `App.tsx` above the catch-all "*" route + +### Testing Setup +- E2E tests use Playwright with local Supabase instance +- Tests run against port 8080 (development server) +- Test data setup via `scripts/setup-test-env.sh` +- CI/CD runs tests in parallel across multiple browsers +- Detailed testing documentation in `tests/README.md` + +### Code Conventions +- ESLint configuration disables unused variable warnings +- React hooks follow standard patterns +- Component files use PascalCase +- Custom hooks use camelCase with "use" prefix +- Services and utilities use camelCase + +### Important Notes +- Server runs on port 8080 (not standard 3000) +- Authentication uses magic links primarily, OTP as backup +- All database operations go through Supabase RLS policies +- Group-based permissions affect data visibility +- PWA manifest configured for "UpLine" branding \ No newline at end of file From 223e22203915720d62683a0ceffa5319cb445b41 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 29 Jul 2025 20:39:03 +0100 Subject: [PATCH 15/28] fix: e2e tests --- .github/workflows/e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index c3ed3e77..f83d3dc4 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -73,7 +73,7 @@ jobs: uses: actions/download-artifact@v4 with: path: all-blob-reports - pattern: playwright-report-* + pattern: blob-report-* merge-multiple: true - name: Merge into HTML Report From 8a7e1b1fcb9575e7ee4fa1e008da3d6061aec088 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 29 Jul 2025 21:04:15 +0100 Subject: [PATCH 16/28] feat(ci): show test results in a comment --- .github/workflows/e2e-tests.yml | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index f83d3dc4..5cb646f3 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -42,10 +42,10 @@ jobs: run: npm run build - name: Run Playwright tests - run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} + run: PLAYWRIGHT_JSON_OUTPUT_NAME=results-${{ matrix.shardIndex }}.json npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --reporter=blob,json env: TEST_SUPABASE_URL: http://localhost:54321 - TEST_SUPABASE_ANON_KEY: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0 + TEST_SUPABASE_ANON_KEY: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCN9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0 - uses: actions/upload-artifact@v4 if: ${{ !cancelled() }} @@ -54,6 +54,13 @@ jobs: path: blob-report retention-days: 1 + - uses: actions/upload-artifact@v4 + if: ${{ !cancelled() }} + with: + name: json-report-${{ matrix.shardIndex }} + path: results-${{ matrix.shardIndex }}.json + retention-days: 1 + report: needs: test runs-on: ubuntu-latest @@ -79,6 +86,22 @@ jobs: - name: Merge into HTML Report run: npx playwright merge-reports --reporter html ./all-blob-reports + - name: Download JSON reports + uses: actions/download-artifact@v4 + with: + path: all-json-reports + pattern: json-report-* + merge-multiple: true + + - name: Merge JSON reports + run: npx playwright merge-reports --reporter json ./all-blob-reports + + - name: Generate summary comment + uses: daun/playwright-report-summary@v3 + if: always() + with: + report-file: playwright-report.json + - uses: actions/upload-artifact@v4 with: name: playwright-report From 697adb7dcb2ef9f86cba7f73bc1e47aa6e263329 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 29 Jul 2025 21:23:47 +0100 Subject: [PATCH 17/28] fix ci --- .github/workflows/e2e-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 5cb646f3..619faaa8 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -94,13 +94,13 @@ jobs: merge-multiple: true - name: Merge JSON reports - run: npx playwright merge-reports --reporter json ./all-blob-reports + run: npx playwright merge-reports --reporter json ./all-json-reports.json - name: Generate summary comment uses: daun/playwright-report-summary@v3 if: always() with: - report-file: playwright-report.json + report-file: all-json-reports.json - uses: actions/upload-artifact@v4 with: From edac1def697ed76409721c6fee4e39f7a6fa1ae1 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 29 Jul 2025 21:58:31 +0100 Subject: [PATCH 18/28] fix ci --- .github/workflows/e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 619faaa8..230b7fca 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -94,7 +94,7 @@ jobs: merge-multiple: true - name: Merge JSON reports - run: npx playwright merge-reports --reporter json ./all-json-reports.json + run: npx playwright merge-reports --reporter json ./all-json-reports - name: Generate summary comment uses: daun/playwright-report-summary@v3 From 5d8cd70067b2e663699d45fb6efd300ab1ae3fac Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Wed, 30 Jul 2025 10:49:47 +0100 Subject: [PATCH 19/28] fix ci --- .github/workflows/e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 230b7fca..7d03798b 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -58,7 +58,7 @@ jobs: if: ${{ !cancelled() }} with: name: json-report-${{ matrix.shardIndex }} - path: results-${{ matrix.shardIndex }}.json + path: json-report retention-days: 1 report: From 5dc36f7bc406a7c3f84ee31add17dbc5eb1f9c2b Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Wed, 30 Jul 2025 11:04:08 +0100 Subject: [PATCH 20/28] fix ci --- .github/workflows/e2e-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 7d03798b..dbedb584 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -42,7 +42,7 @@ jobs: run: npm run build - name: Run Playwright tests - run: PLAYWRIGHT_JSON_OUTPUT_NAME=results-${{ matrix.shardIndex }}.json npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --reporter=blob,json + run: PLAYWRIGHT_JSON_OUTPUT_NAME=json-report-${{ matrix.shardIndex }}.json npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --reporter=blob,json env: TEST_SUPABASE_URL: http://localhost:54321 TEST_SUPABASE_ANON_KEY: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCN9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0 @@ -57,7 +57,7 @@ jobs: - uses: actions/upload-artifact@v4 if: ${{ !cancelled() }} with: - name: json-report-${{ matrix.shardIndex }} + name: json-report-${{ matrix.shardIndex }}.json path: json-report retention-days: 1 From 9d311647c7fb853a50e4c80868ccfa0d945e97fc Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Wed, 30 Jul 2025 11:14:55 +0100 Subject: [PATCH 21/28] fix ci --- .github/workflows/e2e-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index dbedb584..0037e425 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -58,7 +58,6 @@ jobs: if: ${{ !cancelled() }} with: name: json-report-${{ matrix.shardIndex }}.json - path: json-report retention-days: 1 report: From e03a8997b1c4fdb84b97df53a7372a5422bd7249 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Wed, 30 Jul 2025 11:28:19 +0100 Subject: [PATCH 22/28] fix ci --- .github/workflows/e2e-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 0037e425..58c475b1 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -58,6 +58,7 @@ jobs: if: ${{ !cancelled() }} with: name: json-report-${{ matrix.shardIndex }}.json + path: . retention-days: 1 report: From 132974b09f6db1dc95670c5a4a28d0fc348d17c0 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Wed, 30 Jul 2025 20:27:13 +0100 Subject: [PATCH 23/28] fix ci --- .github/workflows/e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 58c475b1..5748b412 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -58,7 +58,7 @@ jobs: if: ${{ !cancelled() }} with: name: json-report-${{ matrix.shardIndex }}.json - path: . + path: json-report-${{ matrix.shardIndex }}.json retention-days: 1 report: From 4b07900bdb9ed51667b4bc0c9e29df703014bdc9 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Wed, 30 Jul 2025 22:11:36 +0100 Subject: [PATCH 24/28] fix ci - add debug log --- .github/workflows/e2e-tests.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 5748b412..18b98758 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -91,7 +91,17 @@ jobs: with: path: all-json-reports pattern: json-report-* - merge-multiple: true + + - name: Debug JSON reports directory + run: | + echo "=== Contents of all-json-reports ===" + ls -la all-json-reports/ + echo "=== Recursive listing ===" + find all-json-reports -type f -name "*.json" + echo "=== Current working directory ===" + pwd + echo "=== Directory structure ===" + tree all-json-reports || find all-json-reports -type f - name: Merge JSON reports run: npx playwright merge-reports --reporter json ./all-json-reports From 2f77d250ed82a3b411479aedc21364c454fcecbf Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Thu, 31 Jul 2025 07:47:47 +0100 Subject: [PATCH 25/28] fix ci - merge multiple --- .github/workflows/e2e-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 18b98758..afd9b34e 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -91,6 +91,7 @@ jobs: with: path: all-json-reports pattern: json-report-* + merge-multiple: true - name: Debug JSON reports directory run: | From 2bd4e7b345a9d6fcd1c95dacd6730cee30e9b00a Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Thu, 31 Jul 2025 08:01:57 +0100 Subject: [PATCH 26/28] fix ci - correct path --- .github/workflows/e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index afd9b34e..db757345 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -105,7 +105,7 @@ jobs: tree all-json-reports || find all-json-reports -type f - name: Merge JSON reports - run: npx playwright merge-reports --reporter json ./all-json-reports + run: npx playwright merge-reports --reporter json all-json-reports/*.json - name: Generate summary comment uses: daun/playwright-report-summary@v3 From d419c93242b9c1c0d23e263d98897b2a8ddad664 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Sun, 3 Aug 2025 10:40:48 +0100 Subject: [PATCH 27/28] fix ci - merge path with blob --- .github/workflows/e2e-tests.yml | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index db757345..200ecd02 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -86,26 +86,26 @@ jobs: - name: Merge into HTML Report run: npx playwright merge-reports --reporter html ./all-blob-reports - - name: Download JSON reports - uses: actions/download-artifact@v4 - with: - path: all-json-reports - pattern: json-report-* - merge-multiple: true - - - name: Debug JSON reports directory - run: | - echo "=== Contents of all-json-reports ===" - ls -la all-json-reports/ - echo "=== Recursive listing ===" - find all-json-reports -type f -name "*.json" - echo "=== Current working directory ===" - pwd - echo "=== Directory structure ===" - tree all-json-reports || find all-json-reports -type f + # - name: Download JSON reports + # uses: actions/download-artifact@v4 + # with: + # path: all-json-reports + # pattern: json-report-* + # merge-multiple: true + + # - name: Debug JSON reports directory + # run: | + # echo "=== Contents of all-json-reports ===" + # ls -la all-json-reports/ + # echo "=== Recursive listing ===" + # find all-json-reports -type f -name "*.json" + # echo "=== Current working directory ===" + # pwd + # echo "=== Directory structure ===" + # tree all-json-reports || find all-json-reports -type f - name: Merge JSON reports - run: npx playwright merge-reports --reporter json all-json-reports/*.json + run: npx playwright merge-reports --reporter json ./all-blob-reports - name: Generate summary comment uses: daun/playwright-report-summary@v3 From a7ae8c8593e4dcb39b73c02ec8df695978520df0 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Sun, 3 Aug 2025 10:54:55 +0100 Subject: [PATCH 28/28] fix ci - save merged report to json --- .github/workflows/e2e-tests.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 200ecd02..d9ed767d 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -42,7 +42,8 @@ jobs: run: npm run build - name: Run Playwright tests - run: PLAYWRIGHT_JSON_OUTPUT_NAME=json-report-${{ matrix.shardIndex }}.json npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --reporter=blob,json + # PLAYWRIGHT_JSON_OUTPUT_NAME=json-report-${{ matrix.shardIndex }}.json + run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --reporter=blob,json env: TEST_SUPABASE_URL: http://localhost:54321 TEST_SUPABASE_ANON_KEY: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCN9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0 @@ -54,12 +55,12 @@ jobs: path: blob-report retention-days: 1 - - uses: actions/upload-artifact@v4 - if: ${{ !cancelled() }} - with: - name: json-report-${{ matrix.shardIndex }}.json - path: json-report-${{ matrix.shardIndex }}.json - retention-days: 1 + # - uses: actions/upload-artifact@v4 + # if: ${{ !cancelled() }} + # with: + # name: json-report-${{ matrix.shardIndex }}.json + # path: json-report-${{ matrix.shardIndex }}.json + # retention-days: 1 report: needs: test @@ -83,8 +84,8 @@ jobs: pattern: blob-report-* merge-multiple: true - - name: Merge into HTML Report - run: npx playwright merge-reports --reporter html ./all-blob-reports + # - name: Merge into HTML Report + # run: npx playwright merge-reports --reporter html ./all-blob-reports # - name: Download JSON reports # uses: actions/download-artifact@v4 @@ -105,7 +106,7 @@ jobs: # tree all-json-reports || find all-json-reports -type f - name: Merge JSON reports - run: npx playwright merge-reports --reporter json ./all-blob-reports + run: npx playwright merge-reports --reporter json ./all-blob-reports > ./all-json-reports.json - name: Generate summary comment uses: daun/playwright-report-summary@v3