From 5b220069943efb7488a6309696abaac9dfb1791c Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Mon, 3 Mar 2025 17:22:09 +0000 Subject: [PATCH] Cleanup after automation tests. --- packages/server/src/automations/tests/steps/bash.spec.ts | 1 + .../server/src/automations/tests/steps/createRow.spec.ts | 1 + packages/server/src/automations/tests/steps/delay.spec.ts | 1 + .../server/src/automations/tests/steps/deleteRow.spec.ts | 1 + .../server/src/automations/tests/steps/discord.spec.ts | 1 + .../src/automations/tests/steps/executeQuery.spec.ts | 1 + .../src/automations/tests/steps/executeScript.spec.ts | 1 + packages/server/src/automations/tests/steps/filter.spec.ts | 1 + packages/server/src/automations/tests/steps/loop.spec.ts | 5 +---- packages/server/src/automations/tests/steps/make.spec.ts | 1 + packages/server/src/automations/tests/steps/n8n.spec.ts | 1 + packages/server/src/automations/tests/steps/openai.spec.ts | 1 + .../src/automations/tests/steps/outgoingWebhook.spec.ts | 1 + .../server/src/automations/tests/steps/queryRows.spec.ts | 1 + .../src/automations/tests/steps/sendSmtpEmail.spec.ts | 1 + .../server/src/automations/tests/steps/serverLog.spec.ts | 1 + .../automations/tests/steps/triggerAutomationRun.spec.ts | 1 + .../server/src/automations/tests/steps/updateRow.spec.ts | 1 + packages/server/src/automations/tests/steps/zapier.spec.ts | 1 + .../src/automations/tests/triggers/appAction.spec.ts | 2 ++ .../server/src/automations/tests/triggers/cron.spec.ts | 1 + .../src/automations/tests/triggers/rowDeleted.spec.ts | 1 + .../server/src/automations/tests/triggers/rowSaved.spec.ts | 1 + .../src/automations/tests/triggers/rowUpdated.spec.ts | 1 + .../server/src/automations/tests/triggers/webhook.spec.ts | 1 + packages/server/src/tests/utilities/api/automation.ts | 7 +++++++ 26 files changed, 33 insertions(+), 4 deletions(-) diff --git a/packages/server/src/automations/tests/steps/bash.spec.ts b/packages/server/src/automations/tests/steps/bash.spec.ts index a2172c3578..79ddf67a75 100644 --- a/packages/server/src/automations/tests/steps/bash.spec.ts +++ b/packages/server/src/automations/tests/steps/bash.spec.ts @@ -16,6 +16,7 @@ describe("Execute Bash Automations", () => { name: "test row", description: "test description", }) + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/steps/createRow.spec.ts b/packages/server/src/automations/tests/steps/createRow.spec.ts index 01ce227f36..6da142434a 100644 --- a/packages/server/src/automations/tests/steps/createRow.spec.ts +++ b/packages/server/src/automations/tests/steps/createRow.spec.ts @@ -33,6 +33,7 @@ describe("test the create row action", () => { name: "test", description: "test", } + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/steps/delay.spec.ts b/packages/server/src/automations/tests/steps/delay.spec.ts index 173beccbda..03f6a528a6 100644 --- a/packages/server/src/automations/tests/steps/delay.spec.ts +++ b/packages/server/src/automations/tests/steps/delay.spec.ts @@ -6,6 +6,7 @@ describe("test the delay logic", () => { beforeAll(async () => { await config.init() + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/steps/deleteRow.spec.ts b/packages/server/src/automations/tests/steps/deleteRow.spec.ts index 8c141f82da..5ec5e6035e 100644 --- a/packages/server/src/automations/tests/steps/deleteRow.spec.ts +++ b/packages/server/src/automations/tests/steps/deleteRow.spec.ts @@ -13,6 +13,7 @@ describe("test the delete row action", () => { await config.init() table = await config.api.table.save(basicTable()) row = await config.api.row.save(table._id!, {}) + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/steps/discord.spec.ts b/packages/server/src/automations/tests/steps/discord.spec.ts index 9618a0c994..8e2af09721 100644 --- a/packages/server/src/automations/tests/steps/discord.spec.ts +++ b/packages/server/src/automations/tests/steps/discord.spec.ts @@ -7,6 +7,7 @@ describe("test the outgoing webhook action", () => { beforeAll(async () => { await config.init() + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/steps/executeQuery.spec.ts b/packages/server/src/automations/tests/steps/executeQuery.spec.ts index a51d335902..d65c30c789 100644 --- a/packages/server/src/automations/tests/steps/executeQuery.spec.ts +++ b/packages/server/src/automations/tests/steps/executeQuery.spec.ts @@ -26,6 +26,7 @@ if (descriptions.length) { const ds = await dsProvider() datasource = ds.datasource! client = ds.client! + await config.api.automation.deleteAll() }) beforeEach(async () => { diff --git a/packages/server/src/automations/tests/steps/executeScript.spec.ts b/packages/server/src/automations/tests/steps/executeScript.spec.ts index 117c2341ba..ea5b8dc6b2 100644 --- a/packages/server/src/automations/tests/steps/executeScript.spec.ts +++ b/packages/server/src/automations/tests/steps/executeScript.spec.ts @@ -13,6 +13,7 @@ describe("Execute Script Automations", () => { await config.init() table = await config.api.table.save(basicTable()) await config.api.row.save(table._id!, {}) + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/steps/filter.spec.ts b/packages/server/src/automations/tests/steps/filter.spec.ts index da1f6e4702..ba7fb3e1b7 100644 --- a/packages/server/src/automations/tests/steps/filter.spec.ts +++ b/packages/server/src/automations/tests/steps/filter.spec.ts @@ -26,6 +26,7 @@ describe("test the filter logic", () => { beforeAll(async () => { await config.init() + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/steps/loop.spec.ts b/packages/server/src/automations/tests/steps/loop.spec.ts index 2bdf33b253..34fc175c71 100644 --- a/packages/server/src/automations/tests/steps/loop.spec.ts +++ b/packages/server/src/automations/tests/steps/loop.spec.ts @@ -22,10 +22,7 @@ describe("Attempt to run a basic loop automation", () => { }) beforeEach(async () => { - const { automations } = await config.api.automation.fetch() - for (const automation of automations) { - await config.api.automation.delete(automation) - } + await config.api.automation.deleteAll() table = await config.api.table.save(basicTable()) await config.api.row.save(table._id!, {}) diff --git a/packages/server/src/automations/tests/steps/make.spec.ts b/packages/server/src/automations/tests/steps/make.spec.ts index bbc0c3791a..3f473560ed 100644 --- a/packages/server/src/automations/tests/steps/make.spec.ts +++ b/packages/server/src/automations/tests/steps/make.spec.ts @@ -7,6 +7,7 @@ describe("test the outgoing webhook action", () => { beforeAll(async () => { await config.init() + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/steps/n8n.spec.ts b/packages/server/src/automations/tests/steps/n8n.spec.ts index 4ee3123d98..754015baa1 100644 --- a/packages/server/src/automations/tests/steps/n8n.spec.ts +++ b/packages/server/src/automations/tests/steps/n8n.spec.ts @@ -8,6 +8,7 @@ describe("test the outgoing webhook action", () => { beforeAll(async () => { await config.init() + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/steps/openai.spec.ts b/packages/server/src/automations/tests/steps/openai.spec.ts index d5f002571d..a06c633e5e 100644 --- a/packages/server/src/automations/tests/steps/openai.spec.ts +++ b/packages/server/src/automations/tests/steps/openai.spec.ts @@ -16,6 +16,7 @@ describe("test the openai action", () => { beforeAll(async () => { await config.init() + await config.api.automation.deleteAll() }) beforeEach(() => { diff --git a/packages/server/src/automations/tests/steps/outgoingWebhook.spec.ts b/packages/server/src/automations/tests/steps/outgoingWebhook.spec.ts index 85ccfb8eac..a62bb4721a 100644 --- a/packages/server/src/automations/tests/steps/outgoingWebhook.spec.ts +++ b/packages/server/src/automations/tests/steps/outgoingWebhook.spec.ts @@ -8,6 +8,7 @@ describe("test the outgoing webhook action", () => { beforeAll(async () => { await config.init() + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/steps/queryRows.spec.ts b/packages/server/src/automations/tests/steps/queryRows.spec.ts index f6d756e770..66b445a69b 100644 --- a/packages/server/src/automations/tests/steps/queryRows.spec.ts +++ b/packages/server/src/automations/tests/steps/queryRows.spec.ts @@ -21,6 +21,7 @@ describe("Test a query step automation", () => { } await config.api.row.save(table._id!, row) await config.api.row.save(table._id!, row) + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/steps/sendSmtpEmail.spec.ts b/packages/server/src/automations/tests/steps/sendSmtpEmail.spec.ts index 7aff612a97..821d7a1326 100644 --- a/packages/server/src/automations/tests/steps/sendSmtpEmail.spec.ts +++ b/packages/server/src/automations/tests/steps/sendSmtpEmail.spec.ts @@ -28,6 +28,7 @@ describe("test the outgoing webhook action", () => { beforeAll(async () => { await config.init() + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/steps/serverLog.spec.ts b/packages/server/src/automations/tests/steps/serverLog.spec.ts index 82f097d0da..4ddcdf4d9a 100644 --- a/packages/server/src/automations/tests/steps/serverLog.spec.ts +++ b/packages/server/src/automations/tests/steps/serverLog.spec.ts @@ -6,6 +6,7 @@ describe("test the server log action", () => { beforeAll(async () => { await config.init() + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/steps/triggerAutomationRun.spec.ts b/packages/server/src/automations/tests/steps/triggerAutomationRun.spec.ts index 8d4a29c2b6..44aee65e61 100644 --- a/packages/server/src/automations/tests/steps/triggerAutomationRun.spec.ts +++ b/packages/server/src/automations/tests/steps/triggerAutomationRun.spec.ts @@ -9,6 +9,7 @@ describe("Test triggering an automation from another automation", () => { beforeAll(async () => { await automation.init() await config.init() + await config.api.automation.deleteAll() }) afterAll(async () => { diff --git a/packages/server/src/automations/tests/steps/updateRow.spec.ts b/packages/server/src/automations/tests/steps/updateRow.spec.ts index a2f1825099..833ff99bfa 100644 --- a/packages/server/src/automations/tests/steps/updateRow.spec.ts +++ b/packages/server/src/automations/tests/steps/updateRow.spec.ts @@ -23,6 +23,7 @@ describe("test the update row action", () => { await config.init() table = await config.createTable() row = await config.createRow() + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/steps/zapier.spec.ts b/packages/server/src/automations/tests/steps/zapier.spec.ts index e6b5417563..436738388f 100644 --- a/packages/server/src/automations/tests/steps/zapier.spec.ts +++ b/packages/server/src/automations/tests/steps/zapier.spec.ts @@ -7,6 +7,7 @@ describe("test the outgoing webhook action", () => { beforeAll(async () => { await config.init() + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/triggers/appAction.spec.ts b/packages/server/src/automations/tests/triggers/appAction.spec.ts index 2247868c44..97c34b35dc 100644 --- a/packages/server/src/automations/tests/triggers/appAction.spec.ts +++ b/packages/server/src/automations/tests/triggers/appAction.spec.ts @@ -9,6 +9,8 @@ describe("app action trigger", () => { beforeAll(async () => { await config.init() + await config.api.automation.deleteAll() + automation = await createAutomationBuilder(config) .onAppAction() .serverLog({ diff --git a/packages/server/src/automations/tests/triggers/cron.spec.ts b/packages/server/src/automations/tests/triggers/cron.spec.ts index 8db9cb425e..ae6652033e 100644 --- a/packages/server/src/automations/tests/triggers/cron.spec.ts +++ b/packages/server/src/automations/tests/triggers/cron.spec.ts @@ -16,6 +16,7 @@ describe("cron trigger", () => { beforeAll(async () => { await config.init() + await config.api.automation.deleteAll() }) afterAll(() => { diff --git a/packages/server/src/automations/tests/triggers/rowDeleted.spec.ts b/packages/server/src/automations/tests/triggers/rowDeleted.spec.ts index df6b28b31d..a93e0f8683 100644 --- a/packages/server/src/automations/tests/triggers/rowDeleted.spec.ts +++ b/packages/server/src/automations/tests/triggers/rowDeleted.spec.ts @@ -11,6 +11,7 @@ describe("row deleted trigger", () => { beforeAll(async () => { await config.init() + await config.api.automation.deleteAll() table = await config.api.table.save(basicTable()) automation = await createAutomationBuilder(config) .onRowDeleted({ tableId: table._id! }) diff --git a/packages/server/src/automations/tests/triggers/rowSaved.spec.ts b/packages/server/src/automations/tests/triggers/rowSaved.spec.ts index 874abb8872..573a8dd392 100644 --- a/packages/server/src/automations/tests/triggers/rowSaved.spec.ts +++ b/packages/server/src/automations/tests/triggers/rowSaved.spec.ts @@ -11,6 +11,7 @@ describe("row saved trigger", () => { beforeAll(async () => { await config.init() + await config.api.automation.deleteAll() table = await config.api.table.save(basicTable()) automation = await createAutomationBuilder(config) .onRowSaved({ tableId: table._id! }) diff --git a/packages/server/src/automations/tests/triggers/rowUpdated.spec.ts b/packages/server/src/automations/tests/triggers/rowUpdated.spec.ts index 672335f65a..bb896636a6 100644 --- a/packages/server/src/automations/tests/triggers/rowUpdated.spec.ts +++ b/packages/server/src/automations/tests/triggers/rowUpdated.spec.ts @@ -11,6 +11,7 @@ describe("row updated trigger", () => { beforeAll(async () => { await config.init() + await config.api.automation.deleteAll() table = await config.api.table.save(basicTable()) automation = await createAutomationBuilder(config) .onRowUpdated({ tableId: table._id! }) diff --git a/packages/server/src/automations/tests/triggers/webhook.spec.ts b/packages/server/src/automations/tests/triggers/webhook.spec.ts index 9649846830..77d63a7ffa 100644 --- a/packages/server/src/automations/tests/triggers/webhook.spec.ts +++ b/packages/server/src/automations/tests/triggers/webhook.spec.ts @@ -37,6 +37,7 @@ describe("Webhook trigger test", () => { beforeEach(async () => { await config.init() + await config.api.automation.deleteAll() table = await config.createTable() }) diff --git a/packages/server/src/tests/utilities/api/automation.ts b/packages/server/src/tests/utilities/api/automation.ts index c4438560ae..6bb4c9760c 100644 --- a/packages/server/src/tests/utilities/api/automation.ts +++ b/packages/server/src/tests/utilities/api/automation.ts @@ -133,4 +133,11 @@ export class AutomationAPI extends TestAPI { } ) } + + deleteAll = async (expectations?: Expectations): Promise => { + const { automations } = await this.fetch() + await Promise.all( + automations.map(automation => this.delete(automation, expectations)) + ) + } }