External/SnapOtter
1
0
Fork 0
mirror of https://github.com/snapotter-hq/SnapOtter.git synced 2026-08-03 07:46:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(test): repair integration suite after analytics column/endpoint removal (#340)

Browse Source 
* fix(test): repair integration suite after analytics column/endpoint removal

#336 moved analytics to a build-time bake: migration 0005 dropped the
users.analytics_enabled and analytics_consent_* columns and removed the
PUT /api/v1/user/analytics endpoint. Two integration tests were left
referencing the old shape and went red on main (13 failures):

- migrate-from-sqlite.test.ts built 1.x SQLite fixtures whose users table
  declared the analytics columns. The generic SELECT *-based importer then
  tried to INSERT them into the 2.0 target, which no longer has those
  columns, failing with Postgres 42703 and rolling back the whole import
  (cascading to all 12 assertions). 1.x never had analytics columns, so the
  fixtures are corrected to drop them. Also removed the now-dead analytics
  entries from the importer's TS/BOOL conversion sets.

- analytics.test.ts asserted the removed PUT endpoint returns 404 but sent
  the request unauthenticated, so the global auth preHandler answered 401
  first. It now authenticates, reaching Fastify's not-found handler (404).

Also removed the stale /api/v1/user/analytics path from openapi.yaml.

Verified locally: full platform integration bucket 1029 passed / 0 failed;
monorepo typecheck clean.

* test(e2e): drop orphaned analytics-consent dismissal calls

#336 deleted the entire analytics consent system (consent page, consent
module, and PUT /api/v1/user/analytics), but six tests/e2e files still
PUT to that removed endpoint to 'dismiss analytics consent.' The calls
were silent no-ops (Playwright request.put / fetch don't throw on 4xx),
so they passed while hitting a dead route.

There is no consent prompt to dismiss anymore, so remove the calls:
- auth.setup.ts / qa-auth.setup.ts: keep the waitForFunction that syncs on
  login completion, drop the now-unused token capture, the dead PUT, and
  the stale 'consent guard' comments.
- rbac / rbac-full / gui-settings-rbac / gui-settings-expanded specs: the
  re-login blocks existed solely to obtain a token for the PUT (reLoginData
  was used nowhere else and the block was the tail of each helper), so
  remove the whole block. The meaningful create-user/login/change-password
  work is untouched.

Verified: no /api/v1/user/analytics refs remain in tests/e2e; biome clean
(no unused vars).
This commit is contained in:
SnapOtter
2026-06-24 13:30:18 +08:00
committed by GitHub
parent 5dac40d782
commit 6917a8b0c7
10 changed files with 28 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/platform/analytics.test.ts
+6 -1
View File
@@ -1,5 +1,5 @@
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { buildTestApp, type TestApp } from "../test-server.js";
import { buildTestApp, loginAsAdmin, type TestApp } from "../test-server.js";
let testApp: TestApp;
@@ -64,9 +64,14 @@ describe("GET /api/v1/config/analytics", () => {
describe("PUT /api/v1/user/analytics (removed)", () => {
it("returns 404 (endpoint no longer exists)", async () => {
// Authenticate first: the global auth preHandler answers unauthenticated
// requests with 401 before routing, so only an authenticated request can
// reach Fastify's not-found handler and prove the route is gone.
const token = await loginAsAdmin(testApp.app);
const res = await testApp.app.inject({
method: "PUT",
url: "/api/v1/user/analytics",
headers: { authorization: `Bearer ${token}` },
payload: { enabled: true },
});
expect(res.statusCode).toBe(404);
tests/integration/platform/migrate-from-sqlite.test.ts
+14 -31
View File
@@ -13,8 +13,7 @@ function buildFixtureSqlite(path: string): void {
CREATE TABLE users (id text PRIMARY KEY, username text NOT NULL, password_hash text,
role text NOT NULL DEFAULT 'user', team text NOT NULL DEFAULT 'Default',
must_change_password integer NOT NULL DEFAULT 1, auth_provider text NOT NULL DEFAULT 'local',
external_id text, email text, created_at integer NOT NULL, updated_at integer NOT NULL,
analytics_enabled integer, analytics_consent_shown_at integer, analytics_consent_remind_at integer);
external_id text, email text, created_at integer NOT NULL, updated_at integer NOT NULL);
CREATE TABLE teams (id text PRIMARY KEY, name text NOT NULL, created_at integer NOT NULL);
CREATE TABLE settings ("key" text PRIMARY KEY, value text NOT NULL, updated_at integer NOT NULL);
CREATE TABLE roles (id text PRIMARY KEY, name text NOT NULL, description text NOT NULL DEFAULT '',
@@ -40,8 +39,8 @@ function buildFixtureSqlite(path: string): void {
`);
const now = 1750000000; // seconds epoch, as 1.x stored
s.prepare(
"INSERT INTO users (id, username, password_hash, must_change_password, created_at, updated_at, analytics_enabled, analytics_consent_shown_at) VALUES (?,?,?,?,?,?,?,?)",
).run("u1", "alice", "hash", 0, now, now, 1, null);
"INSERT INTO users (id, username, password_hash, must_change_password, created_at, updated_at) VALUES (?,?,?,?,?,?)",
).run("u1", "alice", "hash", 0, now, now);
s.prepare("INSERT INTO teams (id, name, created_at) VALUES (?,?,?)").run("t1", "Legal", now);
s.prepare('INSERT INTO settings ("key", value, updated_at) VALUES (?,?,?)').run(
"cookieSecret",
@@ -98,8 +97,6 @@ describe("migrate-from-sqlite", () => {
const [user] = (await db.execute(sql`SELECT * FROM users WHERE id = 'u1'`)).rows;
expect(user.username).toBe("alice");
expect(user.must_change_password).toBe(false); // 0 became boolean false
expect(user.analytics_enabled).toBe(true); // 1 became boolean true
expect(user.analytics_consent_shown_at).toBeNull(); // explicit NULL preserved
expect(new Date(user.created_at as string).getTime()).toBe(1750000000 * 1000); // seconds became timestamptz
const [pipeline] = (await db.execute(sql`SELECT * FROM pipelines WHERE id = 'p1'`)).rows;
expect((pipeline.steps as Array<{ toolId: string }>)[0].toolId).toBe("compress"); // text JSON became jsonb
@@ -160,8 +157,7 @@ describe("migrate-from-sqlite (representative 1.x database)", () => {
CREATE TABLE users (id text PRIMARY KEY, username text NOT NULL, password_hash text,
role text NOT NULL DEFAULT 'user', team text NOT NULL DEFAULT 'Default',
must_change_password integer NOT NULL DEFAULT 1, auth_provider text NOT NULL DEFAULT 'local',
external_id text, email text, created_at integer NOT NULL, updated_at integer NOT NULL,
analytics_enabled integer, analytics_consent_shown_at integer, analytics_consent_remind_at integer);
external_id text, email text, created_at integer NOT NULL, updated_at integer NOT NULL);
CREATE TABLE teams (id text PRIMARY KEY, name text NOT NULL, created_at integer NOT NULL);
CREATE TABLE settings ("key" text PRIMARY KEY, value text NOT NULL, updated_at integer NOT NULL);
CREATE TABLE roles (id text PRIMARY KEY, name text NOT NULL, description text NOT NULL DEFAULT '',
@@ -193,9 +189,8 @@ describe("migrate-from-sqlite (representative 1.x database)", () => {
// ── Users: multiple users with diverse boolean/null combos ──
const insU = s.prepare(
`INSERT INTO users (id, username, password_hash, role, team, must_change_password,
auth_provider, external_id, email, created_at, updated_at,
analytics_enabled, analytics_consent_shown_at, analytics_consent_remind_at)
VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)`,
auth_provider, external_id, email, created_at, updated_at)
VALUES (?,?,?,?,?,?,?,?,?,?,?)`,
);
insU.run(
"u-admin",
@@ -209,9 +204,6 @@ describe("migrate-from-sqlite (representative 1.x database)", () => {
"admin@example.com",
t1,
t1,
1,
t1,
null,
);
insU.run(
"u-editor",
@@ -225,9 +217,6 @@ describe("migrate-from-sqlite (representative 1.x database)", () => {
null,
t2,
t2,
0,
null,
null,
);
insU.run(
"u-oidc",
@@ -241,9 +230,6 @@ describe("migrate-from-sqlite (representative 1.x database)", () => {
"sso@corp.com",
t3,
t3,
null,
null,
t3,
);
// ── Teams ──
@@ -478,29 +464,26 @@ describe("migrate-from-sqlite (representative 1.x database)", () => {
expect(result.tables.user_files).toBe(4);
});
it("boolean conversions: 0 -> false, 1 -> true, NULL -> null", async () => {
it("boolean conversions: 0 -> false, 1 -> true", async () => {
const users = (await db.execute(sql`SELECT * FROM users ORDER BY id`)).rows;
// u-admin: must_change_password=0 -> false, analytics_enabled=1 -> true
// u-admin: must_change_password=0 -> false
const admin = users.find((u) => u.id === "u-admin");
expect(admin?.must_change_password).toBe(false);
expect(admin?.analytics_enabled).toBe(true);
// u-editor: must_change_password=1 -> true, analytics_enabled=0 -> false
// u-editor: must_change_password=1 -> true
const editor = users.find((u) => u.id === "u-editor");
expect(editor?.must_change_password).toBe(true);
expect(editor?.analytics_enabled).toBe(false);
// u-oidc: analytics_enabled=NULL -> null
// u-oidc: must_change_password=0 -> false
const oidc = users.find((u) => u.id === "u-oidc");
expect(oidc?.analytics_enabled).toBeNull();
expect(oidc?.must_change_password).toBe(false);
});
it("timestamp conversions: epoch seconds -> timestamptz", async () => {
const [admin] = (await db.execute(sql`SELECT * FROM users WHERE id = 'u-admin'`)).rows;
expect(new Date(admin.created_at as string).getTime()).toBe(1748000000 * 1000);
// NULL timestamps stay null
expect(admin.analytics_consent_remind_at).toBeNull();
// Non-null timestamp
expect(new Date(admin.updated_at as string).getTime()).toBe(1748000000 * 1000);
// A different row's distinct timestamp also converts
const [oidc] = (await db.execute(sql`SELECT * FROM users WHERE id = 'u-oidc'`)).rows;
expect(new Date(oidc.analytics_consent_remind_at as string).getTime()).toBe(1748200000 * 1000);
expect(new Date(oidc.created_at as string).getTime()).toBe(1748200000 * 1000);
});
it("JSON column conversions: text -> jsonb", async () => {