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.
This commit is contained in:
Maurice
2026-11-17 18:15:31 +01:00
parent 88c2b8b991
commit 965a7f2ea8
9 changed files with 15 additions and 32 deletions
+2 -3
View File
@@ -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';
+1 -1
View File
@@ -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';
+2 -5
View File
@@ -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';
@@ -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';
+1 -1
View File
@@ -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';
+2 -3
View File
@@ -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';
@@ -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';
+4 -12
View File
@@ -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';
@@ -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';