From 74f2ece72b890b4c60cfb5f6fb4a332e6e5fa8f9 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 5 Feb 2025 17:19:11 +0000 Subject: [PATCH 1/4] Refactor automation builder. --- .../tests/triggers/createRow.spec.ts | 67 +++ .../automations/tests/triggers/cron.spec.ts | 2 +- .../tests/triggers/webhook.spec.ts | 2 - .../tests/utilities/AutomationTestBuilder.ts | 445 +++--------------- .../src/documents/app/automation/schema.ts | 23 + 5 files changed, 167 insertions(+), 372 deletions(-) create mode 100644 packages/server/src/automations/tests/triggers/createRow.spec.ts diff --git a/packages/server/src/automations/tests/triggers/createRow.spec.ts b/packages/server/src/automations/tests/triggers/createRow.spec.ts new file mode 100644 index 0000000000..84f136c8a6 --- /dev/null +++ b/packages/server/src/automations/tests/triggers/createRow.spec.ts @@ -0,0 +1,67 @@ +import { createAutomationBuilder } from "../utilities/AutomationTestBuilder" +import TestConfiguration from "../../../tests/utilities/TestConfiguration" +import { getQueue } from "../.." +import { Job } from "bull" +import { basicTable } from "../../../tests/utilities/structures" +import { Table } from "@budibase/types" + +describe("cron trigger", () => { + const config = new TestConfiguration() + let table: Table + + beforeAll(async () => { + await config.init() + table = await config.api.table.save(basicTable()) + }) + + afterAll(() => { + config.end() + }) + + it("should successfully fire", async () => { + const queue = getQueue() + expect(await queue.getCompletedCount()).toEqual(0) + + const jobPromise = new Promise(resolve => { + queue.on("completed", async job => { + resolve(job) + }) + }) + + await createAutomationBuilder({ config }) + .rowSaved({ tableId: table._id! }) + .cron({ cron: "* * * * *" }) + .serverLog({ + text: "Hello, world!", + }) + .save() + + await config.api.application.publish(config.getAppId()) + + expect(await queue.getCompletedCount()).toEqual(1) + + const job = await jobPromise + const repeat = job.opts?.repeat + if (!repeat || !("cron" in repeat)) { + throw new Error("Expected cron repeat") + } + expect(repeat.cron).toEqual("* * * * *") + }) + + it("should fail if the cron expression is invalid", async () => { + await createAutomationBuilder({ config }) + .cron({ cron: "* * * * * *" }) + .serverLog({ + text: "Hello, world!", + }) + .save() + + await config.api.application.publish(config.getAppId(), { + status: 500, + body: { + message: + 'Deployment Failed: Invalid automation CRON "* * * * * *" - Expected 5 values, but got 6.', + }, + }) + }) +}) diff --git a/packages/server/src/automations/tests/triggers/cron.spec.ts b/packages/server/src/automations/tests/triggers/cron.spec.ts index 956f054ca4..baddb1dd51 100644 --- a/packages/server/src/automations/tests/triggers/cron.spec.ts +++ b/packages/server/src/automations/tests/triggers/cron.spec.ts @@ -6,7 +6,7 @@ import { Job } from "bull" describe("cron trigger", () => { const config = new TestConfiguration() - beforeEach(async () => { + beforeAll(async () => { await config.init() }) diff --git a/packages/server/src/automations/tests/triggers/webhook.spec.ts b/packages/server/src/automations/tests/triggers/webhook.spec.ts index 2e0df5de49..a0b5e7f195 100644 --- a/packages/server/src/automations/tests/triggers/webhook.spec.ts +++ b/packages/server/src/automations/tests/triggers/webhook.spec.ts @@ -1,4 +1,3 @@ -import * as automation from "../../index" import { Table, Webhook, WebhookActionType } from "@budibase/types" import { createAutomationBuilder } from "../utilities/AutomationTestBuilder" import { mocks } from "@budibase/backend-core/tests" @@ -37,7 +36,6 @@ describe("Branching automations", () => { } beforeEach(async () => { - await automation.init() await config.init() table = await config.createTable() }) diff --git a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts index 74e0ae87fb..9484f5cf21 100644 --- a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts +++ b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts @@ -2,51 +2,24 @@ import { v4 as uuidv4 } from "uuid" import { BUILTIN_ACTION_DEFINITIONS } from "../../actions" import { TRIGGER_DEFINITIONS } from "../../triggers" import { - AppActionTriggerInputs, AppActionTriggerOutputs, Automation, AutomationActionStepId, AutomationStep, AutomationStepInputs, AutomationTrigger, - AutomationTriggerDefinition, AutomationTriggerInputs, + AutomationTriggerOutputs, AutomationTriggerStepId, - BashStepInputs, - Branch, BranchStepInputs, - CollectStepInputs, - CreateRowStepInputs, - CronTriggerInputs, CronTriggerOutputs, - DelayStepInputs, - DeleteRowStepInputs, - DiscordStepInputs, - ExecuteQueryStepInputs, - ExecuteScriptStepInputs, - FilterStepInputs, isDidNotTriggerResponse, - LoopStepInputs, - MakeIntegrationInputs, - n8nStepInputs, - OpenAIStepInputs, - OutgoingWebhookStepInputs, - QueryRowsStepInputs, - RowCreatedTriggerInputs, RowCreatedTriggerOutputs, - RowDeletedTriggerInputs, RowDeletedTriggerOutputs, - RowUpdatedTriggerInputs, RowUpdatedTriggerOutputs, SearchFilters, - ServerLogStepInputs, - SmtpEmailStepInputs, TestAutomationRequest, - TriggerAutomationStepInputs, - UpdateRowStepInputs, - WebhookTriggerInputs, WebhookTriggerOutputs, - ZapierStepInputs, } from "@budibase/types" import TestConfiguration from "../../../tests/utilities/TestConfiguration" import * as setup from "../utilities" @@ -74,28 +47,53 @@ class BaseStepBuilder { protected steps: AutomationStep[] = [] protected stepNames: { [key: string]: string } = {} - protected step( - stepId: TStep, - stepSchema: Omit, - inputs: AutomationStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - const id = opts?.stepId || uuidv4() - this.steps.push({ - ...stepSchema, - inputs: inputs as any, - id, - stepId, - name: opts?.stepName || stepSchema.name, - }) - if (opts?.stepName) { - this.stepNames[id] = opts.stepName + protected createStepFn(stepId: TStep) { + return ( + inputs: AutomationStepInputs, + opts?: { stepName?: string; stepId?: string } + ) => { + const schema = BUILTIN_ACTION_DEFINITIONS[stepId] + const id = opts?.stepId || uuidv4() + this.steps.push({ + ...schema, + inputs: inputs as any, + id, + stepId, + name: opts?.stepName || schema.name, + }) + if (opts?.stepName) { + this.stepNames[id] = opts.stepName + } + return this } - return this } + + createRow = this.createStepFn(AutomationActionStepId.CREATE_ROW) + updateRow = this.createStepFn(AutomationActionStepId.UPDATE_ROW) + deleteRow = this.createStepFn(AutomationActionStepId.DELETE_ROW) + sendSmtpEmail = this.createStepFn(AutomationActionStepId.SEND_EMAIL_SMTP) + executeQuery = this.createStepFn(AutomationActionStepId.EXECUTE_QUERY) + queryRows = this.createStepFn(AutomationActionStepId.QUERY_ROWS) + loop = this.createStepFn(AutomationActionStepId.LOOP) + serverLog = this.createStepFn(AutomationActionStepId.SERVER_LOG) + executeScript = this.createStepFn(AutomationActionStepId.EXECUTE_SCRIPT) + filter = this.createStepFn(AutomationActionStepId.FILTER) + bash = this.createStepFn(AutomationActionStepId.EXECUTE_BASH) + openai = this.createStepFn(AutomationActionStepId.OPENAI) + collect = this.createStepFn(AutomationActionStepId.COLLECT) + zapier = this.createStepFn(AutomationActionStepId.zapier) + triggerAutomationRun = this.createStepFn( + AutomationActionStepId.TRIGGER_AUTOMATION_RUN + ) + outgoingWebhook = this.createStepFn(AutomationActionStepId.OUTGOING_WEBHOOK) + n8n = this.createStepFn(AutomationActionStepId.n8n) + make = this.createStepFn(AutomationActionStepId.integromat) + discord = this.createStepFn(AutomationActionStepId.discord) + delay = this.createStepFn(AutomationActionStepId.DELAY) + protected addBranchStep(branchConfig: BranchConfig): void { const branchStepInputs: BranchStepInputs = { - branches: [] as Branch[], + branches: [], children: {}, } @@ -118,243 +116,6 @@ class BaseStepBuilder { } this.steps.push(branchStep) } - - // STEPS - createRow( - inputs: CreateRowStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.CREATE_ROW, - BUILTIN_ACTION_DEFINITIONS.CREATE_ROW, - inputs, - opts - ) - } - - updateRow( - inputs: UpdateRowStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.UPDATE_ROW, - BUILTIN_ACTION_DEFINITIONS.UPDATE_ROW, - inputs, - opts - ) - } - - deleteRow( - inputs: DeleteRowStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.DELETE_ROW, - BUILTIN_ACTION_DEFINITIONS.DELETE_ROW, - inputs, - opts - ) - } - - sendSmtpEmail( - inputs: SmtpEmailStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.SEND_EMAIL_SMTP, - BUILTIN_ACTION_DEFINITIONS.SEND_EMAIL_SMTP, - inputs, - opts - ) - } - - executeQuery( - inputs: ExecuteQueryStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.EXECUTE_QUERY, - BUILTIN_ACTION_DEFINITIONS.EXECUTE_QUERY, - inputs, - opts - ) - } - - queryRows( - inputs: QueryRowsStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.QUERY_ROWS, - BUILTIN_ACTION_DEFINITIONS.QUERY_ROWS, - inputs, - opts - ) - } - - loop( - inputs: LoopStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.LOOP, - BUILTIN_ACTION_DEFINITIONS.LOOP, - inputs, - opts - ) - } - - serverLog( - input: ServerLogStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.SERVER_LOG, - BUILTIN_ACTION_DEFINITIONS.SERVER_LOG, - input, - opts - ) - } - - executeScript( - input: ExecuteScriptStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.EXECUTE_SCRIPT, - BUILTIN_ACTION_DEFINITIONS.EXECUTE_SCRIPT, - input, - opts - ) - } - - filter(input: FilterStepInputs): this { - return this.step( - AutomationActionStepId.FILTER, - BUILTIN_ACTION_DEFINITIONS.FILTER, - input - ) - } - - bash( - input: BashStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.EXECUTE_BASH, - BUILTIN_ACTION_DEFINITIONS.EXECUTE_BASH, - input, - opts - ) - } - - openai( - input: OpenAIStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.OPENAI, - BUILTIN_ACTION_DEFINITIONS.OPENAI, - input, - opts - ) - } - - collect( - input: CollectStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.COLLECT, - BUILTIN_ACTION_DEFINITIONS.COLLECT, - input, - opts - ) - } - - zapier( - input: ZapierStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.zapier, - BUILTIN_ACTION_DEFINITIONS.zapier, - input, - opts - ) - } - - triggerAutomationRun( - input: TriggerAutomationStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.TRIGGER_AUTOMATION_RUN, - BUILTIN_ACTION_DEFINITIONS.TRIGGER_AUTOMATION_RUN, - input, - opts - ) - } - - outgoingWebhook( - input: OutgoingWebhookStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.OUTGOING_WEBHOOK, - BUILTIN_ACTION_DEFINITIONS.OUTGOING_WEBHOOK, - input, - opts - ) - } - - n8n( - input: n8nStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.n8n, - BUILTIN_ACTION_DEFINITIONS.n8n, - input, - opts - ) - } - - make( - input: MakeIntegrationInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.integromat, - BUILTIN_ACTION_DEFINITIONS.integromat, - input, - opts - ) - } - - discord( - input: DiscordStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.discord, - BUILTIN_ACTION_DEFINITIONS.discord, - input, - opts - ) - } - - delay( - input: DelayStepInputs, - opts?: { stepName?: string; stepId?: string } - ): this { - return this.step( - AutomationActionStepId.DELAY, - BUILTIN_ACTION_DEFINITIONS.DELAY, - input, - opts - ) - } } class StepBuilder extends BaseStepBuilder { @@ -379,11 +140,17 @@ class AutomationBuilder extends BaseStepBuilder { ) { super() this.config = options.config || setup.getConfig() + this.triggerOutputs = { fields: {} } this.automationConfig = { name: options.name || `Test Automation ${uuidv4()}`, definition: { steps: [], - trigger: {} as AutomationTrigger, + trigger: { + ...TRIGGER_DEFINITIONS[AutomationTriggerStepId.APP], + stepId: AutomationTriggerStepId.APP, + inputs: this.triggerOutputs, + id: uuidv4(), + }, stepNames: {}, }, type: "automation", @@ -391,94 +158,34 @@ class AutomationBuilder extends BaseStepBuilder { } } - // TRIGGERS - rowSaved(inputs: RowCreatedTriggerInputs, outputs: RowCreatedTriggerOutputs) { - this.triggerOutputs = outputs - return this.trigger( - TRIGGER_DEFINITIONS.ROW_SAVED, - AutomationTriggerStepId.ROW_SAVED, - inputs, - outputs - ) - } - - rowUpdated( - inputs: RowUpdatedTriggerInputs, - outputs: RowUpdatedTriggerOutputs - ) { - this.triggerOutputs = outputs - return this.trigger( - TRIGGER_DEFINITIONS.ROW_UPDATED, - AutomationTriggerStepId.ROW_UPDATED, - inputs, - outputs - ) - } - - rowDeleted( - inputs: RowDeletedTriggerInputs, - outputs: RowDeletedTriggerOutputs - ) { - this.triggerOutputs = outputs - return this.trigger( - TRIGGER_DEFINITIONS.ROW_DELETED, - AutomationTriggerStepId.ROW_DELETED, - inputs, - outputs - ) - } - - appAction(outputs: AppActionTriggerOutputs, inputs?: AppActionTriggerInputs) { - this.triggerOutputs = outputs - return this.trigger( - TRIGGER_DEFINITIONS.APP, - AutomationTriggerStepId.APP, - inputs, - outputs - ) - } - - webhook(outputs: WebhookTriggerOutputs, inputs?: WebhookTriggerInputs) { - this.triggerOutputs = outputs - return this.trigger( - TRIGGER_DEFINITIONS.WEBHOOK, - AutomationTriggerStepId.WEBHOOK, - inputs, - outputs - ) - } - - cron(inputs: CronTriggerInputs, outputs?: CronTriggerOutputs) { - this.triggerOutputs = outputs - return this.trigger( - TRIGGER_DEFINITIONS.CRON, - AutomationTriggerStepId.CRON, - inputs, - outputs - ) - } - - private trigger( - triggerSchema: AutomationTriggerDefinition, - stepId: TStep, - inputs?: AutomationTriggerInputs, - outputs?: TriggerOutputs - ): this { - if (this.triggerSet) { - throw new Error("Only one trigger can be set for an automation.") + protected createTriggerFn< + TStep extends AutomationTriggerStepId, + TInput = AutomationTriggerInputs, + TOutput = AutomationTriggerOutputs + >(stepId: TStep) { + return (inputs: TInput, outputs?: TOutput) => { + if (this.triggerSet) { + throw new Error("Only one trigger can be set for an automation.") + } + this.triggerOutputs = outputs as TriggerOutputs | undefined + this.automationConfig.definition.trigger = { + ...TRIGGER_DEFINITIONS[stepId], + stepId, + inputs, + id: uuidv4(), + } as AutomationTrigger + this.triggerSet = true + return this } - this.automationConfig.definition.trigger = { - ...triggerSchema, - stepId, - inputs: inputs || ({} as any), - id: uuidv4(), - } - this.triggerOutputs = outputs - this.triggerSet = true - - return this } + rowSaved = this.createTriggerFn(AutomationTriggerStepId.ROW_SAVED) + rowUpdated = this.createTriggerFn(AutomationTriggerStepId.ROW_UPDATED) + rowDeleted = this.createTriggerFn(AutomationTriggerStepId.ROW_DELETED) + appAction = this.createTriggerFn(AutomationTriggerStepId.APP) + webhook = this.createTriggerFn(AutomationTriggerStepId.WEBHOOK) + cron = this.createTriggerFn(AutomationTriggerStepId.CRON) + branch(branchConfig: BranchConfig): this { this.addBranchStep(branchConfig) return this diff --git a/packages/types/src/documents/app/automation/schema.ts b/packages/types/src/documents/app/automation/schema.ts index 84bfebf6bf..952397b511 100644 --- a/packages/types/src/documents/app/automation/schema.ts +++ b/packages/types/src/documents/app/automation/schema.ts @@ -52,6 +52,12 @@ import { RowDeletedTriggerInputs, BranchStepInputs, BaseAutomationOutputs, + AppActionTriggerOutputs, + CronTriggerOutputs, + RowDeletedTriggerOutputs, + RowCreatedTriggerOutputs, + RowUpdatedTriggerOutputs, + WebhookTriggerOutputs, } from "./StepInputsOutputs" export type ActionImplementations = { @@ -341,6 +347,23 @@ export type AutomationTriggerInputs = ? Record : never +export type AutomationTriggerOutputs = + T extends AutomationTriggerStepId.APP + ? AppActionTriggerOutputs + : T extends AutomationTriggerStepId.CRON + ? CronTriggerOutputs + : T extends AutomationTriggerStepId.ROW_ACTION + ? Record + : T extends AutomationTriggerStepId.ROW_DELETED + ? RowDeletedTriggerOutputs + : T extends AutomationTriggerStepId.ROW_SAVED + ? RowCreatedTriggerOutputs + : T extends AutomationTriggerStepId.ROW_UPDATED + ? RowUpdatedTriggerOutputs + : T extends AutomationTriggerStepId.WEBHOOK + ? WebhookTriggerOutputs + : never + export interface AutomationTriggerSchema< TTrigger extends AutomationTriggerStepId > extends AutomationStepSchemaBase { From d2902464c06ff93f2f0ecb27736fdc9021d1a982 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 5 Feb 2025 17:30:48 +0000 Subject: [PATCH 2/4] Remove no longer needed appAction calls. --- .../src/api/routes/tests/automation.spec.ts | 1 - .../src/automations/tests/branching.spec.ts | 1 - .../src/automations/tests/scenarios.spec.ts | 8 --- .../src/automations/tests/steps/bash.spec.ts | 2 - .../src/automations/tests/steps/delay.spec.ts | 5 +- .../automations/tests/steps/deleteRow.spec.ts | 3 - .../automations/tests/steps/discord.spec.ts | 1 - .../tests/steps/executeScript.spec.ts | 3 - .../automations/tests/steps/filter.spec.ts | 2 - .../src/automations/tests/steps/loop.spec.ts | 9 --- .../src/automations/tests/steps/make.spec.ts | 3 - .../src/automations/tests/steps/n8n.spec.ts | 4 -- .../automations/tests/steps/openai.spec.ts | 4 -- .../tests/steps/outgoingWebhook.spec.ts | 2 - .../automations/tests/steps/queryRows.spec.ts | 6 -- .../automations/tests/steps/serverLog.spec.ts | 1 - .../tests/steps/triggerAutomationRun.spec.ts | 3 - .../automations/tests/steps/updateRow.spec.ts | 5 -- .../automations/tests/steps/zapier.spec.ts | 3 - .../tests/triggers/createRow.spec.ts | 67 ------------------- .../tests/utilities/AutomationTestBuilder.ts | 30 +++++++-- 21 files changed, 24 insertions(+), 139 deletions(-) delete mode 100644 packages/server/src/automations/tests/triggers/createRow.spec.ts diff --git a/packages/server/src/api/routes/tests/automation.spec.ts b/packages/server/src/api/routes/tests/automation.spec.ts index 94517db67a..eeceabdb2f 100644 --- a/packages/server/src/api/routes/tests/automation.spec.ts +++ b/packages/server/src/api/routes/tests/automation.spec.ts @@ -257,7 +257,6 @@ describe("/automations", () => { appId: config.getAppId(), config, }) - .appAction({ fields: {} }) .serverLog({ text: "{{ settings.url }}", }) diff --git a/packages/server/src/automations/tests/branching.spec.ts b/packages/server/src/automations/tests/branching.spec.ts index 1a514e0537..e6a250577d 100644 --- a/packages/server/src/automations/tests/branching.spec.ts +++ b/packages/server/src/automations/tests/branching.spec.ts @@ -25,7 +25,6 @@ describe("Branching automations", () => { const branch2Id = "44444444-4444-4444-4444-444444444444" const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .serverLog( { text: "Starting automation" }, { stepName: "FirstLog", stepId: firstLogId } diff --git a/packages/server/src/automations/tests/scenarios.spec.ts b/packages/server/src/automations/tests/scenarios.spec.ts index 8d6e051ce2..6c40b793dd 100644 --- a/packages/server/src/automations/tests/scenarios.spec.ts +++ b/packages/server/src/automations/tests/scenarios.spec.ts @@ -66,7 +66,6 @@ describe("Automation Scenarios", () => { await config.api.row.save(table._id!, row) await config.api.row.save(table._id!, row) const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .queryRows({ tableId: table._id!, }) @@ -85,7 +84,6 @@ describe("Automation Scenarios", () => { await config.api.row.save(table._id!, row) await config.api.row.save(table._id!, row) const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .queryRows({ tableId: table._id!, }) @@ -127,7 +125,6 @@ describe("Automation Scenarios", () => { }) const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .createRow( { row: { @@ -196,7 +193,6 @@ describe("Automation Scenarios", () => { await config.api.row.save(table._id!, row) await config.api.row.save(table._id!, row) const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .queryRows( { tableId: table._id!, @@ -246,7 +242,6 @@ describe("Automation Scenarios", () => { it("should stop an automation if the condition is not met", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .createRow({ row: { name: "Equal Test", @@ -272,7 +267,6 @@ describe("Automation Scenarios", () => { it("should continue the automation if the condition is met", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .createRow({ row: { name: "Not Equal Test", @@ -339,7 +333,6 @@ describe("Automation Scenarios", () => { "should pass the filter when condition is $condition", async ({ condition, value, rowValue, expectPass }) => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .createRow({ row: { name: `${condition} Test`, @@ -389,7 +382,6 @@ describe("Automation Scenarios", () => { it("Check user is passed through from app trigger", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .serverLog({ text: "{{ [user].[email] }}" }) .run() diff --git a/packages/server/src/automations/tests/steps/bash.spec.ts b/packages/server/src/automations/tests/steps/bash.spec.ts index ef10f9b568..edf01bb3e2 100644 --- a/packages/server/src/automations/tests/steps/bash.spec.ts +++ b/packages/server/src/automations/tests/steps/bash.spec.ts @@ -65,7 +65,6 @@ describe("Execute Bash Automations", () => { it("should integrate bash output with row operations", async () => { const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .queryRows( { tableId: table._id!, @@ -122,7 +121,6 @@ describe("Execute Bash Automations", () => { it("should handle null values gracefully", async () => { const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .bash( // @ts-expect-error - testing null input { code: null }, diff --git a/packages/server/src/automations/tests/steps/delay.spec.ts b/packages/server/src/automations/tests/steps/delay.spec.ts index a9e97b502f..89b85530e1 100644 --- a/packages/server/src/automations/tests/steps/delay.spec.ts +++ b/packages/server/src/automations/tests/steps/delay.spec.ts @@ -16,10 +16,7 @@ describe("test the delay logic", () => { const time = 100 const before = performance.now() - await createAutomationBuilder({ config }) - .appAction({ fields: {} }) - .delay({ time }) - .run() + await createAutomationBuilder({ config }).delay({ time }).run() const now = performance.now() diff --git a/packages/server/src/automations/tests/steps/deleteRow.spec.ts b/packages/server/src/automations/tests/steps/deleteRow.spec.ts index 1815edb4d3..52a5dacdd7 100644 --- a/packages/server/src/automations/tests/steps/deleteRow.spec.ts +++ b/packages/server/src/automations/tests/steps/deleteRow.spec.ts @@ -21,7 +21,6 @@ describe("test the delete row action", () => { it("should be able to run the delete row action", async () => { await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .deleteRow({ tableId: table._id!, id: row._id!, @@ -36,7 +35,6 @@ describe("test the delete row action", () => { it("should check invalid inputs return an error", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .deleteRow({ tableId: "", id: "", revision: "" }) .run() @@ -45,7 +43,6 @@ describe("test the delete row action", () => { it("should return an error when table doesn't exist", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .deleteRow({ tableId: "invalid", id: "invalid", diff --git a/packages/server/src/automations/tests/steps/discord.spec.ts b/packages/server/src/automations/tests/steps/discord.spec.ts index 5dc9c1088a..9d4d3f6033 100644 --- a/packages/server/src/automations/tests/steps/discord.spec.ts +++ b/packages/server/src/automations/tests/steps/discord.spec.ts @@ -20,7 +20,6 @@ describe("test the outgoing webhook action", () => { it("should be able to run the action", async () => { nock("http://www.example.com/").post("/").reply(200, { foo: "bar" }) const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .discord({ url: "http://www.example.com", username: "joe_bloggs", diff --git a/packages/server/src/automations/tests/steps/executeScript.spec.ts b/packages/server/src/automations/tests/steps/executeScript.spec.ts index 4470b8e760..2d510e86e0 100644 --- a/packages/server/src/automations/tests/steps/executeScript.spec.ts +++ b/packages/server/src/automations/tests/steps/executeScript.spec.ts @@ -21,7 +21,6 @@ describe("Execute Script Automations", () => { it("should execute a basic script and return the result", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .executeScript({ code: "return 2 + 2" }) .run() @@ -44,7 +43,6 @@ describe("Execute Script Automations", () => { it("should handle script execution errors gracefully", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .executeScript({ code: "return nonexistentVariable.map(x => x)" }) .run() @@ -73,7 +71,6 @@ describe("Execute Script Automations", () => { it("should use multiple steps and validate script execution", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .serverLog( { text: "Starting multi-step automation" }, { stepId: "start-log-step" } diff --git a/packages/server/src/automations/tests/steps/filter.spec.ts b/packages/server/src/automations/tests/steps/filter.spec.ts index b0943f3fa8..0d4ac0f01a 100644 --- a/packages/server/src/automations/tests/steps/filter.spec.ts +++ b/packages/server/src/automations/tests/steps/filter.spec.ts @@ -43,7 +43,6 @@ describe("test the filter logic", () => { ] it.each(pass)("should pass %p %p %p", async (field, condition, value) => { const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .filter({ field, condition: stringToFilterCondition(condition), value }) .run() @@ -61,7 +60,6 @@ describe("test the filter logic", () => { ] it.each(fail)("should fail %p %p %p", async (field, condition, value) => { const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .filter({ field, condition: stringToFilterCondition(condition), value }) .run() diff --git a/packages/server/src/automations/tests/steps/loop.spec.ts b/packages/server/src/automations/tests/steps/loop.spec.ts index af174c33ca..764f55d9ad 100644 --- a/packages/server/src/automations/tests/steps/loop.spec.ts +++ b/packages/server/src/automations/tests/steps/loop.spec.ts @@ -152,7 +152,6 @@ describe("Attempt to run a basic loop automation", () => { it("if an incorrect type is passed to the loop it should return an error", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .loop({ option: LoopStepType.ARRAY, binding: "1, 2, 3", @@ -168,7 +167,6 @@ describe("Attempt to run a basic loop automation", () => { it("ensure the loop stops if the failure condition is reached", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .loop({ option: LoopStepType.ARRAY, binding: ["test", "test2", "test3"], @@ -187,7 +185,6 @@ describe("Attempt to run a basic loop automation", () => { it("ensure the loop stops if the max iterations are reached", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .loop({ option: LoopStepType.ARRAY, binding: ["test", "test2", "test3"], @@ -202,7 +199,6 @@ describe("Attempt to run a basic loop automation", () => { it("should run an automation with loop and max iterations to ensure context correctness further down the tree", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .loop({ option: LoopStepType.ARRAY, binding: ["test", "test2", "test3"], @@ -279,7 +275,6 @@ describe("Attempt to run a basic loop automation", () => { it("should run an automation where a loop is used twice to ensure context correctness further down the tree", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .loop({ option: LoopStepType.ARRAY, binding: [1, 2, 3], @@ -301,7 +296,6 @@ describe("Attempt to run a basic loop automation", () => { it("should use automation names to loop with", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .loop( { option: LoopStepType.ARRAY, @@ -353,7 +347,6 @@ describe("Attempt to run a basic loop automation", () => { await config.api.row.bulkImport(table._id!, { rows }) const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .queryRows({ tableId: table._id!, }) @@ -433,7 +426,6 @@ describe("Attempt to run a basic loop automation", () => { await config.api.row.bulkImport(table._id!, { rows }) const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .queryRows( { tableId: table._id!, @@ -516,7 +508,6 @@ describe("Attempt to run a basic loop automation", () => { await config.api.row.bulkImport(table._id!, { rows }) const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .queryRows({ tableId: 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 8ba5d3f8b7..a26f9f73ae 100644 --- a/packages/server/src/automations/tests/steps/make.spec.ts +++ b/packages/server/src/automations/tests/steps/make.spec.ts @@ -20,7 +20,6 @@ describe("test the outgoing webhook action", () => { it("should be able to run the action", async () => { nock("http://www.example.com/").post("/").reply(200, { foo: "bar" }) const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .make({ url: "http://www.example.com", body: null, @@ -47,7 +46,6 @@ describe("test the outgoing webhook action", () => { .reply(200, { foo: "bar" }) const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .make({ body: { value: JSON.stringify(payload) }, url: "http://www.example.com", @@ -60,7 +58,6 @@ describe("test the outgoing webhook action", () => { it("should return a 400 if the JSON payload string is malformed", async () => { const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .make({ body: { value: "{ invalid json }" }, url: "http://www.example.com", diff --git a/packages/server/src/automations/tests/steps/n8n.spec.ts b/packages/server/src/automations/tests/steps/n8n.spec.ts index 4427ea33e0..04d82fcd77 100644 --- a/packages/server/src/automations/tests/steps/n8n.spec.ts +++ b/packages/server/src/automations/tests/steps/n8n.spec.ts @@ -21,7 +21,6 @@ describe("test the outgoing webhook action", () => { it("should be able to run the action and default to 'get'", async () => { nock("http://www.example.com/").get("/").reply(200, { foo: "bar" }) const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .n8n({ url: "http://www.example.com", body: { test: "IGNORE_ME" }, @@ -40,7 +39,6 @@ describe("test the outgoing webhook action", () => { .reply(200) const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .n8n({ url: "http://www.example.com", body: { value: JSON.stringify({ name: "Adam", age: 9 }) }, @@ -54,7 +52,6 @@ describe("test the outgoing webhook action", () => { it("should return a 400 if the JSON payload string is malformed", async () => { const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .n8n({ url: "http://www.example.com", body: { value: "{ value1 1 }" }, @@ -74,7 +71,6 @@ describe("test the outgoing webhook action", () => { .reply(200) const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .n8n({ url: "http://www.example.com", method: HttpMethod.HEAD, diff --git a/packages/server/src/automations/tests/steps/openai.spec.ts b/packages/server/src/automations/tests/steps/openai.spec.ts index 3030b3db39..7e9fa1f933 100644 --- a/packages/server/src/automations/tests/steps/openai.spec.ts +++ b/packages/server/src/automations/tests/steps/openai.spec.ts @@ -58,7 +58,6 @@ describe("test the openai action", () => { // own API key. We don't count this against your quota. const result = await expectAIUsage(0, () => createAutomationBuilder({ config }) - .appAction({ fields: {} }) .openai({ prompt: "Hello, world", model: Model.GPT_4O_MINI }) .run() ) @@ -70,7 +69,6 @@ describe("test the openai action", () => { it("should present the correct error message when a prompt is not provided", async () => { const result = await expectAIUsage(0, () => createAutomationBuilder({ config }) - .appAction({ fields: {} }) .openai({ prompt: "", model: Model.GPT_4O_MINI }) .run() ) @@ -86,7 +84,6 @@ describe("test the openai action", () => { const result = await expectAIUsage(0, () => createAutomationBuilder({ config }) - .appAction({ fields: {} }) .openai({ prompt: "Hello, world", model: Model.GPT_4O_MINI }) .run() ) @@ -109,7 +106,6 @@ describe("test the openai action", () => { // key, so we charge users for it. const result = await expectAIUsage(14, () => createAutomationBuilder({ config }) - .appAction({ fields: {} }) .openai({ model: Model.GPT_4O_MINI, prompt: "Hello, world" }) .run() ) diff --git a/packages/server/src/automations/tests/steps/outgoingWebhook.spec.ts b/packages/server/src/automations/tests/steps/outgoingWebhook.spec.ts index b1ff5aa264..9ef3cf1e57 100644 --- a/packages/server/src/automations/tests/steps/outgoingWebhook.spec.ts +++ b/packages/server/src/automations/tests/steps/outgoingWebhook.spec.ts @@ -24,7 +24,6 @@ describe("test the outgoing webhook action", () => { .reply(200, { foo: "bar" }) const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .outgoingWebhook({ requestMethod: RequestType.POST, url: "http://www.example.com", @@ -40,7 +39,6 @@ describe("test the outgoing webhook action", () => { it("should return an error if something goes wrong in fetch", async () => { const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .outgoingWebhook({ requestMethod: RequestType.GET, url: "www.invalid.com", diff --git a/packages/server/src/automations/tests/steps/queryRows.spec.ts b/packages/server/src/automations/tests/steps/queryRows.spec.ts index 0030e7fc61..1d79d8e046 100644 --- a/packages/server/src/automations/tests/steps/queryRows.spec.ts +++ b/packages/server/src/automations/tests/steps/queryRows.spec.ts @@ -32,7 +32,6 @@ describe("Test a query step automation", () => { name: "Basic Query Test", config, }) - .appAction({ fields: {} }) .queryRows( { tableId: table._id!, @@ -60,7 +59,6 @@ describe("Test a query step automation", () => { name: "Empty Filter Test", config, }) - .appAction({ fields: {} }) .queryRows( { tableId: table._id!, @@ -84,7 +82,6 @@ describe("Test a query step automation", () => { name: "Return None Test", config, }) - .appAction({ fields: {} }) .queryRows( { tableId: table._id!, @@ -109,7 +106,6 @@ describe("Test a query step automation", () => { name: "Null Filter Test", config, }) - .appAction({ fields: {} }) .queryRows( { tableId: table._id!, @@ -138,7 +134,6 @@ describe("Test a query step automation", () => { name: "Return All Test", config, }) - .appAction({ fields: {} }) .queryRows( { tableId: table._id!, @@ -169,7 +164,6 @@ describe("Test a query step automation", () => { name: "Return All Test", config, }) - .appAction({ fields: {} }) .queryRows( { tableId: tableWithSpaces._id!, diff --git a/packages/server/src/automations/tests/steps/serverLog.spec.ts b/packages/server/src/automations/tests/steps/serverLog.spec.ts index 556f7b174c..73d72b9a99 100644 --- a/packages/server/src/automations/tests/steps/serverLog.spec.ts +++ b/packages/server/src/automations/tests/steps/serverLog.spec.ts @@ -14,7 +14,6 @@ describe("test the server log action", () => { it("should be able to log the text", async () => { const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .serverLog({ text: "Hello World" }) .run() expect(result.steps[0].outputs.message).toEqual( diff --git a/packages/server/src/automations/tests/steps/triggerAutomationRun.spec.ts b/packages/server/src/automations/tests/steps/triggerAutomationRun.spec.ts index 674f2386c1..4047c23566 100644 --- a/packages/server/src/automations/tests/steps/triggerAutomationRun.spec.ts +++ b/packages/server/src/automations/tests/steps/triggerAutomationRun.spec.ts @@ -18,12 +18,10 @@ describe("Test triggering an automation from another automation", () => { it("should trigger an other server log automation", async () => { const automation = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .serverLog({ text: "Hello World" }) .save() const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .triggerAutomationRun({ automation: { automationId: automation._id!, @@ -37,7 +35,6 @@ describe("Test triggering an automation from another automation", () => { it("should fail gracefully if the automation id is incorrect", async () => { const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .triggerAutomationRun({ automation: { // @ts-expect-error - incorrect on purpose diff --git a/packages/server/src/automations/tests/steps/updateRow.spec.ts b/packages/server/src/automations/tests/steps/updateRow.spec.ts index 79fed5f613..ca3854f745 100644 --- a/packages/server/src/automations/tests/steps/updateRow.spec.ts +++ b/packages/server/src/automations/tests/steps/updateRow.spec.ts @@ -31,7 +31,6 @@ describe("test the update row action", () => { it("should be able to run the update row action", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .updateRow({ rowId: row._id!, row: { @@ -54,7 +53,6 @@ describe("test the update row action", () => { it("should check invalid inputs return an error", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .updateRow({ meta: {}, row: {}, rowId: "" }) .run() @@ -63,7 +61,6 @@ describe("test the update row action", () => { it("should return an error when table doesn't exist", async () => { const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .updateRow({ row: { _id: "invalid" }, rowId: "invalid", @@ -107,7 +104,6 @@ describe("test the update row action", () => { }) const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .updateRow({ rowId: row._id!, row: { @@ -161,7 +157,6 @@ describe("test the update row action", () => { }) const results = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .updateRow({ rowId: row._id!, row: { diff --git a/packages/server/src/automations/tests/steps/zapier.spec.ts b/packages/server/src/automations/tests/steps/zapier.spec.ts index 17a0a7c7bf..331acb68f3 100644 --- a/packages/server/src/automations/tests/steps/zapier.spec.ts +++ b/packages/server/src/automations/tests/steps/zapier.spec.ts @@ -21,7 +21,6 @@ describe("test the outgoing webhook action", () => { nock("http://www.example.com/").post("/").reply(200, { foo: "bar" }) const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .zapier({ url: "http://www.example.com", body: null }) .run() @@ -45,7 +44,6 @@ describe("test the outgoing webhook action", () => { .reply(200, { foo: "bar" }) const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .zapier({ url: "http://www.example.com", body: { value: JSON.stringify(payload) }, @@ -58,7 +56,6 @@ describe("test the outgoing webhook action", () => { it("should return a 400 if the JSON payload string is malformed", async () => { const result = await createAutomationBuilder({ config }) - .appAction({ fields: {} }) .zapier({ url: "http://www.example.com", body: { value: "{ invalid json }" }, diff --git a/packages/server/src/automations/tests/triggers/createRow.spec.ts b/packages/server/src/automations/tests/triggers/createRow.spec.ts deleted file mode 100644 index 84f136c8a6..0000000000 --- a/packages/server/src/automations/tests/triggers/createRow.spec.ts +++ /dev/null @@ -1,67 +0,0 @@ -import { createAutomationBuilder } from "../utilities/AutomationTestBuilder" -import TestConfiguration from "../../../tests/utilities/TestConfiguration" -import { getQueue } from "../.." -import { Job } from "bull" -import { basicTable } from "../../../tests/utilities/structures" -import { Table } from "@budibase/types" - -describe("cron trigger", () => { - const config = new TestConfiguration() - let table: Table - - beforeAll(async () => { - await config.init() - table = await config.api.table.save(basicTable()) - }) - - afterAll(() => { - config.end() - }) - - it("should successfully fire", async () => { - const queue = getQueue() - expect(await queue.getCompletedCount()).toEqual(0) - - const jobPromise = new Promise(resolve => { - queue.on("completed", async job => { - resolve(job) - }) - }) - - await createAutomationBuilder({ config }) - .rowSaved({ tableId: table._id! }) - .cron({ cron: "* * * * *" }) - .serverLog({ - text: "Hello, world!", - }) - .save() - - await config.api.application.publish(config.getAppId()) - - expect(await queue.getCompletedCount()).toEqual(1) - - const job = await jobPromise - const repeat = job.opts?.repeat - if (!repeat || !("cron" in repeat)) { - throw new Error("Expected cron repeat") - } - expect(repeat.cron).toEqual("* * * * *") - }) - - it("should fail if the cron expression is invalid", async () => { - await createAutomationBuilder({ config }) - .cron({ cron: "* * * * * *" }) - .serverLog({ - text: "Hello, world!", - }) - .save() - - await config.api.application.publish(config.getAppId(), { - status: 500, - body: { - message: - 'Deployment Failed: Invalid automation CRON "* * * * * *" - Expected 5 values, but got 6.', - }, - }) - }) -}) diff --git a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts index 9484f5cf21..e059bd1c04 100644 --- a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts +++ b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts @@ -158,7 +158,7 @@ class AutomationBuilder extends BaseStepBuilder { } } - protected createTriggerFn< + protected triggerInputOutput< TStep extends AutomationTriggerStepId, TInput = AutomationTriggerInputs, TOutput = AutomationTriggerOutputs @@ -179,12 +179,28 @@ class AutomationBuilder extends BaseStepBuilder { } } - rowSaved = this.createTriggerFn(AutomationTriggerStepId.ROW_SAVED) - rowUpdated = this.createTriggerFn(AutomationTriggerStepId.ROW_UPDATED) - rowDeleted = this.createTriggerFn(AutomationTriggerStepId.ROW_DELETED) - appAction = this.createTriggerFn(AutomationTriggerStepId.APP) - webhook = this.createTriggerFn(AutomationTriggerStepId.WEBHOOK) - cron = this.createTriggerFn(AutomationTriggerStepId.CRON) + protected triggerOutputOnly< + TStep extends AutomationTriggerStepId, + TOutput = AutomationTriggerOutputs + >(stepId: TStep) { + return (outputs: TOutput) => { + this.triggerOutputs = outputs as TriggerOutputs + this.automationConfig.definition.trigger = { + ...TRIGGER_DEFINITIONS[stepId], + stepId, + id: uuidv4(), + } as AutomationTrigger + this.triggerSet = true + return this + } + } + + rowSaved = this.triggerInputOutput(AutomationTriggerStepId.ROW_SAVED) + rowUpdated = this.triggerInputOutput(AutomationTriggerStepId.ROW_UPDATED) + rowDeleted = this.triggerInputOutput(AutomationTriggerStepId.ROW_DELETED) + appAction = this.triggerOutputOnly(AutomationTriggerStepId.APP) + webhook = this.triggerInputOutput(AutomationTriggerStepId.WEBHOOK) + cron = this.triggerInputOutput(AutomationTriggerStepId.CRON) branch(branchConfig: BranchConfig): this { this.addBranchStep(branchConfig) From d62be2629c43a1b5480dc4ee4191384924d85469 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 5 Feb 2025 17:39:38 +0000 Subject: [PATCH 3/4] Simplify calls to createAutomationBuilder. --- .../src/api/routes/tests/automation.spec.ts | 26 +++------------- .../src/automations/tests/branching.spec.ts | 14 ++++----- .../src/automations/tests/scenarios.spec.ts | 22 ++++++------- .../src/automations/tests/steps/bash.spec.ts | 10 +++--- .../automations/tests/steps/createRow.spec.ts | 12 +++---- .../tests/steps/cron-automations.spec.ts | 2 +- .../src/automations/tests/steps/delay.spec.ts | 2 +- .../automations/tests/steps/deleteRow.spec.ts | 6 ++-- .../automations/tests/steps/discord.spec.ts | 2 +- .../tests/steps/executeScript.spec.ts | 11 ++++--- .../automations/tests/steps/filter.spec.ts | 4 +-- .../src/automations/tests/steps/loop.spec.ts | 24 +++++++------- .../src/automations/tests/steps/make.spec.ts | 6 ++-- .../src/automations/tests/steps/n8n.spec.ts | 8 ++--- .../automations/tests/steps/openai.spec.ts | 8 ++--- .../tests/steps/outgoingWebhook.spec.ts | 4 +-- .../automations/tests/steps/queryRows.spec.ts | 30 ++++-------------- .../automations/tests/steps/serverLog.spec.ts | 2 +- .../tests/steps/triggerAutomationRun.spec.ts | 6 ++-- .../automations/tests/steps/updateRow.spec.ts | 10 +++--- .../automations/tests/steps/zapier.spec.ts | 6 ++-- .../automations/tests/triggers/cron.spec.ts | 4 +-- .../tests/triggers/webhook.spec.ts | 2 +- .../tests/utilities/AutomationTestBuilder.ts | 31 +++++++++---------- 24 files changed, 109 insertions(+), 143 deletions(-) diff --git a/packages/server/src/api/routes/tests/automation.spec.ts b/packages/server/src/api/routes/tests/automation.spec.ts index eeceabdb2f..5b451eef4a 100644 --- a/packages/server/src/api/routes/tests/automation.spec.ts +++ b/packages/server/src/api/routes/tests/automation.spec.ts @@ -107,10 +107,7 @@ describe("/automations", () => { }) it("Should ensure you can't have a branch as not a last step", async () => { - const automation = createAutomationBuilder({ - name: "String Equality Branching", - appId: config.getAppId(), - }) + const automation = createAutomationBuilder(config) .appAction({ fields: { status: "active" } }) .branch({ activeBranch: { @@ -134,10 +131,7 @@ describe("/automations", () => { }) it("Should check validation on an automation that has a branch step with no children", async () => { - const automation = createAutomationBuilder({ - name: "String Equality Branching", - appId: config.getAppId(), - }) + const automation = createAutomationBuilder(config) .appAction({ fields: { status: "active" } }) .branch({}) .serverLog({ text: "Inactive user" }) @@ -153,10 +147,7 @@ describe("/automations", () => { }) it("Should check validation on a branch step with empty conditions", async () => { - const automation = createAutomationBuilder({ - name: "String Equality Branching", - appId: config.getAppId(), - }) + const automation = createAutomationBuilder(config) .appAction({ fields: { status: "active" } }) .branch({ activeBranch: { @@ -177,10 +168,7 @@ describe("/automations", () => { }) it("Should check validation on an branch that has a condition that is not valid", async () => { - const automation = createAutomationBuilder({ - name: "String Equality Branching", - appId: config.getAppId(), - }) + const automation = createAutomationBuilder(config) .appAction({ fields: { status: "active" } }) .branch({ activeBranch: { @@ -252,11 +240,7 @@ describe("/automations", () => { }) it("should be able to access platformUrl, logoUrl and company in the automation", async () => { - const result = await createAutomationBuilder({ - name: "Test Automation", - appId: config.getAppId(), - config, - }) + const result = await createAutomationBuilder(config) .serverLog({ text: "{{ settings.url }}", }) diff --git a/packages/server/src/automations/tests/branching.spec.ts b/packages/server/src/automations/tests/branching.spec.ts index e6a250577d..d9fad543f6 100644 --- a/packages/server/src/automations/tests/branching.spec.ts +++ b/packages/server/src/automations/tests/branching.spec.ts @@ -24,7 +24,7 @@ describe("Branching automations", () => { const branch2LogId = "33333333-3333-3333-3333-333333333333" const branch2Id = "44444444-4444-4444-4444-444444444444" - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .serverLog( { text: "Starting automation" }, { stepName: "FirstLog", stepId: firstLogId } @@ -82,7 +82,7 @@ describe("Branching automations", () => { }) it("should execute correct branch based on string equality", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .appAction({ fields: { status: "active" } }) .branch({ activeBranch: { @@ -107,7 +107,7 @@ describe("Branching automations", () => { }) it("should handle multiple conditions with AND operator", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .appAction({ fields: { status: "active", role: "admin" } }) .branch({ activeAdminBranch: { @@ -135,7 +135,7 @@ describe("Branching automations", () => { }) it("should handle multiple conditions with OR operator", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .appAction({ fields: { status: "test", role: "user" } }) .branch({ specialBranch: { @@ -167,7 +167,7 @@ describe("Branching automations", () => { }) it("should stop the branch automation when no conditions are met", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .appAction({ fields: { status: "test", role: "user" } }) .createRow({ row: { name: "Test", tableId: table._id } }) .branch({ @@ -203,7 +203,7 @@ describe("Branching automations", () => { }) it("evaluate multiple conditions", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .appAction({ fields: { test_trigger: true } }) .serverLog({ text: "Starting automation" }, { stepId: "aN6znRYHG" }) .branch({ @@ -244,7 +244,7 @@ describe("Branching automations", () => { }) it("evaluate multiple conditions with interpolated text", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .appAction({ fields: { test_trigger: true } }) .serverLog({ text: "Starting automation" }, { stepId: "aN6znRYHG" }) .branch({ diff --git a/packages/server/src/automations/tests/scenarios.spec.ts b/packages/server/src/automations/tests/scenarios.spec.ts index 6c40b793dd..2c13b7c019 100644 --- a/packages/server/src/automations/tests/scenarios.spec.ts +++ b/packages/server/src/automations/tests/scenarios.spec.ts @@ -29,7 +29,7 @@ describe("Automation Scenarios", () => { it("should trigger an automation which then creates a row", async () => { const table = await config.api.table.save(basicTable()) - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .rowUpdated( { tableId: table._id! }, { @@ -65,7 +65,7 @@ describe("Automation Scenarios", () => { } await config.api.row.save(table._id!, row) await config.api.row.save(table._id!, row) - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .queryRows({ tableId: table._id!, }) @@ -83,7 +83,7 @@ describe("Automation Scenarios", () => { } await config.api.row.save(table._id!, row) await config.api.row.save(table._id!, row) - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .queryRows({ tableId: table._id!, }) @@ -124,7 +124,7 @@ describe("Automation Scenarios", () => { }, }) - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .createRow( { row: { @@ -192,7 +192,7 @@ describe("Automation Scenarios", () => { } await config.api.row.save(table._id!, row) await config.api.row.save(table._id!, row) - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .queryRows( { tableId: table._id!, @@ -241,7 +241,7 @@ describe("Automation Scenarios", () => { }) it("should stop an automation if the condition is not met", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .createRow({ row: { name: "Equal Test", @@ -266,7 +266,7 @@ describe("Automation Scenarios", () => { }) it("should continue the automation if the condition is met", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .createRow({ row: { name: "Not Equal Test", @@ -332,7 +332,7 @@ describe("Automation Scenarios", () => { it.each(testCases)( "should pass the filter when condition is $condition", async ({ condition, value, rowValue, expectPass }) => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .createRow({ row: { name: `${condition} Test`, @@ -366,7 +366,7 @@ describe("Automation Scenarios", () => { it("Check user is passed through from row trigger", async () => { const table = await config.api.table.save(basicTable()) - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .rowUpdated( { tableId: table._id! }, { @@ -381,7 +381,7 @@ describe("Automation Scenarios", () => { }) it("Check user is passed through from app trigger", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .serverLog({ text: "{{ [user].[email] }}" }) .run() @@ -452,7 +452,7 @@ if (descriptions.length) { queryVerb: "read", }) - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .appAction({ fields: {}, }) diff --git a/packages/server/src/automations/tests/steps/bash.spec.ts b/packages/server/src/automations/tests/steps/bash.spec.ts index edf01bb3e2..9b797f9479 100644 --- a/packages/server/src/automations/tests/steps/bash.spec.ts +++ b/packages/server/src/automations/tests/steps/bash.spec.ts @@ -24,7 +24,7 @@ describe("Execute Bash Automations", () => { }) it("should use trigger data in bash command and pass output to subsequent steps", async () => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .appAction({ fields: { command: "hello world" } }) .bash( { code: "echo '{{ trigger.fields.command }}'" }, @@ -43,7 +43,7 @@ describe("Execute Bash Automations", () => { }) it("should chain multiple bash commands using previous outputs", async () => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .appAction({ fields: { filename: "testfile.txt" } }) .bash( { code: "echo 'initial content' > {{ trigger.fields.filename }}" }, @@ -64,7 +64,7 @@ describe("Execute Bash Automations", () => { }) it("should integrate bash output with row operations", async () => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .queryRows( { tableId: table._id!, @@ -93,7 +93,7 @@ describe("Execute Bash Automations", () => { }) it("should handle bash output in conditional logic", async () => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .appAction({ fields: { threshold: "5" } }) .bash( { code: "echo $(( {{ trigger.fields.threshold }} + 5 ))" }, @@ -120,7 +120,7 @@ describe("Execute Bash Automations", () => { }) it("should handle null values gracefully", async () => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .bash( // @ts-expect-error - testing null input { code: null }, diff --git a/packages/server/src/automations/tests/steps/createRow.spec.ts b/packages/server/src/automations/tests/steps/createRow.spec.ts index 5b86556ae3..4456550cb3 100644 --- a/packages/server/src/automations/tests/steps/createRow.spec.ts +++ b/packages/server/src/automations/tests/steps/createRow.spec.ts @@ -40,7 +40,7 @@ describe("test the create row action", () => { }) it("should be able to run the action", async () => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .appAction({ fields: { status: "new" } }) .serverLog({ text: "Starting create row flow" }, { stepName: "StartLog" }) .createRow({ row }, { stepName: "CreateRow" }) @@ -66,7 +66,7 @@ describe("test the create row action", () => { }) it("should return an error (not throw) when bad info provided", async () => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .appAction({ fields: { status: "error" } }) .serverLog({ text: "Starting error test flow" }, { stepName: "StartLog" }) .createRow( @@ -84,7 +84,7 @@ describe("test the create row action", () => { }) it("should check invalid inputs return an error", async () => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .appAction({ fields: { status: "invalid" } }) .serverLog({ text: "Testing invalid input" }, { stepName: "StartLog" }) .createRow({ row: {} }, { stepName: "CreateRow" }) @@ -122,7 +122,7 @@ describe("test the create row action", () => { ] attachmentRow.file_attachment = attachmentObject - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .appAction({ fields: { type: "attachment" } }) .serverLog( { text: "Processing attachment upload" }, @@ -173,7 +173,7 @@ describe("test the create row action", () => { } attachmentRow.single_file_attachment = attachmentObject - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .appAction({ fields: { type: "single-attachment" } }) .serverLog( { text: "Processing single attachment" }, @@ -244,7 +244,7 @@ describe("test the create row action", () => { } attachmentRow.single_file_attachment = attachmentObject - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .appAction({ fields: { type: "invalid-attachment" } }) .serverLog( { text: "Testing invalid attachment keys" }, diff --git a/packages/server/src/automations/tests/steps/cron-automations.spec.ts b/packages/server/src/automations/tests/steps/cron-automations.spec.ts index 6a82ac1cde..ed0729bd38 100644 --- a/packages/server/src/automations/tests/steps/cron-automations.spec.ts +++ b/packages/server/src/automations/tests/steps/cron-automations.spec.ts @@ -27,7 +27,7 @@ describe("cron automations", () => { }) it("should initialise the automation timestamp", async () => { - await createAutomationBuilder({ config }).cron({ cron: "* * * * *" }).save() + await createAutomationBuilder(config).cron({ cron: "* * * * *" }).save() tk.travel(Date.now() + oneMinuteInMs) await config.publish() diff --git a/packages/server/src/automations/tests/steps/delay.spec.ts b/packages/server/src/automations/tests/steps/delay.spec.ts index 89b85530e1..9dc6470f5a 100644 --- a/packages/server/src/automations/tests/steps/delay.spec.ts +++ b/packages/server/src/automations/tests/steps/delay.spec.ts @@ -16,7 +16,7 @@ describe("test the delay logic", () => { const time = 100 const before = performance.now() - await createAutomationBuilder({ config }).delay({ time }).run() + await createAutomationBuilder(config).delay({ time }).run() const now = performance.now() diff --git a/packages/server/src/automations/tests/steps/deleteRow.spec.ts b/packages/server/src/automations/tests/steps/deleteRow.spec.ts index 52a5dacdd7..ee8c9b329f 100644 --- a/packages/server/src/automations/tests/steps/deleteRow.spec.ts +++ b/packages/server/src/automations/tests/steps/deleteRow.spec.ts @@ -20,7 +20,7 @@ describe("test the delete row action", () => { }) it("should be able to run the delete row action", async () => { - await createAutomationBuilder({ config }) + await createAutomationBuilder(config) .deleteRow({ tableId: table._id!, id: row._id!, @@ -34,7 +34,7 @@ describe("test the delete row action", () => { }) it("should check invalid inputs return an error", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .deleteRow({ tableId: "", id: "", revision: "" }) .run() @@ -42,7 +42,7 @@ describe("test the delete row action", () => { }) it("should return an error when table doesn't exist", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .deleteRow({ tableId: "invalid", id: "invalid", diff --git a/packages/server/src/automations/tests/steps/discord.spec.ts b/packages/server/src/automations/tests/steps/discord.spec.ts index 9d4d3f6033..361b3517f3 100644 --- a/packages/server/src/automations/tests/steps/discord.spec.ts +++ b/packages/server/src/automations/tests/steps/discord.spec.ts @@ -19,7 +19,7 @@ describe("test the outgoing webhook action", () => { it("should be able to run the action", async () => { nock("http://www.example.com/").post("/").reply(200, { foo: "bar" }) - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .discord({ url: "http://www.example.com", username: "joe_bloggs", diff --git a/packages/server/src/automations/tests/steps/executeScript.spec.ts b/packages/server/src/automations/tests/steps/executeScript.spec.ts index 2d510e86e0..e2bea9d0c1 100644 --- a/packages/server/src/automations/tests/steps/executeScript.spec.ts +++ b/packages/server/src/automations/tests/steps/executeScript.spec.ts @@ -20,7 +20,7 @@ describe("Execute Script Automations", () => { }) it("should execute a basic script and return the result", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .executeScript({ code: "return 2 + 2" }) .run() @@ -28,7 +28,7 @@ describe("Execute Script Automations", () => { }) it("should access bindings from previous steps", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .appAction({ fields: { data: [1, 2, 3] } }) .executeScript( { @@ -42,7 +42,7 @@ describe("Execute Script Automations", () => { }) it("should handle script execution errors gracefully", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .executeScript({ code: "return nonexistentVariable.map(x => x)" }) .run() @@ -53,7 +53,7 @@ describe("Execute Script Automations", () => { }) it("should handle conditional logic in scripts", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .appAction({ fields: { value: 10 } }) .executeScript({ code: ` @@ -70,7 +70,8 @@ describe("Execute Script Automations", () => { }) it("should use multiple steps and validate script execution", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) + .appAction({ fields: {} }) .serverLog( { text: "Starting multi-step automation" }, { stepId: "start-log-step" } diff --git a/packages/server/src/automations/tests/steps/filter.spec.ts b/packages/server/src/automations/tests/steps/filter.spec.ts index 0d4ac0f01a..51af262aff 100644 --- a/packages/server/src/automations/tests/steps/filter.spec.ts +++ b/packages/server/src/automations/tests/steps/filter.spec.ts @@ -42,7 +42,7 @@ describe("test the filter logic", () => { [new Date().toISOString(), ">", new Date(-10000).toISOString()], ] it.each(pass)("should pass %p %p %p", async (field, condition, value) => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .filter({ field, condition: stringToFilterCondition(condition), value }) .run() @@ -59,7 +59,7 @@ describe("test the filter logic", () => { [{}, "==", {}], ] it.each(fail)("should fail %p %p %p", async (field, condition, value) => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .filter({ field, condition: stringToFilterCondition(condition), value }) .run() diff --git a/packages/server/src/automations/tests/steps/loop.spec.ts b/packages/server/src/automations/tests/steps/loop.spec.ts index 764f55d9ad..ba74bf6778 100644 --- a/packages/server/src/automations/tests/steps/loop.spec.ts +++ b/packages/server/src/automations/tests/steps/loop.spec.ts @@ -72,7 +72,7 @@ describe("Attempt to run a basic loop automation", () => { }) it("should run an automation with a trigger, loop, and create row step", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .rowSaved( { tableId: table._id! }, { @@ -115,7 +115,7 @@ describe("Attempt to run a basic loop automation", () => { }) it("should run an automation where a loop step is between two normal steps to ensure context correctness", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .rowSaved( { tableId: table._id! }, { @@ -151,7 +151,7 @@ describe("Attempt to run a basic loop automation", () => { }) it("if an incorrect type is passed to the loop it should return an error", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .loop({ option: LoopStepType.ARRAY, binding: "1, 2, 3", @@ -166,7 +166,7 @@ describe("Attempt to run a basic loop automation", () => { }) it("ensure the loop stops if the failure condition is reached", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .loop({ option: LoopStepType.ARRAY, binding: ["test", "test2", "test3"], @@ -184,7 +184,7 @@ describe("Attempt to run a basic loop automation", () => { }) it("ensure the loop stops if the max iterations are reached", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .loop({ option: LoopStepType.ARRAY, binding: ["test", "test2", "test3"], @@ -198,7 +198,7 @@ describe("Attempt to run a basic loop automation", () => { }) it("should run an automation with loop and max iterations to ensure context correctness further down the tree", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .loop({ option: LoopStepType.ARRAY, binding: ["test", "test2", "test3"], @@ -212,7 +212,7 @@ describe("Attempt to run a basic loop automation", () => { }) it("should run an automation where a loop is successfully run twice", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .rowSaved( { tableId: table._id! }, { @@ -274,7 +274,7 @@ describe("Attempt to run a basic loop automation", () => { }) it("should run an automation where a loop is used twice to ensure context correctness further down the tree", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .loop({ option: LoopStepType.ARRAY, binding: [1, 2, 3], @@ -295,7 +295,7 @@ describe("Attempt to run a basic loop automation", () => { }) it("should use automation names to loop with", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .loop( { option: LoopStepType.ARRAY, @@ -346,7 +346,7 @@ describe("Attempt to run a basic loop automation", () => { await config.api.row.bulkImport(table._id!, { rows }) - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .queryRows({ tableId: table._id!, }) @@ -425,7 +425,7 @@ describe("Attempt to run a basic loop automation", () => { await config.api.row.bulkImport(table._id!, { rows }) - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .queryRows( { tableId: table._id!, @@ -507,7 +507,7 @@ describe("Attempt to run a basic loop automation", () => { await config.api.row.bulkImport(table._id!, { rows }) - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .queryRows({ tableId: 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 a26f9f73ae..2d118d943f 100644 --- a/packages/server/src/automations/tests/steps/make.spec.ts +++ b/packages/server/src/automations/tests/steps/make.spec.ts @@ -19,7 +19,7 @@ describe("test the outgoing webhook action", () => { it("should be able to run the action", async () => { nock("http://www.example.com/").post("/").reply(200, { foo: "bar" }) - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .make({ url: "http://www.example.com", body: null, @@ -45,7 +45,7 @@ describe("test the outgoing webhook action", () => { .post("/", payload) .reply(200, { foo: "bar" }) - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .make({ body: { value: JSON.stringify(payload) }, url: "http://www.example.com", @@ -57,7 +57,7 @@ describe("test the outgoing webhook action", () => { }) it("should return a 400 if the JSON payload string is malformed", async () => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .make({ body: { value: "{ invalid json }" }, url: "http://www.example.com", diff --git a/packages/server/src/automations/tests/steps/n8n.spec.ts b/packages/server/src/automations/tests/steps/n8n.spec.ts index 04d82fcd77..d3efb1aaeb 100644 --- a/packages/server/src/automations/tests/steps/n8n.spec.ts +++ b/packages/server/src/automations/tests/steps/n8n.spec.ts @@ -20,7 +20,7 @@ describe("test the outgoing webhook action", () => { it("should be able to run the action and default to 'get'", async () => { nock("http://www.example.com/").get("/").reply(200, { foo: "bar" }) - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .n8n({ url: "http://www.example.com", body: { test: "IGNORE_ME" }, @@ -38,7 +38,7 @@ describe("test the outgoing webhook action", () => { .post("/", { name: "Adam", age: 9 }) .reply(200) - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .n8n({ url: "http://www.example.com", body: { value: JSON.stringify({ name: "Adam", age: 9 }) }, @@ -51,7 +51,7 @@ describe("test the outgoing webhook action", () => { }) it("should return a 400 if the JSON payload string is malformed", async () => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .n8n({ url: "http://www.example.com", body: { value: "{ value1 1 }" }, @@ -70,7 +70,7 @@ describe("test the outgoing webhook action", () => { .head("/", body => body === "") .reply(200) - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .n8n({ url: "http://www.example.com", method: HttpMethod.HEAD, diff --git a/packages/server/src/automations/tests/steps/openai.spec.ts b/packages/server/src/automations/tests/steps/openai.spec.ts index 7e9fa1f933..4fbf0aa6d6 100644 --- a/packages/server/src/automations/tests/steps/openai.spec.ts +++ b/packages/server/src/automations/tests/steps/openai.spec.ts @@ -57,7 +57,7 @@ describe("test the openai action", () => { // means it goes through the "legacy" path which requires you to set your // own API key. We don't count this against your quota. const result = await expectAIUsage(0, () => - createAutomationBuilder({ config }) + createAutomationBuilder(config) .openai({ prompt: "Hello, world", model: Model.GPT_4O_MINI }) .run() ) @@ -68,7 +68,7 @@ describe("test the openai action", () => { it("should present the correct error message when a prompt is not provided", async () => { const result = await expectAIUsage(0, () => - createAutomationBuilder({ config }) + createAutomationBuilder(config) .openai({ prompt: "", model: Model.GPT_4O_MINI }) .run() ) @@ -83,7 +83,7 @@ describe("test the openai action", () => { mockChatGPTError() const result = await expectAIUsage(0, () => - createAutomationBuilder({ config }) + createAutomationBuilder(config) .openai({ prompt: "Hello, world", model: Model.GPT_4O_MINI }) .run() ) @@ -105,7 +105,7 @@ describe("test the openai action", () => { // calculation we use to approximate cost. This uses Budibase's OpenAI API // key, so we charge users for it. const result = await expectAIUsage(14, () => - createAutomationBuilder({ config }) + createAutomationBuilder(config) .openai({ model: Model.GPT_4O_MINI, prompt: "Hello, world" }) .run() ) diff --git a/packages/server/src/automations/tests/steps/outgoingWebhook.spec.ts b/packages/server/src/automations/tests/steps/outgoingWebhook.spec.ts index 9ef3cf1e57..b1d13c6917 100644 --- a/packages/server/src/automations/tests/steps/outgoingWebhook.spec.ts +++ b/packages/server/src/automations/tests/steps/outgoingWebhook.spec.ts @@ -23,7 +23,7 @@ describe("test the outgoing webhook action", () => { .post("/", { a: 1 }) .reply(200, { foo: "bar" }) - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .outgoingWebhook({ requestMethod: RequestType.POST, url: "http://www.example.com", @@ -38,7 +38,7 @@ describe("test the outgoing webhook action", () => { }) it("should return an error if something goes wrong in fetch", async () => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .outgoingWebhook({ requestMethod: RequestType.GET, url: "www.invalid.com", diff --git a/packages/server/src/automations/tests/steps/queryRows.spec.ts b/packages/server/src/automations/tests/steps/queryRows.spec.ts index 1d79d8e046..9cda9c94c0 100644 --- a/packages/server/src/automations/tests/steps/queryRows.spec.ts +++ b/packages/server/src/automations/tests/steps/queryRows.spec.ts @@ -28,10 +28,7 @@ describe("Test a query step automation", () => { }) it("should be able to run the query step", async () => { - const result = await createAutomationBuilder({ - name: "Basic Query Test", - config, - }) + const result = await createAutomationBuilder(config) .queryRows( { tableId: table._id!, @@ -55,10 +52,7 @@ describe("Test a query step automation", () => { }) it("Returns all rows when onEmptyFilter has no value and no filters are passed", async () => { - const result = await createAutomationBuilder({ - name: "Empty Filter Test", - config, - }) + const result = await createAutomationBuilder(config) .queryRows( { tableId: table._id!, @@ -78,10 +72,7 @@ describe("Test a query step automation", () => { }) it("Returns no rows when onEmptyFilter is RETURN_NONE and theres no filters", async () => { - const result = await createAutomationBuilder({ - name: "Return None Test", - config, - }) + const result = await createAutomationBuilder(config) .queryRows( { tableId: table._id!, @@ -102,10 +93,7 @@ describe("Test a query step automation", () => { }) it("Returns no rows when onEmptyFilters RETURN_NONE and a filter is passed with a null value", async () => { - const result = await createAutomationBuilder({ - name: "Null Filter Test", - config, - }) + const result = await createAutomationBuilder(config) .queryRows( { tableId: table._id!, @@ -130,10 +118,7 @@ describe("Test a query step automation", () => { }) it("Returns rows when onEmptyFilter is RETURN_ALL and no filter is passed", async () => { - const result = await createAutomationBuilder({ - name: "Return All Test", - config, - }) + const result = await createAutomationBuilder(config) .queryRows( { tableId: table._id!, @@ -160,10 +145,7 @@ describe("Test a query step automation", () => { await config.api.row.save(tableWithSpaces._id!, { name: NAME, }) - const result = await createAutomationBuilder({ - name: "Return All Test", - config, - }) + const result = await createAutomationBuilder(config) .queryRows( { tableId: tableWithSpaces._id!, diff --git a/packages/server/src/automations/tests/steps/serverLog.spec.ts b/packages/server/src/automations/tests/steps/serverLog.spec.ts index 73d72b9a99..44a9f068b1 100644 --- a/packages/server/src/automations/tests/steps/serverLog.spec.ts +++ b/packages/server/src/automations/tests/steps/serverLog.spec.ts @@ -13,7 +13,7 @@ describe("test the server log action", () => { }) it("should be able to log the text", async () => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .serverLog({ text: "Hello World" }) .run() expect(result.steps[0].outputs.message).toEqual( diff --git a/packages/server/src/automations/tests/steps/triggerAutomationRun.spec.ts b/packages/server/src/automations/tests/steps/triggerAutomationRun.spec.ts index 4047c23566..ef851bc047 100644 --- a/packages/server/src/automations/tests/steps/triggerAutomationRun.spec.ts +++ b/packages/server/src/automations/tests/steps/triggerAutomationRun.spec.ts @@ -17,11 +17,11 @@ describe("Test triggering an automation from another automation", () => { }) it("should trigger an other server log automation", async () => { - const automation = await createAutomationBuilder({ config }) + const automation = await createAutomationBuilder(config) .serverLog({ text: "Hello World" }) .save() - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .triggerAutomationRun({ automation: { automationId: automation._id!, @@ -34,7 +34,7 @@ describe("Test triggering an automation from another automation", () => { }) it("should fail gracefully if the automation id is incorrect", async () => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .triggerAutomationRun({ automation: { // @ts-expect-error - incorrect on purpose diff --git a/packages/server/src/automations/tests/steps/updateRow.spec.ts b/packages/server/src/automations/tests/steps/updateRow.spec.ts index ca3854f745..32c7b90446 100644 --- a/packages/server/src/automations/tests/steps/updateRow.spec.ts +++ b/packages/server/src/automations/tests/steps/updateRow.spec.ts @@ -30,7 +30,7 @@ describe("test the update row action", () => { }) it("should be able to run the update row action", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .updateRow({ rowId: row._id!, row: { @@ -52,7 +52,7 @@ describe("test the update row action", () => { }) it("should check invalid inputs return an error", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .updateRow({ meta: {}, row: {}, rowId: "" }) .run() @@ -60,7 +60,7 @@ describe("test the update row action", () => { }) it("should return an error when table doesn't exist", async () => { - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .updateRow({ row: { _id: "invalid" }, rowId: "invalid", @@ -103,7 +103,7 @@ describe("test the update row action", () => { user2: [{ _id: user2._id }], }) - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .updateRow({ rowId: row._id!, row: { @@ -156,7 +156,7 @@ describe("test the update row action", () => { user2: [{ _id: user2._id }], }) - const results = await createAutomationBuilder({ config }) + const results = await createAutomationBuilder(config) .updateRow({ rowId: row._id!, row: { diff --git a/packages/server/src/automations/tests/steps/zapier.spec.ts b/packages/server/src/automations/tests/steps/zapier.spec.ts index 331acb68f3..e897083d18 100644 --- a/packages/server/src/automations/tests/steps/zapier.spec.ts +++ b/packages/server/src/automations/tests/steps/zapier.spec.ts @@ -20,7 +20,7 @@ describe("test the outgoing webhook action", () => { it("should be able to run the action", async () => { nock("http://www.example.com/").post("/").reply(200, { foo: "bar" }) - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .zapier({ url: "http://www.example.com", body: null }) .run() @@ -43,7 +43,7 @@ describe("test the outgoing webhook action", () => { .post("/", { ...payload, platform: "budibase" }) .reply(200, { foo: "bar" }) - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .zapier({ url: "http://www.example.com", body: { value: JSON.stringify(payload) }, @@ -55,7 +55,7 @@ describe("test the outgoing webhook action", () => { }) it("should return a 400 if the JSON payload string is malformed", async () => { - const result = await createAutomationBuilder({ config }) + const result = await createAutomationBuilder(config) .zapier({ url: "http://www.example.com", body: { value: "{ invalid json }" }, diff --git a/packages/server/src/automations/tests/triggers/cron.spec.ts b/packages/server/src/automations/tests/triggers/cron.spec.ts index baddb1dd51..84fe90c314 100644 --- a/packages/server/src/automations/tests/triggers/cron.spec.ts +++ b/packages/server/src/automations/tests/triggers/cron.spec.ts @@ -24,7 +24,7 @@ describe("cron trigger", () => { }) }) - await createAutomationBuilder({ config }) + await createAutomationBuilder(config) .cron({ cron: "* * * * *" }) .serverLog({ text: "Hello, world!", @@ -44,7 +44,7 @@ describe("cron trigger", () => { }) it("should fail if the cron expression is invalid", async () => { - await createAutomationBuilder({ config }) + await createAutomationBuilder(config) .cron({ cron: "* * * * * *" }) .serverLog({ text: "Hello, world!", diff --git a/packages/server/src/automations/tests/triggers/webhook.spec.ts b/packages/server/src/automations/tests/triggers/webhook.spec.ts index a0b5e7f195..61fab1e891 100644 --- a/packages/server/src/automations/tests/triggers/webhook.spec.ts +++ b/packages/server/src/automations/tests/triggers/webhook.spec.ts @@ -11,7 +11,7 @@ describe("Branching automations", () => { let webhook: Webhook async function createWebhookAutomation() { - const automation = await createAutomationBuilder({ config }) + const automation = await createAutomationBuilder(config) .webhook({ fields: { parameter: "string" } }) .createRow({ row: { tableId: table._id!, name: "{{ trigger.parameter }}" }, diff --git a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts index e059bd1c04..5cb982eb9f 100644 --- a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts +++ b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts @@ -135,14 +135,12 @@ class AutomationBuilder extends BaseStepBuilder { private triggerOutputs: TriggerOutputs private triggerSet = false - constructor( - options: { name?: string; appId?: string; config?: TestConfiguration } = {} - ) { + constructor(config?: TestConfiguration) { super() - this.config = options.config || setup.getConfig() + this.config = config || setup.getConfig() this.triggerOutputs = { fields: {} } this.automationConfig = { - name: options.name || `Test Automation ${uuidv4()}`, + name: `Test Automation ${uuidv4()}`, definition: { steps: [], trigger: { @@ -154,10 +152,15 @@ class AutomationBuilder extends BaseStepBuilder { stepNames: {}, }, type: "automation", - appId: options.appId ?? this.config.getAppId(), + appId: this.config.getAppId(), } } + name(n: string): this { + this.automationConfig.name = n + return this + } + protected triggerInputOutput< TStep extends AutomationTriggerStepId, TInput = AutomationTriggerInputs, @@ -195,10 +198,13 @@ class AutomationBuilder extends BaseStepBuilder { } } + // The input and output for appAction is identical, and we only ever seem to + // set the output, so we're ignoring the input for now. + appAction = this.triggerOutputOnly(AutomationTriggerStepId.APP) + rowSaved = this.triggerInputOutput(AutomationTriggerStepId.ROW_SAVED) rowUpdated = this.triggerInputOutput(AutomationTriggerStepId.ROW_UPDATED) rowDeleted = this.triggerInputOutput(AutomationTriggerStepId.ROW_DELETED) - appAction = this.triggerOutputOnly(AutomationTriggerStepId.APP) webhook = this.triggerInputOutput(AutomationTriggerStepId.WEBHOOK) cron = this.triggerInputOutput(AutomationTriggerStepId.CRON) @@ -214,9 +220,6 @@ class AutomationBuilder extends BaseStepBuilder { } async save() { - if (!Object.keys(this.automationConfig.definition.trigger).length) { - throw new Error("Please add a trigger to this automation test") - } this.automationConfig.definition.steps = this.steps const { automation } = await this.config.api.automation.post(this.build()) return automation @@ -241,10 +244,6 @@ class AutomationBuilder extends BaseStepBuilder { } } -export function createAutomationBuilder(options?: { - name?: string - appId?: string - config?: TestConfiguration -}) { - return new AutomationBuilder(options) +export function createAutomationBuilder(config?: TestConfiguration) { + return new AutomationBuilder(config) } From 00b02b1762b0b31d6f155948ddcb6ddb113e1150 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 5 Feb 2025 17:45:35 +0000 Subject: [PATCH 4/4] Make config required. --- .../src/automations/tests/utilities/AutomationTestBuilder.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts index 5cb982eb9f..16a049c556 100644 --- a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts +++ b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts @@ -244,6 +244,6 @@ class AutomationBuilder extends BaseStepBuilder { } } -export function createAutomationBuilder(config?: TestConfiguration) { +export function createAutomationBuilder(config: TestConfiguration) { return new AutomationBuilder(config) }