Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

test(integration): harden DATABASE_URL handling and fixtures

Tin1878f7440488
diff --git a/tests/api-integration/helpers/database.ts b/tests/api-integration/helpers/database.ts
index 5ed2810c3..87075911d 100644
--- a/tests/api-integration/helpers/database.ts
+++ b/tests/api-integration/helpers/database.ts
@@ -64,7 +64,12 @@ export async function ensureTestDatabaseMigrated() {
})();
}
- await migrationPromise;
+ try {
+ await migrationPromise;
+ } catch (error) {
+ migrationPromise = null;
+ throw error;
+ }
}
export async function resetTestDatabase() {
diff --git a/tests/api-integration/helpers/fixtures.ts b/tests/api-integration/helpers/fixtures.ts
index 08c2de54c..20a5ff76d 100644
--- a/tests/api-integration/helpers/fixtures.ts
+++ b/tests/api-integration/helpers/fixtures.ts
@@ -1,5 +1,6 @@
import { randomUUID } from "node:crypto";
import db, { schema } from "../../../apps/api/src/database";
+import { DEFAULT_PROJECT_COLUMNS } from "../../../apps/api/src/project/controllers/create-project";
export type SeededMemberContext = {
user: typeof schema.userTable.$inferSelect;
@@ -39,7 +40,7 @@ export async function createWorkspaceMember(
await db.insert(schema.workspaceUserTable).values({
workspaceId: workspace.id,
userId: user.id,
- role: overrides?.role || "owner",
+ role: overrides?.role ?? "member",
joinedAt: new Date(),
});
@@ -67,33 +68,40 @@ export async function createProjectFixture({
})
.returning();
- const [todoColumn] = await db
- .insert(schema.columnTable)
- .values({
- projectId: project.id,
- name: "To Do",
- slug: "to-do",
- position: 0,
- isFinal: false,
- })
- .returning();
+ const insertedColumns: (typeof schema.columnTable.$inferSelect)[] = [];
- const [doneColumn] = await db
- .insert(schema.columnTable)
- .values({
- projectId: project.id,
- name: "Done",
- slug: "done",
- position: 1,
- isFinal: true,
- })
- .returning();
+ for (const col of DEFAULT_PROJECT_COLUMNS) {
+ const [inserted] = await db
+ .insert(schema.columnTable)
+ .values({
+ projectId: project.id,
+ name: col.name,
+ slug: col.slug,
+ position: col.position,
+ isFinal: col.isFinal,
+ })
+ .returning();
+ if (inserted) {
+ insertedColumns.push(inserted);
+ }
+ }
+
+ const todo = insertedColumns[0];
+ const inProgress = insertedColumns[1];
+ const inReview = insertedColumns[2];
+ const done = insertedColumns[3];
+
+ if (!todo || !inProgress || !inReview || !done) {
+ throw new Error("Failed to seed default project columns");
+ }
return {
project,
columns: {
- todo: todoColumn,
- done: doneColumn,
+ todo,
+ inProgress,
+ inReview,
+ done,
},
};
}
diff --git a/tests/api-integration/setup.ts b/tests/api-integration/setup.ts
index 5fd220024..3f484fbdd 100644
--- a/tests/api-integration/setup.ts
+++ b/tests/api-integration/setup.ts
@@ -3,6 +3,17 @@ import { dirname, resolve } from "node:path";
import { fileURLToPath } from "node:url";
import { afterEach, vi } from "vitest";
+function stripEnvValueQuotes(value: string) {
+ const trimmed = value.trim();
+ if (
+ (trimmed.startsWith('"') && trimmed.endsWith('"')) ||
+ (trimmed.startsWith("'") && trimmed.endsWith("'"))
+ ) {
+ return trimmed.slice(1, -1);
+ }
+ return trimmed;
+}
+
function deriveTestDatabaseUrl(connectionString: string) {
const url = new URL(connectionString);
const databaseName = url.pathname.replace(/^\//, "");
@@ -15,6 +26,16 @@ function deriveTestDatabaseUrl(connectionString: string) {
return url.toString();
}
+function assertTestDatabaseUrl(connectionString: string) {
+ const url = new URL(connectionString);
+ const databaseName = url.pathname.replace(/^\//, "");
+ if (!databaseName.endsWith("_test")) {
+ throw new Error(
+ `Integration tests require DATABASE_URL to use a database name ending in _test (got "${databaseName}")`,
+ );
+ }
+}
+
function readDatabaseUrlFromEnvFile() {
const currentDir = dirname(fileURLToPath(import.meta.url));
const envPath = resolve(currentDir, "../../.env");
@@ -25,17 +46,21 @@ function readDatabaseUrlFromEnvFile() {
const envFile = readFileSync(envPath, "utf8");
const match = envFile.match(/^DATABASE_URL=(.+)$/m);
- return match?.[1]?.trim() || null;
+ const raw = match?.[1]?.trim();
+ return raw ? stripEnvValueQuotes(raw) : null;
}
+const defaultTestDatabaseUrl =
+ "postgresql://postgres:postgres@localhost:5432/kaneo_test";
+const envDatabaseUrl = process.env.DATABASE_URL?.trim();
+const fromEnv = envDatabaseUrl ? stripEnvValueQuotes(envDatabaseUrl) : "";
+const rawDatabaseUrl =
+ fromEnv || readDatabaseUrlFromEnvFile() || defaultTestDatabaseUrl;
+process.env.DATABASE_URL = deriveTestDatabaseUrl(rawDatabaseUrl);
+assertTestDatabaseUrl(process.env.DATABASE_URL);
+
process.env.NODE_ENV = "test";
process.env.AUTH_SECRET = "test-secret-with-at-least-32-chars";
-process.env.DATABASE_URL =
- process.env.DATABASE_URL ||
- deriveTestDatabaseUrl(
- readDatabaseUrlFromEnvFile() ||
- "postgresql://postgres:postgres@localhost:5432/kaneo_test",
- );
process.env.KANEO_API_URL = "http://localhost:1337";
process.env.KANEO_CLIENT_URL = "http://localhost:5173";
process.env.DISABLE_GUEST_ACCESS = "false";