fix access test prefix

Author: dcousens

tests/api-tests/access.test.ts

@@ -254,6 +254,8 @@ describe(`Access (${dbProvider})`, () => {
   }
 
   for (const l of lists) {
+    const itemQuery = `id ${l.fields.map(x => x.name).join(' ')}`
+
     describe(`${l.name}`, () => {
       test.concurrent(`list.access.${l.expect.type}.query: ${l.expect.query}`, async () => {
         const { context } = await suite()
@@ -262,7 +264,7 @@ describe(`Access (${dbProvider})`, () => {
         // test list.access.*.query
         const item = await context.query[l.name].findOne({
           where: { id },
-          query: `id ${l.fields.map(x => x.name).join(' ')}`
+          query: itemQuery
         })
 
         if (!l.expect.query) {
@@ -294,7 +296,7 @@ describe(`Access (${dbProvider})`, () => {
               in: ids
             }
           },
-          query: `id ${l.fields.map(x => x.name).join(' ')}`
+          query: itemQuery
         })
 
         expect(items).not.toBe(null)
@@ -347,7 +349,7 @@ describe(`Access (${dbProvider})`, () => {
         // test list.access.*.create
         const createPromise = context.query[l.name].createOne({
           data: {},
-          query: `id ${l.fields.map(x => x.name).join(' ')}`
+          query: itemQuery
         })
 
         if (!l.expect.create) {
@@ -377,7 +379,7 @@ describe(`Access (${dbProvider})`, () => {
         // test list.access.*.create
         const createPromise = context.query[l.name].createMany({
           data: [...Array(count)].map(x => ({})),
-          query: `id ${l.fields.map(x => x.name).join(' ')}`
+          query: itemQuery
         })
 
         if (!l.expect.create) {
@@ -410,7 +412,7 @@ describe(`Access (${dbProvider})`, () => {
         const updatePromise = context.query[l.name].updateOne({
           where: { id },
           data: {},
-          query: `id ${l.fields.map(x => x.name).join(' ')}`
+          query: itemQuery
         })
 
         if (!l.expect.update) {
@@ -445,7 +447,7 @@ describe(`Access (${dbProvider})`, () => {
             },
             data: {}
           })),
-          query: `id ${l.fields.map(x => x.name).join(' ')}`
+          query: itemQuery
         })
 
         if (!l.expect.update) {
@@ -477,12 +479,16 @@ describe(`Access (${dbProvider})`, () => {
         // test list.access.*.delete
         const deletePromise = context.query[l.name].deleteOne({
           where: { id },
-          query: `id ${l.fields.map(x => x.name).join(' ')}`
+          query: itemQuery
         })
 
         if (!l.expect.delete) {
           const error = deletePromise.catch(e => e.message)
-          expect(await error).resolves.toBe(`Access denied: You cannot delete that ${l.name} - it may not exist`)
+          expect(await error).toBe(`Access denied: You cannot delete that ${l.name} - it may not exist`)
+
+          // sudo required, as we might not have query/read access
+          const count = await context.prisma[l.name].count({ where: { id } })
+          expect(count).toBe(1)
           return
         }
 
@@ -500,8 +506,8 @@ describe(`Access (${dbProvider})`, () => {
         }
 
         // 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)
+        const count = await context.prisma[l.name].count({ where: { id } })
+        expect(count).toBe(0)
       })
 
       test.concurrent(`list.access.${l.expect.type}.delete: ${l.expect.delete} (deleteMany)`, async () => {
@@ -513,12 +519,15 @@ describe(`Access (${dbProvider})`, () => {
           where: ids.map((id) => ({
             id
           })),
-          query: `id ${l.fields.map(x => x.name).join(' ')}`
+          query: itemQuery
         })
 
         if (!l.expect.delete) {
           const error = deletePromise.catch(e => e.message)
-          expect(await error).resolves.toBe(`Access denied: You cannot delete that ${l.name} - it may not exist`)
+          expect(await error).toBe(`Access denied: You cannot delete that ${l.name} - it may not exist`)
+
+          const count = await context.prisma[l.name].count({ where: { id: { in: ids } } })
+          expect(count).toBe(ids.length) // unchanged
           return
         }
 
@@ -538,14 +547,8 @@ 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)
+        const count = await context.prisma[l.name].count({ where: { id: { in: ids } } })
+        expect(count).toBe(0) // changed
       })
 
       // field operations tests
@@ -625,11 +628,11 @@ describe(`Access (${dbProvider})`, () => {
               // test field.access.create
               if (!f.expect.create) {
                 const error = createPromise.catch((e: any) => e.message)
-                await expect(error).resolves.toBe(`Access denied: You cannot create that ${l.name} - you cannot create the fields ["${f.name}"]`)
+                expect(await error).toBe(`Access denied: You cannot create that ${l.name} - you cannot create the fields ["${f.name}"]`)
                 return
               }
 
-              await expect(createPromise).resolves.not.toBe(null)
+              expect(await createPromise).not.toBe(null)
               const item = await createPromise
               expect(item).not.toBe(null)
               expect(item.id).not.toBe(null)
@@ -656,13 +659,13 @@ describe(`Access (${dbProvider})`, () => {
                 data: [...Array(count)].map(x => ({
                   [f.name]: 'foo'
                 })),
-                query: `id ${l.fields.map(x => x.name).join(' ')}`
+                query: itemQuery
               })
 
               // test field.access.create
               if (!f.expect.create) {
                 const error = createPromise.catch(e => e.message)
-                await expect(error).resolves.toBe(`Access denied: You cannot create that ${l.name} - you cannot create the fields ["${f.name}"]`)
+                expect(await error).toBe(`Access denied: You cannot create that ${l.name} - you cannot create the fields ["${f.name}"]`)
                 return
               }
 
@@ -709,11 +712,11 @@ 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
               }
 
-              await expect(updatePromise).resolves.not.toBe(null)
+              expect(await updatePromise).not.toBe(null)
               const item = await updatePromise
               expect(item).not.toBe(null)
               expect(item!.id).toBe(id)