diff --git a/.gitignore b/.gitignore index ab5b1c7..f5d4569 100644 --- a/.gitignore +++ b/.gitignore @@ -21,9 +21,9 @@ package-lock.json .vscode/ # Build artifacts -desktop/frontend/dist/ -e2e/harness/src/api/generated.* -e2e/harness/test-results/ +examples/django-react-desktop-app/frontend/dist/ +examples/django-react-site/harness/src/api/generated.* +examples/django-react-site/harness/test-results/ # Env .env diff --git a/Makefile b/Makefile index 8e79305..e5fd3ce 100644 --- a/Makefile +++ b/Makefile @@ -27,11 +27,11 @@ test-integration: docker-up # ─── Docker ────────────────────────────────────────────────────────────────── docker-up: - docker compose -f docker-compose.test.yml up -d --build + docker compose -f examples/django-react-site/docker-compose.test.yml up -d --build @echo "Backend starting at http://localhost:8000" docker-down: - docker compose -f docker-compose.test.yml down + docker compose -f examples/django-react-site/docker-compose.test.yml down # ─── All ───────────────────────────────────────────────────────────────────── @@ -40,7 +40,7 @@ test-all: test test-integration # ─── Cleanup ───────────────────────────────────────────────────────────────── clean: - docker compose -f docker-compose.test.yml down -v --remove-orphans 2>/dev/null || true + docker compose -f examples/django-react-site/docker-compose.test.yml down -v --remove-orphans 2>/dev/null || true rm -rf django/src/mizan.egg-info django/dist django/build rm -rf react/dist react/node_modules rm -f examples/django-react-site/backend/db.sqlite3 diff --git a/README.md b/README.md index 352ee00..952a5a6 100644 --- a/README.md +++ b/README.md @@ -275,7 +275,7 @@ cd django && uv sync --extra dev --extra channels && uv run pytest cd react && npm test # E2E integration tests (real browser, real backend) -docker compose -f docker-compose.test.yml up -d +docker compose -f examples/django-react-site/docker-compose.test.yml up -d cd examples/django-react-site/harness && npm install && npx mizan-generate && npx vite --port 5174 & npx playwright test diff --git a/Dockerfile.test b/examples/django-react-site/Dockerfile.test similarity index 100% rename from Dockerfile.test rename to examples/django-react-site/Dockerfile.test diff --git a/docker-compose.test.yml b/examples/django-react-site/docker-compose.test.yml similarity index 76% rename from docker-compose.test.yml rename to examples/django-react-site/docker-compose.test.yml index 7793927..5486b10 100644 --- a/docker-compose.test.yml +++ b/examples/django-react-site/docker-compose.test.yml @@ -6,8 +6,8 @@ services: django: build: - context: . - dockerfile: Dockerfile.test + context: ../.. + dockerfile: examples/django-react-site/Dockerfile.test ports: - "8000:8000" depends_on: diff --git a/package.json b/examples/django-react-site/package.json similarity index 100% rename from package.json rename to examples/django-react-site/package.json diff --git a/playwright.config.ts b/examples/django-react-site/playwright.config.ts similarity index 86% rename from playwright.config.ts rename to examples/django-react-site/playwright.config.ts index 2c72c6d..f4c9555 100644 --- a/playwright.config.ts +++ b/examples/django-react-site/playwright.config.ts @@ -1,7 +1,7 @@ import { defineConfig } from '@playwright/test' export default defineConfig({ - testDir: './examples/django-react-site', + testDir: '.', timeout: 15000, retries: 0, reporter: 'list',