diff --git a/server/tests/e2e/body-row-ids.e2e.test.ts b/server/tests/e2e/body-row-ids.e2e.test.ts index 3925817e9..6227b1b38 100644 --- a/server/tests/e2e/body-row-ids.e2e.test.ts +++ b/server/tests/e2e/body-row-ids.e2e.test.ts @@ -71,7 +71,7 @@ function not400(got: Answer[], error: string): Answer[] { beforeAll(async () => { app = await buildApp(); orm = app.get(MikroORM); - await updateRows(orm, Addons, {}, { enabled: 1 }); + await updateRows(orm, Addons, {}, { enabled: true }); }, 60_000); afterAll(async () => { diff --git a/server/tests/e2e/route-row-ids.e2e.test.ts b/server/tests/e2e/route-row-ids.e2e.test.ts index b30fa0bad..67318b45e 100644 --- a/server/tests/e2e/route-row-ids.e2e.test.ts +++ b/server/tests/e2e/route-row-ids.e2e.test.ts @@ -223,7 +223,7 @@ describe('ROUTEID: every route answers a malformed path id like an unknown one', orm = app.get(MikroORM); await app.listen(0, '127.0.0.1'); baseUrl = `http://127.0.0.1:${(app.getHttpServer().address() as AddressInfo).port}`; - await updateRows(orm, Addons, {}, { enabled: 1 }); + await updateRows(orm, Addons, {}, { enabled: true }); const { user: admin } = await makeAdmin(orm); const { user: other } = await makeUser(orm); diff --git a/server/tests/unit/nest/atlas.controller.test.ts b/server/tests/unit/nest/atlas.controller.test.ts index d55dc0c27..bd3e91692 100644 --- a/server/tests/unit/nest/atlas.controller.test.ts +++ b/server/tests/unit/nest/atlas.controller.test.ts @@ -146,8 +146,8 @@ describe('AtlasController (parity with the legacy /api/addons/atlas route)', () await c.markRegion(user, 'by', { name: 'Bavaria', country_code: 'de' }, 'sock-1'); await c.unmarkRegion(user, 'by', 'sock-1'); await c.createBucketItem(user, { name: 'Tokyo' }, 'sock-1'); - await c.updateBucketItem(user, '1', { name: 'Kyoto' }, 'sock-1'); - await c.deleteBucketItem(user, '1', 'sock-1'); + await c.updateBucketItem(user, 1, { name: 'Kyoto' }, 'sock-1'); + await c.deleteBucketItem(user, 1, 'sock-1'); for (const write of Object.values(writes)) expect(write.mock.calls[0]?.at(-1)).toBe('sock-1'); }); }); @@ -214,14 +214,14 @@ describe('AtlasController (parity with the legacy /api/addons/atlas route)', () it('404 on update of a missing item', () => { const updateBucketItem = vi.fn().mockReturnValue(null); - return thrown(() => makeController({ updateBucketItem }).updateBucketItem(user, '9', { name: 'X' })).then((r) => + return thrown(() => makeController({ updateBucketItem }).updateBucketItem(user, 9, { name: 'X' })).then((r) => expect(r).toEqual({ status: 404, body: { error: 'Item not found' } }), ); }); it('updates an existing item', async () => { const updateBucketItem = vi.fn().mockReturnValue({ id: 1, name: 'Kyoto' }); - expect(await makeController({ updateBucketItem }).updateBucketItem(user, '1', { name: 'Kyoto' })).toEqual({ + expect(await makeController({ updateBucketItem }).updateBucketItem(user, 1, { name: 'Kyoto' })).toEqual({ item: { id: 1, name: 'Kyoto' }, }); }); @@ -240,7 +240,7 @@ describe('AtlasController (parity with the legacy /api/addons/atlas route)', () throw new BucketItemExistsError(); }); return thrown(() => - makeController({ updateBucketItem }).updateBucketItem(user, '1', { target_date: '2027-05' }), + makeController({ updateBucketItem }).updateBucketItem(user, 1, { target_date: '2027-05' }), ).then((r) => expect(r).toEqual({ status: 409, body: { error: 'Already on your bucket list' } })); }); @@ -255,21 +255,21 @@ describe('AtlasController (parity with the legacy /api/addons/atlas route)', () const updateBucketItem = vi.fn(() => { throw boom; }); - await expect(makeController({ updateBucketItem }).updateBucketItem(user, '1', { name: 'Japan' })).rejects.toThrow( + await expect(makeController({ updateBucketItem }).updateBucketItem(user, 1, { name: 'Japan' })).rejects.toThrow( boom, ); }); it('404 on delete of a missing item', () => { const deleteBucketItem = vi.fn().mockReturnValue(false); - return thrown(() => makeController({ deleteBucketItem }).deleteBucketItem(user, '9')).then((r) => + return thrown(() => makeController({ deleteBucketItem }).deleteBucketItem(user, 9)).then((r) => expect(r).toEqual({ status: 404, body: { error: 'Item not found' } }), ); }); it('deletes an existing item', async () => { const deleteBucketItem = vi.fn().mockReturnValue(true); - expect(await makeController({ deleteBucketItem }).deleteBucketItem(user, '1')).toEqual({ success: true }); + expect(await makeController({ deleteBucketItem }).deleteBucketItem(user, 1)).toEqual({ success: true }); }); }); }); diff --git a/server/tests/unit/nest/doc-sync/doc-sync.controller.test.ts b/server/tests/unit/nest/doc-sync/doc-sync.controller.test.ts index 8c9a94d92..e4cff1e06 100644 --- a/server/tests/unit/nest/doc-sync/doc-sync.controller.test.ts +++ b/server/tests/unit/nest/doc-sync/doc-sync.controller.test.ts @@ -580,7 +580,7 @@ describe('removing a connection', () => { original_name: 'boarding.pdf', }); - await expect(controller.deleteConnection(String(tripId), String(conn.id), owner)).resolves.toEqual({ + await expect(controller.deleteConnection(String(tripId), conn.id, owner)).resolves.toEqual({ success: true, }); expect(await config.getConnection(conn.id)).toBeUndefined(); @@ -610,7 +610,7 @@ describe('removing a connection', () => { await controller.createLink(String(tripId), owner, linkBody(conn.id, { scopeKey: 'tag:3' }), makeReq()); paperless.unregisterWebhook.mockClear(); - await controller.deleteConnection(String(tripId), String(conn.id), owner); + await controller.deleteConnection(String(tripId), conn.id, owner); expect(paperless.unregisterWebhook.mock.calls.map((c) => c[1]).sort()).toEqual(['sub-7', 'sub-8']); expect(paperless.unregisterWebhook.mock.calls[0][0]).toMatchObject({ @@ -626,7 +626,7 @@ describe('removing a connection', () => { await controller.createLink(String(tripId), owner, linkBody(conn.id), makeReq({ host: 'trek.example' })); paperless.unregisterWebhook.mockResolvedValueOnce({ success: false, error: { code: 'unreachable' } } as never); - await expect(controller.deleteConnection(String(tripId), String(conn.id), owner)).resolves.toEqual({ + await expect(controller.deleteConnection(String(tripId), conn.id, owner)).resolves.toEqual({ success: true, }); expect(await config.getConnection(conn.id)).toBeUndefined(); @@ -634,7 +634,7 @@ describe('removing a connection', () => { it('refuses a connection that belongs to a different trip', async () => { const conn = await storedPaperless(); - const err = await thrown(() => controller.deleteConnection(String(otherTripId), String(conn.id), admin)); + const err = await thrown(() => controller.deleteConnection(String(otherTripId), conn.id, admin)); expect(err.getStatus()).toBe(404); expect(await config.getConnection(conn.id)).toBeTruthy(); expect(realtime.broadcast).not.toHaveBeenCalled(); @@ -661,7 +661,7 @@ describe('removing a connection', () => { const second = await bind(conn.id, 'tag:2'); await bind(cloud.data.id, 'folder:1'); - await controller.deleteConnection(String(tripId), String(conn.id), owner); + await controller.deleteConnection(String(tripId), conn.id, owner); expect(realtime.broadcast.mock.calls).toEqual([ [tripId, 'docsync:changed', { linkId: first, pulled: 0, pushed: 0 }], @@ -678,7 +678,7 @@ describe('the scope picker', () => { data: [{ scopeKey: 'tag:1', label: 'Japan 2026', remoteRootId: '1', remoteRootPath: '/TREK/japan' }], } as never); - const res = await controller.listScopes(String(tripId), String(conn.id), owner, 'japan'); + const res = await controller.listScopes(String(tripId), conn.id, owner, 'japan'); expect(paperless.listScopes.mock.calls[0][1]).toBe('japan'); expect(res).toMatchObject({ scopes: [{ scopeKey: 'tag:1' }] }); @@ -687,7 +687,7 @@ describe('the scope picker', () => { it('reports a provider failure in the body, so the picker can say why it is empty', async () => { const conn = await storedPaperless(); paperless.listScopes.mockResolvedValueOnce({ success: false, error: { code: 'unauthorized' } } as never); - await expect(controller.listScopes(String(tripId), String(conn.id), owner)).resolves.toEqual({ + await expect(controller.listScopes(String(tripId), conn.id, owner)).resolves.toEqual({ scopes: [], error: 'unauthorized', }); @@ -700,14 +700,14 @@ describe('the scope picker', () => { ownerUser: Number(owner.id), base_url: 'https://papra.example.com', }); - const err = await thrown(() => controller.listScopes(String(tripId), String(id), owner)); + const err = await thrown(() => controller.listScopes(String(tripId), id, owner)); expect(err.getStatus()).toBe(400); expect(err.message).toBe('Provider not available'); }); it('refuses a connection that belongs to a different trip', async () => { const conn = await storedPaperless(); - const err = await thrown(() => controller.listScopes(String(otherTripId), String(conn.id), admin)); + const err = await thrown(() => controller.listScopes(String(otherTripId), conn.id, admin)); expect(err.getStatus()).toBe(404); expect(paperless.listScopes).not.toHaveBeenCalled(); }); @@ -720,7 +720,7 @@ describe('the scope picker', () => { } as never); await expect( - controller.createScope(String(tripId), String(conn.id), owner, { name: 'Norway' }), + controller.createScope(String(tripId), conn.id, owner, { name: 'Norway' }), ).resolves.toMatchObject({ scopeKey: 'tag:9', label: 'Norway' }); expect(paperless.createScope).toHaveBeenCalledWith(expect.objectContaining({ connectionId: conn.id }), 'Norway'); }); @@ -730,7 +730,7 @@ describe('the scope picker', () => { // has to match the trip the caller was admitted to. const conn = await storedPaperless(); const err = await thrown(() => - controller.createScope(String(otherTripId), String(conn.id), admin, { name: 'Norway' }), + controller.createScope(String(otherTripId), conn.id, admin, { name: 'Norway' }), ); expect(err.getStatus()).toBe(404); expect(paperless.createScope).not.toHaveBeenCalled(); @@ -739,7 +739,7 @@ describe('the scope picker', () => { it('turns a refused creation into a 400 carrying the provider code', async () => { const conn = await storedPaperless(); paperless.createScope.mockResolvedValueOnce({ success: false, error: { code: 'forbidden' } } as never); - const err = await thrown(() => controller.createScope(String(tripId), String(conn.id), owner, { name: 'Norway' })); + const err = await thrown(() => controller.createScope(String(tripId), conn.id, owner, { name: 'Norway' })); expect(err.getStatus()).toBe(400); expect(err.message).toBe('forbidden'); }); @@ -857,7 +857,7 @@ describe('changing a binding', () => { const res = (await controller.updateLink( String(tripId), - String(created.id), + created.id, owner, { syncEnabled: false }, makeReq(), @@ -878,7 +878,7 @@ describe('changing a binding', () => { id: number; }; const err = await thrown(() => - controller.updateLink(String(otherTripId), String(created.id), admin, { syncEnabled: false }, makeReq()), + controller.updateLink(String(otherTripId), created.id, admin, { syncEnabled: false }, makeReq()), ); expect(err.getStatus()).toBe(404); expect((await config.getLink(created.id))!.sync_enabled).toBe(1); @@ -893,7 +893,7 @@ describe('a manual run', () => { }; sync.syncLink.mockClear(); - await controller.syncNow(String(tripId), String(created.id), { full: true }); + await controller.syncNow(String(tripId), created.id, { full: true }); expect(sync.syncLink.mock.calls[0][0]).toMatchObject({ id: created.id }); expect(sync.syncLink.mock.calls[0][1]).toEqual({ full: true }); @@ -906,7 +906,7 @@ describe('a manual run', () => { }; sync.syncLink.mockClear(); - const err = await thrown(() => controller.syncNow(String(otherTripId), String(created.id), { full: false })); + const err = await thrown(() => controller.syncNow(String(otherTripId), created.id, { full: false })); expect(err.getStatus()).toBe(404); expect(sync.syncLink).not.toHaveBeenCalled(); }); @@ -922,7 +922,7 @@ describe('a manual run', () => { sync.syncLink.mockClear(); sync.isSwitchedOff.mockReturnValueOnce(true); - const err = await thrown(() => controller.syncNow(String(tripId), String(created.id), { full: false })); + const err = await thrown(() => controller.syncNow(String(tripId), created.id, { full: false })); expect(err.getStatus()).toBe(409); expect(err.getResponse()).toEqual({ error: 'provider_disabled' }); @@ -947,7 +947,7 @@ describe('a manual run', () => { sync.syncLink.mockClear(); await deleteRows(t, TripMembers, { trip: tripId, user: member.id }); try { - const err = await thrown(() => controller.syncNow(String(tripId), String(created.id), { full: false })); + const err = await thrown(() => controller.syncNow(String(tripId), created.id, { full: false })); expect(err.getStatus()).toBe(409); expect(sync.retryShelvedItems).not.toHaveBeenCalled(); @@ -1025,7 +1025,7 @@ describe('removing a binding', () => { state: 'synced', }); - const res = await controller.deleteLink(String(tripId), String(created.id), owner); + const res = await controller.deleteLink(String(tripId), created.id, owner); expect(res).toEqual({ success: true, documentsKept: true }); expect(paperless.unregisterWebhook.mock.calls[0][1]).toBe('sub-7'); @@ -1040,7 +1040,7 @@ describe('removing a binding', () => { }; realtime.broadcast.mockClear(); - await controller.deleteLink(String(tripId), String(created.id), owner); + await controller.deleteLink(String(tripId), created.id, owner); expect(realtime.broadcast.mock.calls).toEqual([ [tripId, 'docsync:changed', { linkId: created.id, pulled: 0, pushed: 0 }], @@ -1053,7 +1053,7 @@ describe('removing a binding', () => { id: number; }; realtime.broadcast.mockClear(); - const err = await thrown(() => controller.deleteLink(String(otherTripId), String(created.id), admin)); + const err = await thrown(() => controller.deleteLink(String(otherTripId), created.id, admin)); expect(err.getStatus()).toBe(404); expect(await config.getLink(created.id)).toBeTruthy(); expect(realtime.broadcast).not.toHaveBeenCalled(); @@ -1137,14 +1137,14 @@ describe('a manual run and the shelved rows', () => { }; sync.retryShelvedItems.mockClear(); - await controller.syncNow(String(tripId), String(created.id), { full: false }); + await controller.syncNow(String(tripId), created.id, { full: false }); expect(sync.retryShelvedItems).toHaveBeenCalledWith(created.id); }); it('does not clear them for a link the caller does not own', async () => { sync.retryShelvedItems.mockClear(); - await expect(controller.syncNow(String(tripId), '999999', { full: false })).rejects.toThrow(); + await expect(controller.syncNow(String(tripId), 999999, { full: false })).rejects.toThrow(); expect(sync.retryShelvedItems).not.toHaveBeenCalled(); }); }); diff --git a/server/tests/unit/nest/realtime.gateway.test.ts b/server/tests/unit/nest/realtime.gateway.test.ts index 950d029e1..de08d9690 100644 --- a/server/tests/unit/nest/realtime.gateway.test.ts +++ b/server/tests/unit/nest/realtime.gateway.test.ts @@ -395,10 +395,16 @@ describe('ws-state fan-out', () => { describe('book rooms', () => { let nextJourney = 100; - async function joined(journeyId: number) { + /** A gateway and a registered socket that has not joined any book yet. */ + function bookSocket() { const gw = new RealtimeGateway(new TripAccessService(db), tokens, journeys, users, appSettings); const ws = socket(); registerSocket(ws, { id: 3, username: 'm' } as User); + return { gw, ws }; + } + + async function joined(journeyId: number) { + const { gw, ws } = bookSocket(); const reply = await gw.handleBookJoin({ journeyId }, ws); return { gw, ws, reply }; } @@ -421,9 +427,7 @@ describe('book rooms', () => { }); it('WSGW-BOOK-002b: refuses a spelling of a visible journey id that toRowId refuses, and adds nobody', async () => { - const gw = new RealtimeGateway(new TripAccessService(db), tokens, journeys, users, appSettings); - const ws = socket(); - registerSocket(ws, { id: 3, username: 'm' } as User); + const { gw, ws } = bookSocket(); const j = nextJourney++; const spellings = [`0x${j.toString(16)}`, `${j}e0`, `${j}.0`, ` ${j}`, j + 0.5, 1e20]; const replies = await Promise.all(spellings.map((journeyId) => gw.handleBookJoin({ journeyId } as never, ws)));