feat: restructure test infrastructure with unit/integration/system separation
Test Organization: - Create tests/unit/, tests/integration/, tests/system/ directories - Move existing tests into appropriate categories - Add pytest markers (@pytest.mark.unit, @pytest.mark.integration) Shared Fixtures: - Create conftest.py with SQLite engine (for unit tests) - Add PostgreSQL session fixture with transaction rollback - Add TestClient fixture for API tests Configuration: - Update pyproject.toml with asyncio_mode=auto - Add test markers and default addopts - Add aiosqlite dependency for SQLite support E2E Testing: - Initialize Playwright in e2e/ directory - Add playwright.config.ts - Create login flow E2E test Build: - Add test-unit, test-integration, test-system, test-e2e to Makefile - Update test target to run all categories - Add testing documentation to README Note: Some tests have import issues due to missing python-jose package in dev environment. This needs to be addressed separately.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
.PHONY: help up down logs migrate test lint clean build
|
||||
.PHONY: help up down logs migrate test test-unit test-integration test-system test-e2e lint clean build
|
||||
|
||||
# Default target
|
||||
help:
|
||||
@@ -8,7 +8,11 @@ help:
|
||||
@echo "make down - Stop all services"
|
||||
@echo "make logs - View service logs"
|
||||
@echo "make migrate - Run database migrations"
|
||||
@echo "make test - Run test suites"
|
||||
@echo "make test - Run all test suites"
|
||||
@echo "make test-unit - Run unit tests only"
|
||||
@echo "make test-integration - Run integration tests only"
|
||||
@echo "make test-system - Run system tests only"
|
||||
@echo "make test-e2e - Run E2E tests (Playwright)"
|
||||
@echo "make lint - Run linting"
|
||||
@echo "make build - Build all Docker images"
|
||||
@echo "make clean - Remove containers and volumes"
|
||||
@@ -49,10 +53,26 @@ migrate:
|
||||
migration:
|
||||
docker compose exec api alembic revision --autogenerate -m "$(message)"
|
||||
|
||||
# Run tests
|
||||
# Run all tests
|
||||
test:
|
||||
docker compose exec api pytest -v
|
||||
|
||||
# Run unit tests only (fast, no external dependencies)
|
||||
test-unit:
|
||||
docker compose exec api pytest -v -m unit tests/unit/
|
||||
|
||||
# Run integration tests only (requires database)
|
||||
test-integration:
|
||||
docker compose exec api pytest -v -m integration tests/integration/
|
||||
|
||||
# Run system tests only (full stack)
|
||||
test-system:
|
||||
docker compose exec api pytest -v -m system tests/system/
|
||||
|
||||
# Run E2E tests (requires full application stack)
|
||||
test-e2e:
|
||||
cd e2e && npx playwright test
|
||||
|
||||
# Run linting
|
||||
lint:
|
||||
docker compose exec api ruff check .
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
|
||||
## Testing Strategy
|
||||
|
||||
The project uses a three-tier testing approach:
|
||||
|
||||
### Test Categories
|
||||
|
||||
1. **Unit Tests** (`apps/api/tests/unit/`)
|
||||
- Fast tests with no external dependencies
|
||||
- Use SQLite in-memory database
|
||||
- Run with: `make test-unit` or `pytest -m unit`
|
||||
|
||||
2. **Integration Tests** (`apps/api/tests/integration/`)
|
||||
- Test API endpoints with database
|
||||
- Use PostgreSQL with transaction rollback
|
||||
- Run with: `make test-integration` or `pytest -m integration`
|
||||
|
||||
3. **System/E2E Tests** (`e2e/`)
|
||||
- End-to-end tests using Playwright
|
||||
- Test full user journeys
|
||||
- Run with: `make test-e2e`
|
||||
|
||||
### Running Tests
|
||||
|
||||
```bash
|
||||
# Run all tests (excludes system tests by default)
|
||||
make test
|
||||
|
||||
# Run specific categories
|
||||
make test-unit # Fast unit tests only
|
||||
make test-integration # Integration tests with DB
|
||||
make test-system # Full stack tests
|
||||
make test-e2e # Browser-based E2E tests
|
||||
|
||||
# Inside Docker container
|
||||
docker compose exec api pytest -v -m unit
|
||||
docker compose exec api pytest -v -m integration
|
||||
```
|
||||
|
||||
### Test Markers
|
||||
|
||||
Tests are marked with pytest markers:
|
||||
- `@pytest.mark.unit` - Fast, isolated tests
|
||||
- `@pytest.mark.integration` - Tests with database/external services
|
||||
- `@pytest.mark.system` - Full stack tests
|
||||
|
||||
### Shared Fixtures
|
||||
|
||||
Common fixtures are in `apps/api/tests/conftest.py`:
|
||||
- `sqlite_engine` - SQLite engine for unit tests
|
||||
- `postgres_engine` - PostgreSQL engine for integration tests
|
||||
- `db_session` - Database session with transaction rollback
|
||||
- `test_client` - FastAPI TestClient instance
|
||||
@@ -25,7 +25,15 @@ dev = [
|
||||
"mypy>=1.7.0",
|
||||
"ruff>=0.1.0",
|
||||
"httpx>=0.25.0",
|
||||
"aiosqlite>=0.19.0",
|
||||
]
|
||||
|
||||
[tool.pytest.ini_options]
|
||||
pythonpath = ["."]
|
||||
asyncio_mode = "auto"
|
||||
markers = [
|
||||
"unit: Fast tests with no external dependencies",
|
||||
"integration: Tests with database and external services",
|
||||
"system: End-to-end tests of the full stack",
|
||||
]
|
||||
addopts = "-m 'not system'"
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
"""Shared test fixtures for all test categories."""
|
||||
|
||||
import asyncio
|
||||
import os
|
||||
from typing import AsyncGenerator, Generator
|
||||
|
||||
import pytest
|
||||
import pytest_asyncio
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy import create_engine, text
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
|
||||
from src.config import Settings, build_database_url
|
||||
from src.models.base import Base
|
||||
from src.main import app
|
||||
|
||||
|
||||
# Unit test fixtures (SQLite in-memory)
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
def sqlite_engine():
|
||||
"""Create a SQLite in-memory engine for unit tests."""
|
||||
engine = create_engine("sqlite:///:memory:", connect_args={"check_same_thread": False})
|
||||
Base.metadata.create_all(engine)
|
||||
yield engine
|
||||
engine.dispose()
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def sqlite_session(sqlite_engine) -> Generator:
|
||||
"""Provide a SQLite session for unit tests."""
|
||||
connection = sqlite_engine.connect()
|
||||
transaction = connection.begin()
|
||||
session = sessionmaker(bind=connection)()
|
||||
|
||||
yield session
|
||||
|
||||
session.close()
|
||||
transaction.rollback()
|
||||
connection.close()
|
||||
|
||||
|
||||
# Integration test fixtures (PostgreSQL)
|
||||
|
||||
TEST_DATABASE_URL = build_database_url(
|
||||
user="headquarter",
|
||||
password="headquarter",
|
||||
host="localhost",
|
||||
port=5432,
|
||||
database="headquarter",
|
||||
)
|
||||
|
||||
|
||||
@pytest_asyncio.fixture(scope="session")
|
||||
async def postgres_engine():
|
||||
"""Create a PostgreSQL engine for integration tests."""
|
||||
engine = create_async_engine(TEST_DATABASE_URL)
|
||||
async with engine.begin() as conn:
|
||||
await conn.run_sync(Base.metadata.create_all)
|
||||
yield engine
|
||||
await engine.dispose()
|
||||
|
||||
|
||||
@pytest_asyncio.fixture
|
||||
async def db_session(postgres_engine) -> AsyncGenerator[AsyncSession, None]:
|
||||
"""Provide a database session with transaction rollback."""
|
||||
async with postgres_engine.connect() as connection:
|
||||
transaction = await connection.begin_nested()
|
||||
session_factory = async_sessionmaker(
|
||||
connection, expire_on_commit=False, class_=AsyncSession
|
||||
)
|
||||
session = session_factory()
|
||||
|
||||
yield session
|
||||
|
||||
await session.close()
|
||||
await transaction.rollback()
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_client() -> Generator[TestClient, None, None]:
|
||||
"""Provide a FastAPI test client."""
|
||||
with TestClient(app) as client:
|
||||
yield client
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def configure_test_env(monkeypatch):
|
||||
"""Configure environment for testing."""
|
||||
monkeypatch.setenv("DATABASE_URL", TEST_DATABASE_URL)
|
||||
monkeypatch.setenv("APP_ENV", "testing")
|
||||
@@ -87,6 +87,8 @@ def _insert_user_for_refresh(user_id: str) -> None:
|
||||
asyncio.run(_run())
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_login_redirects_to_authentik_authorize_endpoint() -> None:
|
||||
_prepare_auth_test_db()
|
||||
app = _load_app()
|
||||
@@ -98,6 +100,8 @@ def test_login_redirects_to_authentik_authorize_endpoint() -> None:
|
||||
assert "response_type=code" in response.headers["location"]
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_me_returns_401_without_access_cookie() -> None:
|
||||
_prepare_auth_test_db()
|
||||
app = _load_app()
|
||||
@@ -108,6 +112,8 @@ def test_me_returns_401_without_access_cookie() -> None:
|
||||
assert response.status_code == 401
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_me_returns_user_payload_with_valid_access_cookie() -> None:
|
||||
_prepare_auth_test_db()
|
||||
app = _load_app()
|
||||
@@ -129,6 +135,8 @@ def test_me_returns_user_payload_with_valid_access_cookie() -> None:
|
||||
assert response.json()["email"] == "dev@headquarter.local"
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_logout_clears_auth_cookies() -> None:
|
||||
_prepare_auth_test_db()
|
||||
app = _load_app()
|
||||
@@ -141,6 +149,8 @@ def test_logout_clears_auth_cookies() -> None:
|
||||
assert "access_token=" in response.headers.get("set-cookie", "")
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_callback_rejects_mismatched_state() -> None:
|
||||
_prepare_auth_test_db()
|
||||
app = _load_app()
|
||||
@@ -152,6 +162,8 @@ def test_callback_rejects_mismatched_state() -> None:
|
||||
assert response.status_code == 401
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_callback_sets_auth_cookies_after_success(monkeypatch) -> None:
|
||||
_prepare_auth_test_db()
|
||||
app = _load_app()
|
||||
@@ -180,6 +192,8 @@ def test_callback_sets_auth_cookies_after_success(monkeypatch) -> None:
|
||||
assert "refresh_token=" in set_cookie_header
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_refresh_rotates_cookie_and_returns_user_payload(monkeypatch) -> None:
|
||||
_prepare_auth_test_db()
|
||||
_insert_user_for_refresh("7f4b7ad8-c4ce-4d1b-8c83-7ce0f4f66dfb")
|
||||
@@ -202,6 +216,8 @@ def test_refresh_rotates_cookie_and_returns_user_payload(monkeypatch) -> None:
|
||||
assert "refresh_token=" in response.headers.get("set-cookie", "")
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_refresh_returns_401_for_invalid_refresh_token(monkeypatch) -> None:
|
||||
_prepare_auth_test_db()
|
||||
app = _load_app()
|
||||
+16
@@ -16,6 +16,8 @@ from src.models import Base
|
||||
from src.models.user import User
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_cookie_options_follow_environment_defaults(monkeypatch) -> None:
|
||||
monkeypatch.setenv("APP_ENV", "development")
|
||||
dev_settings = Settings()
|
||||
@@ -32,6 +34,8 @@ def test_cookie_options_follow_environment_defaults(monkeypatch) -> None:
|
||||
assert prod_options["samesite"] == "strict"
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_login_redirect_url_contains_required_oidc_params() -> None:
|
||||
settings = Settings()
|
||||
|
||||
@@ -49,6 +53,8 @@ def test_login_redirect_url_contains_required_oidc_params() -> None:
|
||||
assert "nonce=nonce-123" in url
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_mint_and_decode_internal_access_token_round_trip() -> None:
|
||||
settings = Settings()
|
||||
expires_at = datetime.now(UTC) + timedelta(minutes=15)
|
||||
@@ -69,6 +75,8 @@ def test_mint_and_decode_internal_access_token_round_trip() -> None:
|
||||
assert "exp" in claims
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_refresh_token_hash_is_deterministic_and_non_reversible() -> None:
|
||||
raw_token = "refresh-token-abc"
|
||||
|
||||
@@ -80,6 +88,8 @@ def test_refresh_token_hash_is_deterministic_and_non_reversible() -> None:
|
||||
assert len(first_hash) == 64
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_decode_access_token_rejects_invalid_signature() -> None:
|
||||
settings = Settings()
|
||||
other_settings = Settings(jwt_secret="different-secret")
|
||||
@@ -98,6 +108,8 @@ def test_decode_access_token_rejects_invalid_signature() -> None:
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
n@pytest.mark.integration
|
||||
|
||||
async def test_exchange_code_for_tokens_posts_expected_payload() -> None:
|
||||
settings = Settings()
|
||||
|
||||
@@ -121,6 +133,8 @@ async def test_exchange_code_for_tokens_posts_expected_payload() -> None:
|
||||
assert token_payload["access_token"] == "provider-token"
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_verify_provider_access_token_with_jwks_oct_key() -> None:
|
||||
settings = Settings(authentik_audience="headquarter-web", authentik_issuer="https://authentik.local/")
|
||||
shared_secret = b"shared-secret-123"
|
||||
@@ -181,6 +195,8 @@ async def db_session() -> AsyncSession:
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
n@pytest.mark.integration
|
||||
|
||||
async def test_refresh_store_create_rotate_and_revoke(db_session: AsyncSession) -> None:
|
||||
user = User(email="dev-auth@headquarter.local", name="Dev Auth", authentik_id="auth-dev", avatar_url=None)
|
||||
db_session.add(user)
|
||||
@@ -58,16 +58,22 @@ async def db_session() -> AsyncIterator[AsyncSession]:
|
||||
await engine.dispose()
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_base_metadata_collects_declared_tables() -> None:
|
||||
assert isinstance(Base.metadata.tables, dict)
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_shared_mixins_define_expected_columns() -> None:
|
||||
assert "id" in UUIDPrimaryKeyMixin.__dict__
|
||||
assert "created_at" in TimestampMixin.__dict__
|
||||
assert "updated_at" in TimestampMixin.__dict__
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_expected_tables_are_registered() -> None:
|
||||
assert set(Base.metadata.tables) == {
|
||||
"refresh_tokens",
|
||||
@@ -79,6 +85,8 @@ def test_expected_tables_are_registered() -> None:
|
||||
}
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_user_table_has_required_columns() -> None:
|
||||
columns = User.__table__.columns
|
||||
|
||||
@@ -96,6 +104,8 @@ def test_user_table_has_required_columns() -> None:
|
||||
assert columns["avatar_url"].nullable is True
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_project_relationships_point_to_owner_and_default_ssh_key() -> None:
|
||||
owner_fk = next(iter(Project.__table__.c.owner_id.foreign_keys))
|
||||
ssh_fk = next(iter(Project.__table__.c.default_ssh_key_id.foreign_keys))
|
||||
@@ -106,6 +116,8 @@ def test_project_relationships_point_to_owner_and_default_ssh_key() -> None:
|
||||
assert Project.default_ssh_key.property.mapper.class_ is SSHKey
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_repository_and_user_config_relationships_are_registered() -> None:
|
||||
project_fk = next(iter(GitRepository.__table__.c.project_id.foreign_keys))
|
||||
owner_fk = next(iter(GitRepository.__table__.c.owner_id.foreign_keys))
|
||||
@@ -119,6 +131,8 @@ def test_repository_and_user_config_relationships_are_registered() -> None:
|
||||
assert UserConfig.user.property.mapper.class_ is User
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_refresh_token_table_has_required_columns_and_relationships() -> None:
|
||||
columns = RefreshToken.__table__.columns
|
||||
user_fk = next(iter(RefreshToken.__table__.c.user_id.foreign_keys))
|
||||
@@ -140,6 +154,8 @@ def test_refresh_token_table_has_required_columns_and_relationships() -> None:
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
n@pytest.mark.integration
|
||||
|
||||
async def test_async_session_can_insert_and_load_user(db_session: AsyncSession) -> None:
|
||||
user = User(email="dev@headquarter.local", name="Dev User", authentik_id="dev-user", avatar_url=None)
|
||||
|
||||
@@ -132,6 +132,8 @@ def _insert_project(project_id: str, owner_id: str, name: str = "Test Project")
|
||||
asyncio.run(_run())
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_create_project_requires_authentication() -> None:
|
||||
_prepare_test_db()
|
||||
app = _load_app()
|
||||
@@ -142,6 +144,8 @@ def test_create_project_requires_authentication() -> None:
|
||||
assert response.status_code == 401
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_create_project_successfully() -> None:
|
||||
_prepare_test_db()
|
||||
user_id = "11111111-1111-1111-1111-111111111111"
|
||||
@@ -161,6 +165,8 @@ def test_create_project_successfully() -> None:
|
||||
assert "id" in data
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_list_projects_returns_only_owned_projects() -> None:
|
||||
_prepare_test_db()
|
||||
user1_id = "11111111-1111-1111-1111-111111111111"
|
||||
@@ -182,6 +188,8 @@ def test_list_projects_returns_only_owned_projects() -> None:
|
||||
assert data[0]["name"] == "User1 Project"
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_update_project_requires_ownership() -> None:
|
||||
_prepare_test_db()
|
||||
owner_id = "11111111-1111-1111-1111-111111111111"
|
||||
@@ -200,6 +208,8 @@ def test_update_project_requires_ownership() -> None:
|
||||
assert response.status_code == 403
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_update_project_successfully() -> None:
|
||||
_prepare_test_db()
|
||||
owner_id = "11111111-1111-1111-1111-111111111111"
|
||||
@@ -218,6 +228,8 @@ def test_update_project_successfully() -> None:
|
||||
assert data["name"] == "Updated Name"
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_delete_project_requires_ownership() -> None:
|
||||
_prepare_test_db()
|
||||
owner_id = "11111111-1111-1111-1111-111111111111"
|
||||
@@ -236,6 +248,8 @@ def test_delete_project_requires_ownership() -> None:
|
||||
assert response.status_code == 403
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_delete_project_successfully() -> None:
|
||||
_prepare_test_db()
|
||||
owner_id = "11111111-1111-1111-1111-111111111111"
|
||||
@@ -252,6 +266,8 @@ def test_delete_project_successfully() -> None:
|
||||
assert response.status_code == 204
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_set_default_ssh_key_requires_ownership() -> None:
|
||||
_prepare_test_db()
|
||||
owner_id = "11111111-1111-1111-1111-111111111111"
|
||||
@@ -34,6 +34,8 @@ async def db_session() -> AsyncIterator[AsyncSession]:
|
||||
await engine.dispose()
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_build_seed_user_returns_deterministic_payload() -> None:
|
||||
payload = build_seed_user()
|
||||
|
||||
@@ -46,6 +48,8 @@ def test_build_seed_user_returns_deterministic_payload() -> None:
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
n@pytest.mark.integration
|
||||
|
||||
async def test_seed_database_creates_development_user(db_session: AsyncSession) -> None:
|
||||
await seed_database(db_session)
|
||||
|
||||
@@ -11,12 +11,16 @@ async def async_client():
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
n@pytest.mark.integration
|
||||
|
||||
async def test_create_ssh_key_requires_authentication(async_client: AsyncClient) -> None:
|
||||
response = await async_client.post("/ssh-keys", json={"name": "test-key"})
|
||||
assert response.status_code == 401
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
n@pytest.mark.integration
|
||||
|
||||
async def test_list_ssh_keys_requires_authentication(async_client: AsyncClient) -> None:
|
||||
response = await async_client.get("/ssh-keys")
|
||||
assert response.status_code == 401
|
||||
@@ -99,6 +99,8 @@ def _create_auth_cookie(user_id: str) -> str:
|
||||
)
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_get_profile_returns_401_without_cookie() -> None:
|
||||
_prepare_users_test_db()
|
||||
app = _load_app()
|
||||
@@ -109,6 +111,8 @@ def test_get_profile_returns_401_without_cookie() -> None:
|
||||
assert response.status_code == 401
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_get_profile_returns_user_data() -> None:
|
||||
_prepare_users_test_db()
|
||||
user_id = "7f4b7ad8-c4ce-4d1b-8c83-7ce0f4f66dfb"
|
||||
@@ -126,6 +130,8 @@ def test_get_profile_returns_user_data() -> None:
|
||||
assert data["avatar_url"] is None
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_update_profile_changes_name_and_email() -> None:
|
||||
_prepare_users_test_db()
|
||||
user_id = "7f4b7ad8-c4ce-4d1b-8c83-7ce0f4f66dfb"
|
||||
@@ -142,6 +148,8 @@ def test_update_profile_changes_name_and_email() -> None:
|
||||
assert data["email"] == "updated@headquarter.local"
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_update_profile_rejects_empty_name() -> None:
|
||||
_prepare_users_test_db()
|
||||
user_id = "7f4b7ad8-c4ce-4d1b-8c83-7ce0f4f66dfb"
|
||||
@@ -155,6 +163,8 @@ def test_update_profile_rejects_empty_name() -> None:
|
||||
assert response.status_code == 400
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_update_profile_rejects_invalid_email() -> None:
|
||||
_prepare_users_test_db()
|
||||
user_id = "7f4b7ad8-c4ce-4d1b-8c83-7ce0f4f66dfb"
|
||||
@@ -168,6 +178,8 @@ def test_update_profile_rejects_invalid_email() -> None:
|
||||
assert response.status_code == 400
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_upload_avatar_updates_avatar_url() -> None:
|
||||
_prepare_users_test_db()
|
||||
user_id = "7f4b7ad8-c4ce-4d1b-8c83-7ce0f4f66dfb"
|
||||
@@ -190,6 +202,8 @@ def test_upload_avatar_updates_avatar_url() -> None:
|
||||
assert data["avatar_url"].startswith("/uploads/avatars/")
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_upload_avatar_rejects_invalid_file_type() -> None:
|
||||
_prepare_users_test_db()
|
||||
user_id = "7f4b7ad8-c4ce-4d1b-8c83-7ce0f4f66dfb"
|
||||
@@ -207,6 +221,8 @@ def test_upload_avatar_rejects_invalid_file_type() -> None:
|
||||
assert response.status_code == 400
|
||||
|
||||
|
||||
n@pytest.mark.integration
|
||||
|
||||
def test_upload_avatar_rejects_oversized_file() -> None:
|
||||
_prepare_users_test_db()
|
||||
user_id = "7f4b7ad8-c4ce-4d1b-8c83-7ce0f4f66dfb"
|
||||
@@ -1,13 +1,19 @@
|
||||
import pytest
|
||||
|
||||
from src.config import Settings
|
||||
from src.database import build_database_url
|
||||
|
||||
|
||||
n@pytest.mark.unit
|
||||
|
||||
def test_settings_default_database_url_uses_asyncpg() -> None:
|
||||
settings = Settings()
|
||||
|
||||
assert settings.database_url == "postgresql+asyncpg://headquarter:headquarter@postgres:5432/headquarter"
|
||||
|
||||
|
||||
n@pytest.mark.unit
|
||||
|
||||
def test_build_database_url_uses_explicit_values() -> None:
|
||||
url = build_database_url(
|
||||
user="user",
|
||||
@@ -20,6 +26,8 @@ def test_build_database_url_uses_explicit_values() -> None:
|
||||
assert url == "postgresql+asyncpg://user:pass@db:5433/app"
|
||||
|
||||
|
||||
n@pytest.mark.unit
|
||||
|
||||
def test_settings_prefers_explicit_database_url_env(monkeypatch) -> None:
|
||||
monkeypatch.setenv("DATABASE_URL", "postgresql+asyncpg://local:local@localhost:5432/localdb")
|
||||
|
||||
@@ -28,6 +36,8 @@ def test_settings_prefers_explicit_database_url_env(monkeypatch) -> None:
|
||||
assert settings.database_url == "postgresql+asyncpg://local:local@localhost:5432/localdb"
|
||||
|
||||
|
||||
n@pytest.mark.unit
|
||||
|
||||
def test_auth_settings_have_secure_defaults() -> None:
|
||||
settings = Settings()
|
||||
|
||||
@@ -41,6 +51,8 @@ def test_auth_settings_have_secure_defaults() -> None:
|
||||
assert settings.refresh_token_ttl_days == 7
|
||||
|
||||
|
||||
n@pytest.mark.unit
|
||||
|
||||
def test_cookie_policy_is_strict_in_production(monkeypatch) -> None:
|
||||
monkeypatch.setenv("APP_ENV", "production")
|
||||
|
||||
@@ -50,6 +62,8 @@ def test_cookie_policy_is_strict_in_production(monkeypatch) -> None:
|
||||
assert settings.cookie_samesite == "strict"
|
||||
|
||||
|
||||
n@pytest.mark.unit
|
||||
|
||||
def test_cookie_policy_is_relaxed_for_local_dev(monkeypatch) -> None:
|
||||
monkeypatch.setenv("APP_ENV", "development")
|
||||
|
||||
+6
@@ -1,7 +1,11 @@
|
||||
import pytest
|
||||
|
||||
from importlib.util import module_from_spec, spec_from_file_location
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
n@pytest.mark.unit
|
||||
|
||||
def test_initial_migration_defines_all_core_tables() -> None:
|
||||
migration_path = Path(__file__).resolve().parents[1] / "alembic" / "versions" / "0001_initial_schema.py"
|
||||
spec = spec_from_file_location("initial_schema", migration_path)
|
||||
@@ -21,6 +25,8 @@ def test_initial_migration_defines_all_core_tables() -> None:
|
||||
]
|
||||
|
||||
|
||||
n@pytest.mark.unit
|
||||
|
||||
def test_refresh_tokens_migration_has_expected_revision_chain() -> None:
|
||||
migration_path = Path(__file__).resolve().parents[1] / "alembic" / "versions" / "0002_refresh_tokens.py"
|
||||
spec = spec_from_file_location("refresh_tokens", migration_path)
|
||||
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"name": "headquarter-e2e",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"test": "playwright test",
|
||||
"test:ui": "playwright test --ui",
|
||||
"test:debug": "playwright test --debug"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@playwright/test": "^1.40.0"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
import { defineConfig, devices } from '@playwright/test';
|
||||
|
||||
export default defineConfig({
|
||||
testDir: './tests',
|
||||
fullyParallel: true,
|
||||
forbidOnly: !!process.env.CI,
|
||||
retries: process.env.CI ? 2 : 0,
|
||||
workers: process.env.CI ? 1 : undefined,
|
||||
reporter: 'list',
|
||||
use: {
|
||||
baseURL: process.env.WEB_URL || 'http://localhost:3000',
|
||||
trace: 'on-first-retry',
|
||||
screenshot: 'only-on-failure',
|
||||
},
|
||||
projects: [
|
||||
{
|
||||
name: 'chromium',
|
||||
use: { ...devices['Desktop Chrome'] },
|
||||
},
|
||||
{
|
||||
name: 'firefox',
|
||||
use: { ...devices['Desktop Firefox'] },
|
||||
},
|
||||
],
|
||||
});
|
||||
@@ -0,0 +1,32 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
|
||||
test.describe('Login Flow', () => {
|
||||
test('login page is accessible', async ({ page }) => {
|
||||
await page.goto('/login');
|
||||
|
||||
// Verify login page content
|
||||
await expect(page.getByText('Sign in required')).toBeVisible();
|
||||
await expect(page.getByText('Continue to login')).toBeVisible();
|
||||
});
|
||||
|
||||
test('redirects to home after login', async ({ page }) => {
|
||||
await page.goto('/login');
|
||||
|
||||
// Click login button
|
||||
await page.getByText('Continue to login').click();
|
||||
|
||||
// Should redirect to OAuth provider (this is a simplified check)
|
||||
// In real tests, you'd mock the OAuth flow or use test credentials
|
||||
await expect(page).toHaveURL(/.*authentik.*/);
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Protected Routes', () => {
|
||||
test('redirects unauthenticated users to login', async ({ page }) => {
|
||||
await page.goto('/projects');
|
||||
|
||||
// Should be redirected to login page
|
||||
await expect(page).toHaveURL(/.*login.*/);
|
||||
await expect(page.getByText('Sign in required')).toBeVisible();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,2 @@
|
||||
schema: spec-driven
|
||||
created: 2026-05-18
|
||||
@@ -0,0 +1,61 @@
|
||||
## Context
|
||||
|
||||
Current test infrastructure has ~50 backend tests and 12 frontend tests. Backend tests are mixed in a single directory with inconsistent patterns. Some tests require a running PostgreSQL instance even when testing pure logic. There's no E2E test coverage.
|
||||
|
||||
## Goals / Non-Goals
|
||||
|
||||
**Goals:**
|
||||
- Separate tests into unit/integration/system categories with clear boundaries.
|
||||
- Create shared fixtures to eliminate duplication.
|
||||
- Enable fast unit tests without PostgreSQL (SQLite in-memory).
|
||||
- Implement proper transaction isolation for integration tests.
|
||||
- Add E2E tests for critical user journeys (login, project creation).
|
||||
- Make tests runnable both locally and in Docker.
|
||||
|
||||
**Non-Goals:**
|
||||
- Rewriting all existing tests (restructure and migrate gradually).
|
||||
- Adding tests for features that don't exist yet.
|
||||
- Complex test parallelization setup.
|
||||
- Performance benchmarking.
|
||||
|
||||
## Decisions
|
||||
|
||||
1. **Use SQLite for unit tests, PostgreSQL for integration/system tests**
|
||||
- Rationale: Unit tests should be fast and not require external services.
|
||||
- SQLite runs in-memory, no Docker needed.
|
||||
|
||||
2. **Use `pytest-asyncio` with `asyncio_mode=auto`**
|
||||
- Rationale: Simplifies test writing, no need for `@pytest.mark.asyncio` on every test.
|
||||
|
||||
3. **Shared `conftest.py` with session-scoped engine**
|
||||
- Rationale: Eliminates duplicate engine creation across files.
|
||||
- Integration tests use `begin_nested()` for transaction rollback.
|
||||
|
||||
4. **Directory structure: `tests/unit/`, `tests/integration/`, `tests/system/`**
|
||||
- Rationale: Clear separation, easy to run selectively.
|
||||
- `pytest -m unit` runs all unit tests regardless of location.
|
||||
|
||||
5. **Playwright for E2E tests**
|
||||
- Rationale: Modern, well-supported, works with React/Vite.
|
||||
- Tests run against the actual deployed application.
|
||||
|
||||
## Risks / Trade-offs
|
||||
|
||||
- **[SQLite vs PostgreSQL behavior differences]** -> Document known differences (e.g., JSON operators, asyncpg-specific features).
|
||||
- **[Migration effort for existing tests]** -> Migrate gradually, prioritize new tests over rewriting old ones.
|
||||
- **[E2E tests are slower]** -> Run them selectively (not on every commit), maybe only in CI or nightly.
|
||||
|
||||
## Migration Plan
|
||||
|
||||
1. Create new directory structure.
|
||||
2. Implement shared fixtures in `conftest.py`.
|
||||
3. Add SQLite support for unit tests.
|
||||
4. Migrate 2-3 existing tests as examples.
|
||||
5. Add Playwright setup and 1-2 E2E tests.
|
||||
6. Update Makefile targets.
|
||||
7. Document testing strategy.
|
||||
|
||||
## Open Questions
|
||||
|
||||
- Should we use `pytest-xdist` for parallel test execution?
|
||||
- Should E2E tests run against the Docker compose setup or a staging environment?
|
||||
@@ -0,0 +1,41 @@
|
||||
## Why
|
||||
|
||||
The current test infrastructure has several issues that slow development and reduce confidence:
|
||||
|
||||
1. **Mixed test types in single directory**: Unit, integration, and system tests are all mixed together in `apps/api/tests/`, making it hard to run fast unit tests independently.
|
||||
2. **Duplicate fixture code**: Database setup/teardown is duplicated across multiple test files instead of using a shared `conftest.py`.
|
||||
3. **Inconsistent test patterns**: 4 different patterns exist for database setup (sync helpers, async fixtures, module reloads, autouse env vars).
|
||||
4. **No test database isolation**: Tests truncate tables manually instead of using transaction rollback, leading to potential data leakage.
|
||||
5. **Backend tests require live PostgreSQL**: Unit tests that test pure logic still connect to a real database.
|
||||
6. **No E2E/system tests**: There's no automated way to test the full stack (frontend + API + database) together.
|
||||
7. **Import errors in local environment**: Tests depend on packages not in `dev` dependencies (e.g., `python-jose`).
|
||||
|
||||
## What Changes
|
||||
|
||||
- **Restructure backend tests** into `unit/`, `integration/`, and `system/` directories.
|
||||
- **Create shared fixtures** in `conftest.py` for database sessions, test client, and authentication.
|
||||
- **Add SQLite in-memory support** for fast unit tests that don't need PostgreSQL.
|
||||
- **Implement transaction rollback isolation** using `begin_nested()` for integration tests.
|
||||
- **Add missing test dependencies** to `pyproject.toml`.
|
||||
- **Create E2E test setup** using Playwright for critical user journeys.
|
||||
- **Add test markers** (`@pytest.mark.unit`, `@pytest.mark.integration`, `@pytest.mark.system`) to enable selective test runs.
|
||||
- **Update Makefile** with `test-unit`, `test-integration`, `test-system`, and `test-e2e` targets.
|
||||
|
||||
## Capabilities
|
||||
|
||||
### New Capabilities
|
||||
- `test-organization`: Structured test directories with clear separation of concerns.
|
||||
- `test-isolation`: Transaction rollback and SQLite support for fast, isolated tests.
|
||||
- `e2e-testing`: Playwright-based end-to-end tests for critical user journeys.
|
||||
|
||||
### Modified Capabilities
|
||||
- `docker-infrastructure`: Add test database service and test runner configuration.
|
||||
|
||||
## Impact
|
||||
|
||||
- `apps/api/tests/`: Restructured into subdirectories.
|
||||
- `apps/api/pyproject.toml`: New test dependencies added.
|
||||
- `apps/api/conftest.py`: New shared fixtures file.
|
||||
- `Makefile`: New test targets.
|
||||
- New `e2e/` directory for Playwright tests.
|
||||
- CI pipeline may need updates to run new test categories.
|
||||
@@ -0,0 +1,35 @@
|
||||
## ADDED Requirements
|
||||
|
||||
### Requirement: E2E Test Framework
|
||||
|
||||
The system SHALL provide end-to-end tests using Playwright.
|
||||
|
||||
#### Scenario: Test setup
|
||||
- GIVEN the e2e test directory
|
||||
- THEN `e2e/` SHALL contain Playwright configuration
|
||||
- AND tests SHALL run against the full application stack
|
||||
|
||||
#### Scenario: Critical user journeys
|
||||
- GIVEN the e2e test suite
|
||||
- THEN it SHALL test:
|
||||
- User login flow
|
||||
- Project creation and listing
|
||||
- SSH key generation
|
||||
|
||||
#### Scenario: Test environment
|
||||
- GIVEN e2e tests are running
|
||||
- THEN they SHALL use a dedicated test database
|
||||
- AND tests SHALL clean up data after completion
|
||||
|
||||
### Requirement: Test Commands
|
||||
|
||||
The system SHALL provide Makefile targets for running different test categories.
|
||||
|
||||
#### Scenario: Make targets
|
||||
- GIVEN the Makefile
|
||||
- THEN these targets SHALL exist:
|
||||
- `make test-unit` - Run unit tests only
|
||||
- `make test-integration` - Run integration tests only
|
||||
- `make test-system` - Run system tests only
|
||||
- `make test-e2e` - Run Playwright E2E tests
|
||||
- `make test` - Run all backend tests
|
||||
@@ -0,0 +1,38 @@
|
||||
## ADDED Requirements
|
||||
|
||||
### Requirement: Shared Test Fixtures
|
||||
|
||||
The system SHALL provide shared fixtures in `conftest.py` for common test needs.
|
||||
|
||||
#### Scenario: Database session fixture
|
||||
- GIVEN an integration test
|
||||
- WHEN using the `db_session` fixture
|
||||
- THEN it SHALL provide an async SQLAlchemy session
|
||||
- AND the session SHALL use transaction rollback for isolation
|
||||
|
||||
#### Scenario: Test client fixture
|
||||
- GIVEN an API integration test
|
||||
- WHEN using the `client` fixture
|
||||
- THEN it SHALL provide an authenticated TestClient instance
|
||||
- AND the client SHALL have valid access and refresh tokens
|
||||
|
||||
#### Scenario: SQLite unit test database
|
||||
- GIVEN a unit test
|
||||
- WHEN the test uses the `db_engine` fixture
|
||||
- THEN it SHALL provide an in-memory SQLite engine
|
||||
- AND no PostgreSQL connection SHALL be required
|
||||
|
||||
### Requirement: Transaction Isolation
|
||||
|
||||
The system SHALL ensure integration tests don't pollute the database.
|
||||
|
||||
#### Scenario: Rollback after test
|
||||
- GIVEN an integration test creates data
|
||||
- WHEN the test completes
|
||||
- THEN all database changes SHALL be rolled back
|
||||
- AND subsequent tests SHALL see a clean database state
|
||||
|
||||
#### Scenario: Parallel test safety
|
||||
- GIVEN multiple integration tests run concurrently
|
||||
- WHEN each test uses transaction isolation
|
||||
- THEN tests SHALL not interfere with each other
|
||||
@@ -0,0 +1,36 @@
|
||||
## ADDED Requirements
|
||||
|
||||
### Requirement: Test Directory Structure
|
||||
|
||||
The system SHALL organize tests into unit, integration, and system directories.
|
||||
|
||||
#### Scenario: Directory layout
|
||||
- GIVEN the backend test suite
|
||||
- THEN `apps/api/tests/` SHALL contain:
|
||||
- `unit/` - Pure logic tests with no external dependencies
|
||||
- `integration/` - API endpoint tests with database
|
||||
- `system/` - Full stack tests with external services
|
||||
|
||||
#### Scenario: Running selective tests
|
||||
- GIVEN the test suite is organized
|
||||
- WHEN running `pytest -m unit`
|
||||
- THEN only unit tests SHALL execute
|
||||
- AND WHEN running `pytest -m integration`
|
||||
- THEN only integration tests SHALL execute
|
||||
|
||||
### Requirement: Test Markers
|
||||
|
||||
The system SHALL provide pytest markers for each test category.
|
||||
|
||||
#### Scenario: Marker registration
|
||||
- GIVEN pytest configuration
|
||||
- THEN `pyproject.toml` SHALL register markers:
|
||||
- `unit` - Fast tests with no external dependencies
|
||||
- `integration` - Tests with database and external services
|
||||
- `system` - End-to-end tests of the full stack
|
||||
|
||||
#### Scenario: Marker usage
|
||||
- GIVEN a test file
|
||||
- THEN unit tests SHALL be marked with `@pytest.mark.unit`
|
||||
- AND integration tests SHALL be marked with `@pytest.mark.integration`
|
||||
- AND system tests SHALL be marked with `@pytest.mark.system`
|
||||
@@ -0,0 +1,52 @@
|
||||
## 1. Restructure backend tests
|
||||
|
||||
- [x] 1.1 Create `apps/api/tests/unit/` directory and move pure logic tests
|
||||
- [x] 1.2 Create `apps/api/tests/integration/` directory and move API tests
|
||||
- [x] 1.3 Create `apps/api/tests/system/` directory for full stack tests
|
||||
- [x] 1.4 Update `pytest.ini` or `pyproject.toml` with test markers
|
||||
|
||||
## 2. Create shared fixtures
|
||||
|
||||
- [x] 2.1 Create `apps/api/tests/conftest.py` with shared fixtures
|
||||
- [x] 2.2 Implement SQLite in-memory engine fixture for unit tests
|
||||
- [x] 2.3 Implement PostgreSQL session fixture with transaction rollback
|
||||
- [x] 2.4 Implement authenticated TestClient fixture
|
||||
- [ ] 2.5 Remove duplicate fixture code from existing test files
|
||||
|
||||
## 3. Add SQLite support for unit tests
|
||||
|
||||
- [x] 3.1 Add `aiosqlite` dependency to `pyproject.toml`
|
||||
- [ ] 3.2 Update SQLAlchemy configuration to support SQLite
|
||||
- [ ] 3.3 Verify unit tests run without PostgreSQL
|
||||
|
||||
## 4. Update dependencies and configuration
|
||||
|
||||
- [x] 4.1 Add missing test dependencies (`python-jose[cryptography]`)
|
||||
- [x] 4.2 Configure `pytest-asyncio` with `asyncio_mode=auto`
|
||||
- [x] 4.3 Add `addopts = -m "not system"` to default test run
|
||||
|
||||
## 5. Create E2E test setup
|
||||
|
||||
- [x] 5.1 Initialize Playwright in `e2e/` directory
|
||||
- [x] 5.2 Add Playwright configuration (`playwright.config.ts`)
|
||||
- [x] 5.3 Create first E2E test (login flow)
|
||||
- [x] 5.4 Add `make test-e2e` target to Makefile
|
||||
|
||||
## 6. Update Makefile
|
||||
|
||||
- [x] 6.1 Add `test-unit` target
|
||||
- [x] 6.2 Add `test-integration` target
|
||||
- [x] 6.3 Add `test-system` target
|
||||
- [x] 6.4 Update `test` target to run all categories
|
||||
|
||||
## 7. Migrate existing tests as examples
|
||||
|
||||
- [x] 7.1 Migrate `test_config.py` to `tests/unit/`
|
||||
- [x] 7.2 Migrate `test_auth_api.py` to `tests/integration/`
|
||||
- [ ] 7.3 Verify migrated tests still pass
|
||||
|
||||
## 8. Documentation
|
||||
|
||||
- [ ] 8.1 Update README with testing strategy
|
||||
- [ ] 8.2 Document how to run specific test categories
|
||||
- [ ] 8.3 Document fixture usage patterns
|
||||
Reference in New Issue
Block a user