Merge pull request #261 from laravel-workflow/fix-active

Fix active

Author: rmcdaniel

src/Models/StoredWorkflow.php

@@ -127,8 +127,12 @@ public function active(): self
         $active = $this->fresh();
 
         if ($active->status::class === WorkflowContinuedStatus::class) {
-            $active = $this->activeWorkflow()
+            $continued = $this->activeWorkflow()
                 ->first();
+
+            if ($continued !== null) {
+                $active = $continued;
+            }
         }
 
         return $active;

tests/Unit/Models/StoredWorkflowTest.php

@@ -233,4 +233,20 @@ public function testActiveWorkflowWithMultipleContinuations(): void
 
         $this->assertSame($finalWorkflow->id, $active->id);
     }
+
+    public function testActiveWithContinuedStatusButNoActiveChild(): void
+    {
+        $workflow = StoredWorkflow::create([
+            'class' => 'TestWorkflow',
+            'status' => WorkflowRunningStatus::class,
+            'arguments' => json_encode([]),
+        ]);
+
+        $workflow->status->transitionTo(WorkflowContinuedStatus::class);
+
+        $active = $workflow->active();
+
+        $this->assertNotNull($active);
+        $this->assertSame($workflow->id, $active->id);
+    }
 }