chore: use transactions in tests running mongoDB memory server (#4750)

* chore: use transactions in tests running mongoDB memory server

* chore: relationship test async setup changes

* chore: async test fix

* chore: flaky e2e localization test

Author: DanRibbens

packages/db-mongodb/src/connect.ts

@@ -29,15 +29,18 @@ export const connect: Connect = async function connect(this: MongooseAdapter, pa
       urlToConnect = process.env.PAYLOAD_TEST_MONGO_URL
     } else {
       connectionOptions.dbName = 'payloadmemory'
-      const { MongoMemoryServer } = require('mongodb-memory-server')
+      const { MongoMemoryReplSet } = require('mongodb-memory-server')
       const getPort = require('get-port')
 
       const port = await getPort()
-      this.mongoMemoryServer = await MongoMemoryServer.create({
+      this.mongoMemoryServer = await MongoMemoryReplSet.create({
         instance: {
           dbName: 'payloadmemory',
           port,
         },
+        replSet: {
+          count: 3,
+        },
       })
 
       urlToConnect = this.mongoMemoryServer.getUri()

test/config/int.spec.ts

@@ -1,4 +1,4 @@
-import type { BlockField } from 'payload/types';
+import type { BlockField } from 'payload/types'
 
 import payload from '../../packages/payload/src'
 import { initPayloadTest } from '../helpers/configHelpers'

test/database/int.spec.ts

@@ -16,16 +16,12 @@ describe('database', () => {
   const collection = 'posts'
   const title = 'title'
   let user: TypeWithID & Record<string, unknown>
-  let useTransactions = true
 
   beforeAll(async () => {
     const init = await initPayloadTest({ __dirname, init: { local: false } })
     serverURL = init.serverURL
     const url = `${serverURL}/api/graphql`
     client = new GraphQLClient(url)
-    if (payload.db.name === 'mongoose') {
-      useTransactions = false
-    }
 
     const loginResult = await payload.login({
       collection: 'users',
@@ -57,15 +53,13 @@ describe('database', () => {
           req,
         })
 
-        if (useTransactions) {
-          await expect(() =>
-            payload.findByID({
-              id: first.id,
-              collection,
-              // omitting req for isolation
-            }),
-          ).rejects.toThrow('The requested resource was not found.')
-        }
+        await expect(() =>
+          payload.findByID({
+            id: first.id,
+            collection,
+            // omitting req for isolation
+          }),
+        ).rejects.toThrow('The requested resource was not found.')
 
         const second = await payload.create({
           collection,
@@ -180,15 +174,13 @@ describe('database', () => {
         // this should not do anything but is needed to be certain about the next assertion
         await commitTransaction(req)
 
-        if (useTransactions) {
-          await expect(() =>
-            payload.findByID({
-              id: first.id,
-              collection,
-              req,
-            }),
-          ).rejects.toThrow('The requested resource was not found.')
-        }
+        await expect(() =>
+          payload.findByID({
+            id: first.id,
+            collection,
+            req,
+          }),
+        ).rejects.toThrow('The requested resource was not found.')
       })
     })
   })

test/fields-relationship/e2e.spec.ts

@@ -11,7 +11,6 @@ import type {
 } from './payload-types'
 
 import payload from '../../packages/payload/src'
-import { mapAsync } from '../../packages/payload/src/utilities/mapAsync'
 import wait from '../../packages/payload/src/utilities/wait'
 import { initPageConsoleErrorCatch, openDocControls, saveDocAndAssert } from '../helpers'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil'
@@ -525,10 +524,10 @@ async function clearAllDocs(): Promise<void> {
 }
 
 async function clearCollectionDocs(collectionSlug: string): Promise<void> {
-  const ids = (await payload.find({ collection: collectionSlug, limit: 100 })).docs.map(
-    (doc) => doc.id,
-  )
-  await mapAsync(ids, async (id) => {
-    await payload.delete({ id, collection: collectionSlug })
+  await payload.delete({
+    collection: collectionSlug,
+    where: {
+      id: { exists: true },
+    },
   })
 }

test/fields/e2e.spec.ts

@@ -6,7 +6,6 @@ import path from 'path'
 import type { RelationshipField, TextField } from './payload-types'
 
 import payload from '../../packages/payload/src'
-import { mapAsync } from '../../packages/payload/src/utilities/mapAsync'
 import wait from '../../packages/payload/src/utilities/wait'
 import {
   exactText,
@@ -900,6 +899,7 @@ describe('fields', () => {
       await page.goto(url.list)
       await page.locator('.row-1 .cell-title a').click()
     }
+
     describe('cell', () => {
       test('ensure cells are smaller than 300px in height', async () => {
         const url: AdminUrlUtil = new AdminUrlUtil(serverURL, 'rich-text-fields')
@@ -1387,13 +1387,9 @@ describe('fields', () => {
 
     afterEach(async () => {
       // delete all existing relationship documents
-      const allRelationshipDocs = await payload.find({
+      await payload.delete({
         collection: relationshipFieldsSlug,
-        limit: 100,
-      })
-      const relationshipIDs = allRelationshipDocs.docs.map((doc) => doc.id)
-      await mapAsync(relationshipIDs, async (id) => {
-        await payload.delete({ id, collection: relationshipFieldsSlug })
+        where: { id: { exists: true } },
       })
     })
 

test/localization/e2e.spec.ts

@@ -216,7 +216,8 @@ describe('Localization', () => {
       await page.fill('#field-layout__0__text', 'test')
       await saveDocAndAssert(page)
 
-      const originalDocURL = page.url()
+      const originalID = await page.locator('.id-label').innerText()
+
       // duplicate
       await openDocControls(page)
       await page.locator('#action-duplicate').click()
@@ -229,7 +230,7 @@ describe('Localization', () => {
       await expect(page.locator('.Toastify')).toContainText('successfully duplicated')
 
       // expect that the document has a new id
-      expect(page.url()).not.toStrictEqual(originalDocURL)
+      await expect(page.locator('.id-label')).not.toContainText(originalID)
     })
   })
 })

test/relationships/int.spec.ts

@@ -11,7 +11,6 @@ import type {
 } from './payload-types'
 
 import payload from '../../packages/payload/src'
-import { mapAsync } from '../../packages/payload/src/utilities/mapAsync'
 import { devUser } from '../credentials'
 import { initPayloadTest } from '../helpers/configHelpers'
 import { RESTClient } from '../helpers/rest'
@@ -40,7 +39,7 @@ describe('Relationships', () => {
   beforeAll(async () => {
     const { serverURL } = await initPayloadTest({ __dirname, init: { local: false } })
     apiUrl = `${serverURL}/api`
-    client = new RESTClient(config, { serverURL, defaultSlug: slug })
+    client = new RESTClient(config, { defaultSlug: slug, serverURL })
     await client.login()
 
     const response = await fetch(`${apiUrl}/users/login`, {
@@ -128,8 +127,8 @@ describe('Relationships', () => {
         })
 
         chained3 = await payload.update<ChainedRelation>({
-          collection: chainedRelSlug,
           id: chained3.id,
+          collection: chainedRelSlug,
           data: {
             name: 'chain3',
             relation: chained.id,
@@ -155,13 +154,13 @@ describe('Relationships', () => {
         })
 
         post = await createPost({
-          relationField: relation.id,
-          defaultAccessRelation: defaultAccessRelation.id,
           chainedRelation: chained.id,
-          maxDepthRelation: relation.id,
-          customIdRelation: customIdRelation.id,
           customIdNumberRelation: customIdNumberRelation.id,
+          customIdRelation: customIdRelation.id,
+          defaultAccessRelation: defaultAccessRelation.id,
           filteredRelation: filteredRelation.id,
+          maxDepthRelation: relation.id,
+          relationField: relation.id,
         })
 
         await createPost() // Extra post to allow asserting totalDoc count
@@ -194,15 +193,15 @@ describe('Relationships', () => {
         expect(docAfterUpdatingRel.filteredRelation).toMatchObject({ id: filteredRelation.id })
 
         // Attempt to update post with a now filtered relation
-        const { status, errors } = await client.update<Post>({
+        const { errors, status } = await client.update<Post>({
           id: post.id,
           data: { filteredRelation: filteredRelation.id },
         })
 
         expect(errors?.[0]).toMatchObject({
           name: 'ValidationError',
-          message: expect.any(String),
           data: expect.anything(),
+          message: expect.any(String),
         })
         expect(status).toEqual(400)
       })
@@ -307,8 +306,8 @@ describe('Relationships', () => {
 
         it('should allow update removing a relationship', async () => {
           const result = await client.update<Post>({
-            slug,
             id: post.id,
+            slug,
             data: {
               relationField: null,
             },
@@ -446,8 +445,8 @@ describe('Relationships', () => {
         await payload.create({
           collection: 'screenings',
           data: {
-            movie: movie.id,
             name: 'Pulp Fiction Screening',
+            movie: movie.id,
           },
         })
       })
@@ -486,8 +485,8 @@ describe('Relationships', () => {
 
       beforeAll(async () => {
         await Promise.all(
-          movieList.map((movie) => {
-            return payload.create({
+          movieList.map(async (movie) => {
+            return await payload.create({
               collection: 'movies',
               data: {
                 name: movie,
@@ -528,8 +527,8 @@ describe('Relationships', () => {
       it('should allow clearing hasMany relationships', async () => {
         const fiveMovies = await payload.find({
           collection: 'movies',
-          limit: 5,
           depth: 0,
+          limit: 5,
         })
 
         const movieIDs = fiveMovies.docs.map((doc) => doc.id)
@@ -545,8 +544,8 @@ describe('Relationships', () => {
         expect(stanley.movies).toHaveLength(5)
 
         const stanleyNeverMadeMovies = await payload.update({
-          collection: 'directors',
           id: stanley.id,
+          collection: 'directors',
           data: {
             movies: null,
           },
@@ -621,18 +620,18 @@ describe('Relationships', () => {
         const req = {} as PayloadRequest
         req.transactionID = await payload.db.beginTransaction?.()
         const related = await payload.create({
-          req,
           collection: relationSlug,
           data: {
             name: 'parent',
           },
+          req,
         })
         const withRelation = await payload.create({
-          req,
           collection: slug,
           data: {
             filteredRelation: related.id,
           },
+          req,
         })
 
         if (req.transactionID) {
@@ -656,8 +655,8 @@ describe('Relationships', () => {
         collection: 'polymorphic-relationships',
         data: {
           polymorphic: {
-            value: movie.id,
             relationTo: 'movies',
+            value: movie.id,
           },
         },
       })
@@ -709,9 +708,8 @@ async function createPost(overrides?: Partial<Post>) {
 }
 
 async function clearDocs(): Promise<void> {
-  const allDocs = await payload.find({ collection: slug, limit: 100 })
-  const ids = allDocs.docs.map((doc) => doc.id)
-  await mapAsync(ids, async (id) => {
-    await payload.delete({ collection: slug, id })
+  await payload.delete({
+    collection: slug,
+    where: { id: { exists: true } },
   })
 }