From b8c5c7cfe2df699cb62fc09acb41772aa497adae Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Tue, 4 Mar 2025 16:49:20 +0000
Subject: [PATCH] Fix automation test output when loop max iterations or
 failure condition hit.

---
 .../src/automations/tests/steps/loop.spec.ts  | 27 +++++++++++++++++++
 packages/server/src/threads/automation.ts     |  3 +++
 2 files changed, 30 insertions(+)

diff --git a/packages/server/src/automations/tests/steps/loop.spec.ts b/packages/server/src/automations/tests/steps/loop.spec.ts
index 34fc175c71..78ef3a279f 100644
--- a/packages/server/src/automations/tests/steps/loop.spec.ts
+++ b/packages/server/src/automations/tests/steps/loop.spec.ts
@@ -195,7 +195,34 @@ describe("Attempt to run a basic loop automation", () => {
       .serverLog({ text: "{{steps.1.iterations}}" })
       .test({ fields: {} })
 
+    expect(results.steps[0].outputs.status).toBe(
+      AutomationStepStatus.MAX_ITERATIONS
+    )
     expect(results.steps[0].outputs.iterations).toBe(2)
+    expect(results.steps[0].outputs.items).toHaveLength(2)
+    expect(results.steps[0].outputs.items[0].message).toEndWith("test")
+    expect(results.steps[0].outputs.items[1].message).toEndWith("test2")
+  })
+
+  it("should stop when a failure condition is hit", async () => {
+    const results = await createAutomationBuilder(config)
+      .onAppAction()
+      .loop({
+        option: LoopStepType.ARRAY,
+        binding: ["test", "test2", "test3"],
+        failure: "test3",
+      })
+      .serverLog({ text: "{{loop.currentItem}}" })
+      .serverLog({ text: "{{steps.1.iterations}}" })
+      .test({ fields: {} })
+
+    expect(results.steps[0].outputs.status).toBe(
+      AutomationStepStatus.FAILURE_CONDITION
+    )
+    expect(results.steps[0].outputs.iterations).toBe(2)
+    expect(results.steps[0].outputs.items).toHaveLength(2)
+    expect(results.steps[0].outputs.items[0].message).toEndWith("test")
+    expect(results.steps[0].outputs.items[1].message).toEndWith("test2")
   })
 
   it("should run an automation with loop and max iterations to ensure context correctness further down the tree", async () => {
diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts
index def2ab4201..b2e7f4c38d 100644
--- a/packages/server/src/threads/automation.ts
+++ b/packages/server/src/threads/automation.ts
@@ -478,6 +478,7 @@ class Orchestrator {
           return stepFailure(stepToLoop, {
             status: AutomationStepStatus.MAX_ITERATIONS,
             iterations,
+            items,
           })
         }
 
@@ -488,6 +489,8 @@ class Orchestrator {
           })
           return stepFailure(stepToLoop, {
             status: AutomationStepStatus.FAILURE_CONDITION,
+            iterations,
+            items,
           })
         }