diff --git a/test/buildConfigWithDefaults.ts b/test/buildConfigWithDefaults.ts index 74b0c75c68..c7995bddd9 100644 --- a/test/buildConfigWithDefaults.ts +++ b/test/buildConfigWithDefaults.ts @@ -32,7 +32,7 @@ import sharp from 'sharp' // process.env.PAYLOAD_DATABASE = 'postgres' const databaseAdapters = { - mongoose: mongooseAdapter({ + mongodb: mongooseAdapter({ url: process.env.DATABASE_URI || 'mongodb://127.0.0.1/payloadtests', }), postgres: postgresAdapter({ @@ -65,14 +65,13 @@ let mongoMemoryServer = global._mongoMemoryServer export async function buildConfigWithDefaults( testConfig?: Partial, ): Promise { - console.log({ - mongoMemoryServer, - payloadDatabase: process.env.PAYLOAD_DATABASE, - jestWorkerID: process.env.JEST_WORKER_ID, - pwTestSourceTransform: process.env.PW_TEST_SOURCE_TRANSFORM, + Object.entries(process.env).forEach(([key, val]) => { + if (key.startsWith('PW')) { + console.log({ key, val }) + } }) - if (!process.env.PAYLOAD_DATABASE || process.env.PAYLOAD_DATABASE === 'mongoose') { + if (!process.env.PAYLOAD_DATABASE || process.env.PAYLOAD_DATABASE === 'mongodb') { if (process.env.JEST_WORKER_ID || process.env.PW_TEST_SOURCE_TRANSFORM) { if (!mongoMemoryServer) { mongoMemoryServer = await MongoMemoryReplSet.create({ @@ -86,7 +85,7 @@ export async function buildConfigWithDefaults( console.log({ url }) - databaseAdapters.mongoose = mongooseAdapter({ + databaseAdapters.mongodb = mongooseAdapter({ mongoMemoryServer, url, }) @@ -95,7 +94,7 @@ export async function buildConfigWithDefaults( } const config: Config = { - db: databaseAdapters[process.env.PAYLOAD_DATABASE || 'mongoose'], + db: databaseAdapters[process.env.PAYLOAD_DATABASE || 'mongodb'], secret: 'TEST_SECRET', //editor: slateEditor({}), // editor: slateEditor({ diff --git a/test/collections-graphql/int.spec.ts b/test/collections-graphql/int.spec.ts index 7ddee74cf8..248cc982a6 100644 --- a/test/collections-graphql/int.spec.ts +++ b/test/collections-graphql/int.spec.ts @@ -562,7 +562,7 @@ describe('collections-graphql', () => { expect(docs).toContainEqual(expect.objectContaining({ id: specialPost.id })) }) - if (['mongoose'].includes(process.env.PAYLOAD_DATABASE)) { + if (['mongodb'].includes(process.env.PAYLOAD_DATABASE)) { describe('near', () => { const point = [10, 20] const [lat, lng] = point diff --git a/test/collections-rest/int.spec.ts b/test/collections-rest/int.spec.ts index 83acde5a75..30df5b10d7 100644 --- a/test/collections-rest/int.spec.ts +++ b/test/collections-rest/int.spec.ts @@ -980,7 +980,7 @@ describe('collections-rest', () => { }) }) - if (['mongoose'].includes(process.env.PAYLOAD_DATABASE)) { + if (['mongodb'].includes(process.env.PAYLOAD_DATABASE)) { describe('near', () => { const point = [10, 20] const [lat, lng] = point diff --git a/test/helpers/isMongoose.ts b/test/helpers/isMongoose.ts index 2e44ead72c..728bec24b6 100644 --- a/test/helpers/isMongoose.ts +++ b/test/helpers/isMongoose.ts @@ -1,5 +1,5 @@ import type { Payload } from 'payload' export function isMongoose(_payload?: Payload) { - return _payload?.db?.name === 'mongoose' || ['mongoose'].includes(process.env.PAYLOAD_DATABASE) + return _payload?.db?.name === 'mongodb' || ['mongodb'].includes(process.env.PAYLOAD_DATABASE) } diff --git a/test/setup.js b/test/setup.js index 368d92cb53..89e8091f76 100644 --- a/test/setup.js +++ b/test/setup.js @@ -8,7 +8,7 @@ export default async () => { process.env.NODE_OPTIONS = '--no-deprecation' if ( - (!process.env.PAYLOAD_DATABASE || process.env.PAYLOAD_DATABASE === 'mongoose') && + (!process.env.PAYLOAD_DATABASE || process.env.PAYLOAD_DATABASE === 'mongodb') && !global._mongoMemoryServer ) { global._mongoMemoryServer = await MongoMemoryReplSet.create({