From caae538056ef5d7e7e7f915d5c2e40bf8e5d10c7 Mon Sep 17 00:00:00 2001 From: Maurice Date: Tue, 17 Nov 2026 18:15:31 +0100 Subject: [PATCH] test(db): merge the factory imports of the newly ported integration suites One import per module, and the resetTestDb import that no longer has a caller dropped. --- server/tests/integration/security.test.ts | 5 ++--- server/tests/integration/settings.test.ts | 2 +- server/tests/integration/share.test.ts | 7 ++----- server/tests/integration/systemNotices.test.ts | 3 +-- server/tests/integration/tags.test.ts | 2 +- server/tests/integration/todo.test.ts | 5 ++--- .../integration/trip-access-primitives.test.ts | 4 +--- server/tests/integration/trips.test.ts | 16 ++++------------ .../uploads-photo-request-context.test.ts | 3 +-- 9 files changed, 15 insertions(+), 32 deletions(-) diff --git a/server/tests/integration/security.test.ts b/server/tests/integration/security.test.ts index fcfa43a4c..c65e89a5c 100644 --- a/server/tests/integration/security.test.ts +++ b/server/tests/integration/security.test.ts @@ -15,10 +15,9 @@ import type { FactoryOrm } from '../helpers/factories/context'; import { findRows, updateRows } from '../helpers/factories/rows'; import { setAppSetting } from '../helpers/factories/settings'; import { makeTrip } from '../helpers/factories/trips'; -import { makeUser } from '../helpers/factories/users'; -import { readUser } from '../helpers/factories/users'; +import { makeUser, readUser } from '../helpers/factories/users'; import { resetDatabase } from '../helpers/reset-database'; -import { resetTestDb, resetRateLimits } from '../helpers/test-db'; +import { resetRateLimits } from '../helpers/test-db'; import { MikroORM } from '@mikro-orm/core'; import type { INestApplication } from '@nestjs/common'; diff --git a/server/tests/integration/settings.test.ts b/server/tests/integration/settings.test.ts index 39e670873..dfbe52676 100644 --- a/server/tests/integration/settings.test.ts +++ b/server/tests/integration/settings.test.ts @@ -7,7 +7,7 @@ import { authCookie } from '../helpers/auth'; import type { FactoryOrm } from '../helpers/factories/context'; import { makeUser } from '../helpers/factories/users'; import { resetDatabase } from '../helpers/reset-database'; -import { resetTestDb, resetRateLimits } from '../helpers/test-db'; +import { resetRateLimits } from '../helpers/test-db'; import { MikroORM } from '@mikro-orm/core'; import type { INestApplication } from '@nestjs/common'; diff --git a/server/tests/integration/share.test.ts b/server/tests/integration/share.test.ts index 8799e5757..876a48f99 100644 --- a/server/tests/integration/share.test.ts +++ b/server/tests/integration/share.test.ts @@ -21,15 +21,12 @@ import { StorageService } from '../../src/nest/storage/storage.service'; import { authCookie } from '../helpers/auth'; import { makeCollabMessage } from '../helpers/factories/collab'; import type { FactoryOrm } from '../helpers/factories/context'; -import { makeDayAssignment } from '../helpers/factories/itinerary'; -import { makeDayNote } from '../helpers/factories/itinerary'; +import { makeDayAssignment, makeDayNote } from '../helpers/factories/itinerary'; import { makePackingItem } from '../helpers/factories/packing'; import { makePlace } from '../helpers/factories/places'; import { deleteRows, insertRow, updateRows } from '../helpers/factories/rows'; import { setAppSetting } from '../helpers/factories/settings'; -import { addTripMember } from '../helpers/factories/trips'; -import { makeDay } from '../helpers/factories/trips'; -import { makeTrip } from '../helpers/factories/trips'; +import { addTripMember, makeDay, makeTrip } from '../helpers/factories/trips'; import { makeUser } from '../helpers/factories/users'; import { resetDatabase } from '../helpers/reset-database'; import { resetRateLimits } from '../helpers/test-db'; diff --git a/server/tests/integration/systemNotices.test.ts b/server/tests/integration/systemNotices.test.ts index ec55bc05d..b6e87715c 100644 --- a/server/tests/integration/systemNotices.test.ts +++ b/server/tests/integration/systemNotices.test.ts @@ -14,8 +14,7 @@ import { authCookie } from '../helpers/auth'; import type { FactoryOrm } from '../helpers/factories/context'; import { insertRow, updateRows } from '../helpers/factories/rows'; import { setAppSetting } from '../helpers/factories/settings'; -import { makeAdmin } from '../helpers/factories/users'; -import { makeUser } from '../helpers/factories/users'; +import { makeAdmin, makeUser } from '../helpers/factories/users'; import { resetDatabase } from '../helpers/reset-database'; import { MikroORM } from '@mikro-orm/core'; import type { INestApplication } from '@nestjs/common'; diff --git a/server/tests/integration/tags.test.ts b/server/tests/integration/tags.test.ts index 287bb3a4b..0df421142 100644 --- a/server/tests/integration/tags.test.ts +++ b/server/tests/integration/tags.test.ts @@ -7,7 +7,7 @@ import { authCookie } from '../helpers/auth'; import type { FactoryOrm } from '../helpers/factories/context'; import { makeUser } from '../helpers/factories/users'; import { resetDatabase } from '../helpers/reset-database'; -import { resetTestDb, resetRateLimits } from '../helpers/test-db'; +import { resetRateLimits } from '../helpers/test-db'; import { MikroORM } from '@mikro-orm/core'; import type { INestApplication } from '@nestjs/common'; diff --git a/server/tests/integration/todo.test.ts b/server/tests/integration/todo.test.ts index 28605adb5..ed55400f9 100644 --- a/server/tests/integration/todo.test.ts +++ b/server/tests/integration/todo.test.ts @@ -8,11 +8,10 @@ import { invalidatePermissionsCache } from '../../src/nest/permissions/permissio import { authCookie } from '../helpers/auth'; import type { FactoryOrm } from '../helpers/factories/context'; import { findRows } from '../helpers/factories/rows'; -import { addTripMember } from '../helpers/factories/trips'; -import { makeTrip } from '../helpers/factories/trips'; +import { addTripMember, makeTrip } from '../helpers/factories/trips'; import { makeUser } from '../helpers/factories/users'; import { resetDatabase } from '../helpers/reset-database'; -import { resetTestDb, resetRateLimits } from '../helpers/test-db'; +import { resetRateLimits } from '../helpers/test-db'; import { MikroORM } from '@mikro-orm/core'; import type { INestApplication } from '@nestjs/common'; diff --git a/server/tests/integration/trip-access-primitives.test.ts b/server/tests/integration/trip-access-primitives.test.ts index 43afd1409..37385e100 100644 --- a/server/tests/integration/trip-access-primitives.test.ts +++ b/server/tests/integration/trip-access-primitives.test.ts @@ -22,9 +22,7 @@ import type { FactoryOrm } from '../helpers/factories/context'; import { makeDayAssignment } from '../helpers/factories/itinerary'; import { makePlace } from '../helpers/factories/places'; import { findRow, updateRows } from '../helpers/factories/rows'; -import { addTripMember } from '../helpers/factories/trips'; -import { makeDay } from '../helpers/factories/trips'; -import { makeTrip } from '../helpers/factories/trips'; +import { addTripMember, makeDay, makeTrip } from '../helpers/factories/trips'; import { makeUser } from '../helpers/factories/users'; import { resetDatabase } from '../helpers/reset-database'; import { resetRateLimits } from '../helpers/test-db'; diff --git a/server/tests/integration/trips.test.ts b/server/tests/integration/trips.test.ts index 898a341a5..dd4e8e014 100644 --- a/server/tests/integration/trips.test.ts +++ b/server/tests/integration/trips.test.ts @@ -23,22 +23,14 @@ import { invalidatePermissionsCache } from '../../src/nest/permissions/permissio import { authCookie } from '../helpers/auth'; import { makeBudgetItem } from '../helpers/factories/budget'; import type { FactoryOrm } from '../helpers/factories/context'; -import { makeDayAccommodation } from '../helpers/factories/itinerary'; -import { makeDayAssignment } from '../helpers/factories/itinerary'; -import { makeDayNote } from '../helpers/factories/itinerary'; +import { makeDayAccommodation, makeDayAssignment, makeDayNote } from '../helpers/factories/itinerary'; import { makePackingItem } from '../helpers/factories/packing'; -import { makePlace } from '../helpers/factories/places'; -import { makeTag } from '../helpers/factories/places'; -import { tagPlace } from '../helpers/factories/places'; +import { makePlace, makeTag, tagPlace } from '../helpers/factories/places'; import { makeReservation } from '../helpers/factories/reservations'; import { countRows, findRow, findRows, insertRow, insertRows, updateRows } from '../helpers/factories/rows'; import { setAppSetting } from '../helpers/factories/settings'; -import { addTripMember } from '../helpers/factories/trips'; -import { makeTrip } from '../helpers/factories/trips'; -import { readTripDays } from '../helpers/factories/trips'; -import { makeAdmin } from '../helpers/factories/users'; -import { makeUser } from '../helpers/factories/users'; -import { readUser } from '../helpers/factories/users'; +import { addTripMember, makeTrip, readTripDays } from '../helpers/factories/trips'; +import { makeAdmin, makeUser, readUser } from '../helpers/factories/users'; import { resetDatabase } from '../helpers/reset-database'; import { resetRateLimits } from '../helpers/test-db'; import { MikroORM } from '@mikro-orm/core'; diff --git a/server/tests/integration/uploads-photo-request-context.test.ts b/server/tests/integration/uploads-photo-request-context.test.ts index f520aa814..ea441cb85 100644 --- a/server/tests/integration/uploads-photo-request-context.test.ts +++ b/server/tests/integration/uploads-photo-request-context.test.ts @@ -31,8 +31,7 @@ import { StorageService } from '../../src/nest/storage/storage.service'; import { generateToken } from '../helpers/auth'; import type { FactoryOrm } from '../helpers/factories/context'; import { insertRow } from '../helpers/factories/rows'; -import { makeTrip } from '../helpers/factories/trips'; -import { makeShareToken } from '../helpers/factories/trips'; +import { makeTrip, makeShareToken } from '../helpers/factories/trips'; import { makeUser } from '../helpers/factories/users'; import { resetDatabase } from '../helpers/reset-database'; import { MikroORM } from '@mikro-orm/core';