From cd1a3fd433ef990d0936ed966af2f6808a5e3346 Mon Sep 17 00:00:00 2001 From: Maurice Date: Tue, 17 Nov 2026 20:07:53 +0100 Subject: [PATCH] test(realtime): run the websocket wire envelope suite on the real database module It takes the ORM from the app buildApp boots, seeds through the factories and resets through resetDatabase instead of the SQLite snapshot mock, so it runs in the Postgres lane as well. --- server/scripts/test-mocks-baseline.json | 3 +- .../postgres/snapshot-suites-baseline.json | 3 +- server/tests/websocket/wire-envelope.test.ts | 45 +++++++++---------- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/server/scripts/test-mocks-baseline.json b/server/scripts/test-mocks-baseline.json index 6989f8fc7..b6ff4eee5 100644 --- a/server/scripts/test-mocks-baseline.json +++ b/server/scripts/test-mocks-baseline.json @@ -177,7 +177,6 @@ "tests/unit/plugins/settings-isolation.test.ts": 1, "tests/unit/plugins/trip-card-contributions.controller.test.ts": 1, "tests/unit/plugins/trip-warnings.controller.test.ts": 1, - "tests/unit/plugins/view-contributions.controller.test.ts": 1, - "tests/websocket/wire-envelope.test.ts": 1 + "tests/unit/plugins/view-contributions.controller.test.ts": 1 } } diff --git a/server/tests/postgres/snapshot-suites-baseline.json b/server/tests/postgres/snapshot-suites-baseline.json index d1c49236f..106ef1295 100644 --- a/server/tests/postgres/snapshot-suites-baseline.json +++ b/server/tests/postgres/snapshot-suites-baseline.json @@ -1,5 +1,4 @@ [ "tests/unit/mcp/tools-notifications.test.ts", - "tests/unit/mcp/tools-packing-advanced.test.ts", - "tests/websocket/wire-envelope.test.ts" + "tests/unit/mcp/tools-packing-advanced.test.ts" ] diff --git a/server/tests/websocket/wire-envelope.test.ts b/server/tests/websocket/wire-envelope.test.ts index 1c6735eba..f086f2ae8 100644 --- a/server/tests/websocket/wire-envelope.test.ts +++ b/server/tests/websocket/wire-envelope.test.ts @@ -16,28 +16,26 @@ * these fail, it is a breaking change for every deployed client. */ import { buildApp, getHttpServer } from '../../src/bootstrap'; -import { db as testDb } from '../../src/db/database'; import { createEphemeralToken } from '../../src/nest/auth-core/ephemeral-tokens'; import { broadcast, broadcastToUser } from '../../src/nest/realtime/ws-state'; -import { createUser, createTrip } from '../helpers/factories'; -import { resetTestDb } from '../helpers/test-db'; +import { makeTrip } from '../helpers/factories/trips'; +import { makeUser } from '../helpers/factories/users'; +import { resetDatabase } from '../helpers/reset-database'; +import { MikroORM } from '@mikro-orm/core'; import type { INestApplication } from '@nestjs/common'; import http from 'http'; -import { describe, it, expect, vi, beforeAll, afterAll, beforeEach } from 'vitest'; +import { describe, it, expect, beforeAll, afterAll, beforeEach } from 'vitest'; import WebSocket from 'ws'; -vi.mock('../../src/db/database', async () => { - const { createSnapshotTestDb, buildDbMock } = await import('../helpers/db-mock'); - return buildDbMock(createSnapshotTestDb()); -}); - let server: http.Server; let wsUrl: string; let nestApp: INestApplication; +let orm: MikroORM; beforeAll(async () => { nestApp = await buildApp(); + orm = nestApp.get(MikroORM); // buildApp binds /ws to the server it creates, before app.init(). server = getHttpServer(); await new Promise((resolve) => server.listen(0, resolve)); @@ -48,10 +46,11 @@ beforeAll(async () => { afterAll(async () => { await new Promise((resolve, reject) => server.close((err) => (err ? reject(err) : resolve()))); await nestApp.close(); - testDb.close(); }); -beforeEach(() => resetTestDb(testDb)); +beforeEach(async () => { + await resetDatabase(orm); +}); /** Minimal buffered client — same idea as connection.test.ts, kept local. */ class Frames { @@ -117,7 +116,7 @@ async function connectAndJoin(userId: number, tripId: number) { describe('WS wire envelope', () => { it('WS-030 — the welcome frame carries socketId at the top level', async () => { - const { user } = createUser(testDb); + const { user } = await makeUser(orm); const frames = await connect(createEphemeralToken(user.id, 'ws')!); try { const msg = await frames.next(); @@ -138,8 +137,8 @@ describe('WS wire envelope', () => { }); it('WS-031 — join and leave are answered flat, keyed by type', async () => { - const { user } = createUser(testDb); - const trip = createTrip(testDb, user.id); + const { user } = await makeUser(orm); + const trip = await makeTrip(orm, user.id); const frames = await connect(createEphemeralToken(user.id, 'ws')!); try { await frames.next(); @@ -157,8 +156,8 @@ describe('WS wire envelope', () => { }); it('WS-032 — the server dispatches on `type`, not on `event`', async () => { - const { user } = createUser(testDb); - const trip = createTrip(testDb, user.id); + const { user } = await makeUser(orm); + const trip = await makeTrip(orm, user.id); const frames = await connect(createEphemeralToken(user.id, 'ws')!); try { await frames.next(); @@ -176,8 +175,8 @@ describe('WS wire envelope', () => { }); it('WS-033 — a trip broadcast spreads its payload flat next to type and tripId', async () => { - const { user } = createUser(testDb); - const trip = createTrip(testDb, user.id); + const { user } = await makeUser(orm); + const trip = await makeTrip(orm, user.id); const frames = await connectAndJoin(user.id, trip.id); try { broadcast(trip.id, 'place_created', { place: { id: 7 }, source: 'test' }); @@ -193,8 +192,8 @@ describe('WS wire envelope', () => { }); it('WS-034 — a payload key cannot be shadowed by the envelope', async () => { - const { user } = createUser(testDb); - const trip = createTrip(testDb, user.id); + const { user } = await makeUser(orm); + const trip = await makeTrip(orm, user.id); const frames = await connectAndJoin(user.id, trip.id); try { // The spread runs last, so payload wins over the envelope's tripId. Pinning @@ -209,7 +208,7 @@ describe('WS wire envelope', () => { }); it('WS-035 — a user broadcast is the payload verbatim, with no tripId added', async () => { - const { user } = createUser(testDb); + const { user } = await makeUser(orm); const frames = await connect(createEphemeralToken(user.id, 'ws')!); try { await frames.next(); @@ -223,8 +222,8 @@ describe('WS wire envelope', () => { }); it('WS-036 — the sender is excluded by socket id, not by connection identity', async () => { - const { user } = createUser(testDb); - const trip = createTrip(testDb, user.id); + const { user } = await makeUser(orm); + const trip = await makeTrip(orm, user.id); const a = await connect(createEphemeralToken(user.id, 'ws')!); const b = await connect(createEphemeralToken(user.id, 'ws')!); try {