Clean

packages/server/src/api/routes/tests/rowAction.spec.ts

@@ -150,7 +150,7 @@ describe("/rowsActions", () => {
 
     it("trims row action names", async () => {
       const name = "   action  name  "
-      const res = await createRowAction(tableId, { name }, { status: 201 })
+      const res = await createRowAction(tableId, { name })
 
       expect(res).toEqual(
         expect.objectContaining({
@@ -218,9 +218,7 @@ describe("/rowsActions", () => {
         id: generator.guid(),
         valueToIgnore: generator.string(),
       }
-      const res = await createRowAction(tableId, dirtyRowAction, {
+      const res = await createRowAction(tableId, dirtyRowAction)
-        status: 201,
-      })
 
       expect(res).toEqual({
         name: rowAction.name,
@@ -283,9 +281,9 @@ describe("/rowsActions", () => {
       const action2 = await createRowAction(tableId, createRowActionRequest())
 
       for (const automationId of [action1.automationId, action2.automationId]) {
-        expect(
+        expect(await config.api.automation.get(automationId)).toEqual(
-          await config.api.automation.get(automationId, { status: 200 })
+          expect.objectContaining({ _id: automationId })
-        ).toEqual(expect.objectContaining({ _id: automationId }))
+        )
       }
     })
   })
@@ -374,13 +372,7 @@ describe("/rowsActions", () => {
     })
 
     it("trims row action names", async () => {
-      const rowAction = await createRowAction(
+      const rowAction = await createRowAction(tableId, createRowActionRequest())
-        tableId,
-        createRowActionRequest(),
-        {
-          status: 201,
-        }
-      )
 
       const res = await config.api.rowAction.update(tableId, rowAction.id, {
         name: "   action  name  ",
@@ -572,32 +564,16 @@ describe("/rowsActions", () => {
     })
 
     it("can set permission views", async () => {
-      await config.api.rowAction.setViewPermission(
+      await config.api.rowAction.setViewPermission(tableId, viewId1, actionId1)
-        tableId,
-        viewId1,
-        actionId1,
-        {
-          status: 200,
-          body: {},
-        }
-      )
       const action1Result = await config.api.rowAction.setViewPermission(
         tableId,
         viewId2,
-        actionId1,
+        actionId1
-        {
-          status: 200,
-          body: {},
-        }
       )
       const action2Result = await config.api.rowAction.setViewPermission(
         tableId,
         viewId1,
-        actionId2,
+        actionId2
-        {
-          status: 200,
-          body: {},
-        }
       )
 
       const expectedAction1 = expect.objectContaining({
@@ -622,11 +598,7 @@ describe("/rowsActions", () => {
       const actionResult = await config.api.rowAction.unsetViewPermission(
         tableId,
         viewId1,
-        actionId1,
+        actionId1
-        {
-          status: 200,
-          body: {},
-        }
       )
 
       const expectedAction = expect.objectContaining({

packages/server/src/tests/utilities/api/rowAction.ts

@@ -18,8 +18,8 @@ export class RowActionAPI extends TestAPI {
       {
         body: rowAction,
         expectations: {
+          status: 201,
           ...expectations,
-          status: expectations?.status || 201,
         },
         ...config,
       }
@@ -82,7 +82,10 @@ export class RowActionAPI extends TestAPI {
     return await this._post<RowActionResponse>(
       `/api/tables/${tableId}/actions/${rowActionId}/permissions/${viewId}`,
       {
-        expectations,
+        expectations: {
+          status: 200,
+          ...expectations,
+        },
         ...config,
       }
     )
@@ -98,7 +101,10 @@ export class RowActionAPI extends TestAPI {
     return await this._delete<RowActionResponse>(
       `/api/tables/${tableId}/actions/${rowActionId}/permissions/${viewId}`,
       {
-        expectations,
+        expectations: {
+          status: 200,
+          ...expectations,
+        },
         ...config,
       }
     )