reduce the number of context calls for delete access tests

Author: dcousens

tests/api-tests/access.test.ts

@@ -322,20 +322,20 @@ describe(`Access (${dbProvider})`, () => {
 
       test.concurrent(`list.access.${l.expect.type}.query: ${l.expect.query} for counting`, async () => {
         const { context } = await suite()
-        const id = await seed(l.name, context)
+        const ids = await seedMany(l.name, context)
 
         // test list.access.*.query
         const count = await context.query[l.name].count({
           where: {
             id: {
-              equals: id
+              in: ids
             }
           }
         })
 
         if (l.expect.query) {
           expect(count).not.toBe(null)
-          expect(count).toBe(1)
+          expect(count).toBe(ids.length)
         } else {
           expect(count).toBe(0)
         }
@@ -352,7 +352,7 @@ describe(`Access (${dbProvider})`, () => {
 
         if (!l.expect.create) {
           const error = createPromise.catch((e: any) => e.message)
-          await expect(error).resolves.toBe(`Access denied: You cannot create that ${l.name}`)
+          expect(await error).toBe(`Access denied: You cannot create that ${l.name}`)
           return
         }
 
@@ -382,7 +382,7 @@ describe(`Access (${dbProvider})`, () => {
 
         if (!l.expect.create) {
           const error = createPromise.catch((e: any) => e.message)
-          await expect(error).resolves.toBe(`Access denied: You cannot create that ${l.name}`)
+          expect(await error).toBe(`Access denied: You cannot create that ${l.name}`)
           return
         }
 
@@ -415,7 +415,7 @@ describe(`Access (${dbProvider})`, () => {
 
         if (!l.expect.update) {
           const error = updatePromise.catch(e => e.message)
-          await expect(error).resolves.toBe(`Access denied: You cannot update that ${l.name} - it may not exist`)
+          expect(await error).toBe(`Access denied: You cannot update that ${l.name} - it may not exist`)
           return
         }
 
@@ -450,7 +450,7 @@ describe(`Access (${dbProvider})`, () => {
 
         if (!l.expect.update) {
           const error = updatePromise.catch(e => e.message)
-          await expect(error).resolves.toBe(`Access denied: You cannot update that ${l.name} - it may not exist`)
+          expect(await error).toBe(`Access denied: You cannot update that ${l.name} - it may not exist`)
           return
         }
 
@@ -482,7 +482,7 @@ describe(`Access (${dbProvider})`, () => {
 
         if (!l.expect.delete) {
           const error = deletePromise.catch(e => e.message)
-          await expect(error).resolves.toBe(`Access denied: You cannot delete that ${l.name} - it may not exist`)
+          expect(await error).resolves.toBe(`Access denied: You cannot delete that ${l.name} - it may not exist`)
           return
         }
 
@@ -499,7 +499,7 @@ describe(`Access (${dbProvider})`, () => {
           }
         }
 
-        // sudo required, as we might not have read
+        // sudo required, as we might not have query/read access
         const item_ = await context.sudo().db[l.name].findOne({ where: { id } })
         expect(item_).toBe(null)
       })
@@ -518,7 +518,7 @@ describe(`Access (${dbProvider})`, () => {
 
         if (!l.expect.delete) {
           const error = deletePromise.catch(e => e.message)
-          await expect(error).resolves.toBe(`Access denied: You cannot delete that ${l.name} - it may not exist`)
+          expect(await error).resolves.toBe(`Access denied: You cannot delete that ${l.name} - it may not exist`)
           return
         }
 
@@ -536,6 +536,16 @@ describe(`Access (${dbProvider})`, () => {
             }
           }
         }
+
+        // sudo required, as we might not have query/read access
+        const items_ = await context.sudo().db[l.name].findMany({
+          where: {
+            id: {
+              in: items.map(x => x.id)
+            }
+          }
+        })
+        expect(items_).toHaveLength(0)
       })
 
       // field operations tests
@@ -632,7 +642,7 @@ describe(`Access (${dbProvider})`, () => {
                 expect(item![f.name]).toBe(null)
               }
 
-              // sudo required, as we might not have read
+              // sudo required, as we might not have query/read access
               const item_ = await context.sudo().db[l.name].findOne({ where: { id: item.id } })
               expect(item_![f.name]).toBe('foo')
             })
@@ -660,18 +670,24 @@ describe(`Access (${dbProvider})`, () => {
               expect(items).not.toBe(null)
               expect(items).toHaveLength(count)
 
+              // sudo required, as we might not have query/read access
+              const items_ = await context.sudo().db[l.name].findMany({
+                where: {
+                  id: {
+                    in: items.map(x => x.id)
+                  }
+                }
+              })
+
               for (const item of items) {
                 // test field.access.read
                 expect(item).toHaveProperty(f.name)
                 if (f.expect.read) {
                   expect(item![f.name]).toBe('foo')
                 } else {
                   expect(item![f.name]).toBe(null)
+                  expect(items_.find(x => x.id === item.id)![f.name]).toBe('foo')
                 }
-
-                // sudo required, as we might not have read
-                const item_ = await context.sudo().db[l.name].findOne({ where: { id: item.id } })
-                expect(item_![f.name]).toBe('foo')
               }
             })
           }
@@ -733,7 +749,7 @@ describe(`Access (${dbProvider})`, () => {
               // test field.access.update
               if (!f.expect.update) {
                 const error = updatePromise.catch(e => e.message)
-                await expect(error).resolves.toBe(`Access denied: You cannot update that ${l.name} - you cannot update the fields ["${f.name}"]`)
+                expect(await error).toBe(`Access denied: You cannot update that ${l.name} - you cannot update the fields ["${f.name}"]`)
                 return
               }