Merge pull request #86 from cognitus/main

Fix | Do Not Delete Haystack On Failure
Sammyjo20 · May 14, 2024 · 10c07c6 · 10c07c6
2 parents 377dd6b + 1cd758a
commit 10c07c6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/Concerns/ManagesBales.php b/src/Concerns/ManagesBales.php
@@ -201,7 +201,7 @@ public function finish(FinishStatus $status = FinishStatus::Success): void
 
         // Now finally delete itself.
 
-        if (config('haystack.delete_finished_haystacks') === true) {
+        if ($status === FinishStatus::Success && config('haystack.delete_finished_haystacks') === true) {
             $this->delete();
         }
     }

diff --git a/tests/Feature/HaystackTest.php b/tests/Feature/HaystackTest.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Carbon;
 
+use function Pest\Laravel\assertModelExists;
 use function Pest\Laravel\travel;
 
 use Illuminate\Support\Collection;
@@ -439,7 +440,7 @@
 
     expect(cache()->get('failed'))->toBeTrue();
 
-    assertModelMissing($haystack);
+    assertModelExists($haystack); // Should still exist
 });
 
 test('the haystack will fail if the job is manually failed', function () {
@@ -458,7 +459,7 @@
 
     expect(cache()->get('failed'))->toBeTrue();
 
-    assertModelMissing($haystack);
+    assertModelExists($haystack); // Should still exist
 });
 
 test('a haystack can be cancelled early and future jobs wont be processed', function () {

diff --git a/tests/Unit/HaystackTest.php b/tests/Unit/HaystackTest.php
@@ -176,7 +176,7 @@ function myFunction()
     expect(Haystack::all())->toHaveCount(0);
 });
 
-test('when a haystack fails it will delete itself and all bales', function () {
+test('when a haystack fails it will remain with the final bales', function () {
     $haystack = Haystack::factory()
         ->has(HaystackBale::factory()->state(['job' => new NameJob('Sam')]), 'bales')
         ->create();
@@ -186,8 +186,8 @@ function myFunction()
 
     $haystack->fail();
 
-    expect(Haystack::all())->toHaveCount(0);
-    expect(HaystackBale::all())->toHaveCount(0);
+    expect(Haystack::all())->toHaveCount(1);
+    expect(HaystackBale::all())->toHaveCount(1);
 });
 
 test('you can instantiate a haystack builder from the model', function () {