diff --git a/backend/tests/__init__.py b/backend/tests/__init__.py
index e69de29..8033e88 100644
--- a/backend/tests/__init__.py
+++ b/backend/tests/__init__.py
@@ -0,0 +1,11 @@
+"""Redirect the suite at its own database.
+
+`app.core.db` builds the engine at import time and several modules bind that
+object, so the name has to be in the environment before anything imports the
+settings. Overriding it here — the first module pytest imports for the
+package — keeps a test run from touching the development data.
+"""
+
+import os
+
+os.environ["POSTGRES_DB"] = "app_test"
diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py
index bc9f173..9c9e370 100644
--- a/backend/tests/conftest.py
+++ b/backend/tests/conftest.py
@@ -2,12 +2,13 @@ from collections.abc import Generator
import pytest
from fastapi.testclient import TestClient
-from sqlmodel import Session, delete
+from sqlalchemy import create_engine, text
+from sqlalchemy.engine import make_url
+from sqlmodel import Session, SQLModel
from app.core.config import settings
from app.core.db import engine, init_db
from app.main import app
-from app.models import User
from tests.utils.user import authentication_token_from_email
from tests.utils.utils import get_superuser_token_headers
@@ -23,12 +24,29 @@ def flow_data(tmp_path_factory: pytest.TempPathFactory) -> Generator[None, None,
@pytest.fixture(scope="session", autouse=True)
def db() -> Generator[Session, None, None]:
+ """Create the throwaway database `tests/__init__.py` points at, drop it after."""
+ url = make_url(str(settings.SQLALCHEMY_DATABASE_URI))
+ # The teardown drops this database, so refuse to run against anything but
+ # the dedicated test one.
+ assert url.database and url.database.endswith("_test"), url.database
+
+ maintenance = create_engine(
+ url.set(database="postgres"), isolation_level="AUTOCOMMIT"
+ )
+ drop = text(f'DROP DATABASE IF EXISTS "{url.database}" WITH (FORCE)')
+ with maintenance.connect() as connection:
+ connection.execute(drop)
+ connection.execute(text(f'CREATE DATABASE "{url.database}"'))
+
+ SQLModel.metadata.create_all(engine)
with Session(engine) as session:
init_db(session)
yield session
- statement = delete(User)
- session.execute(statement)
- session.commit()
+
+ engine.dispose()
+ with maintenance.connect() as connection:
+ connection.execute(drop)
+ maintenance.dispose()
@pytest.fixture(scope="module")
diff --git a/frontend/playwright.config.ts b/frontend/playwright.config.ts
index 256fb39..8618607 100644
--- a/frontend/playwright.config.ts
+++ b/frontend/playwright.config.ts
@@ -23,10 +23,10 @@ export default defineConfig({
reporter: process.env.CI ? 'blob' : '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('/')`.
- Point PLAYWRIGHT_BASE_URL at the integrated stack (http://app.localhost)
- to test what `make dev` is serving; the API only allows CORS from there. */
- baseURL: process.env.PLAYWRIGHT_BASE_URL || 'http://localhost:5173',
+ /* Base URL to use in actions like `await page.goto('/')`. Defaults to the
+ integrated stack (`make dev`), the only origin the API allows CORS from.
+ Point PLAYWRIGHT_BASE_URL elsewhere to test another running server. */
+ baseURL: process.env.PLAYWRIGHT_BASE_URL || 'http://app.localhost',
/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
trace: 'on-first-retry',
@@ -83,14 +83,4 @@ export default defineConfig({
// use: { ...devices['Desktop Chrome'], channel: 'chrome' },
// },
],
-
- /* Run your local dev server before starting the tests, unless we were
- pointed at an already-running one. */
- webServer: process.env.PLAYWRIGHT_BASE_URL
- ? undefined
- : {
- command: 'bun run dev',
- url: 'http://localhost:5173',
- reuseExistingServer: !process.env.CI,
- },
});
diff --git a/frontend/src/components/Sidebar/User.tsx b/frontend/src/components/Sidebar/User.tsx
deleted file mode 100644
index 12c6362..0000000
--- a/frontend/src/components/Sidebar/User.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import { Link as RouterLink } from "@tanstack/react-router"
-import { ChevronsUpDown, LogOut, Settings } from "lucide-react"
-
-import { Avatar, AvatarFallback } from "@/components/ui/avatar"
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuLabel,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu"
-import {
- SidebarMenu,
- SidebarMenuButton,
- SidebarMenuItem,
- useSidebar,
-} from "@/components/ui/sidebar"
-import useAuth from "@/hooks/useAuth"
-import { getInitials } from "@/utils"
-
-interface UserInfoProps {
- fullName?: string
- email?: string
-}
-
-function UserInfo({ fullName, email }: UserInfoProps) {
- return (
-
-
-
- {getInitials(fullName || "User")}
-
-
-
-