fix: only apply bail when not already applied

japa · Jan 4, 2025 · 14b1f8e · 14b1f8e
1 parent 7267bcf
commit 14b1f8e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/group/main.ts b/src/group/main.ts
@@ -34,7 +34,7 @@ export class Group<Context extends Record<any, any>> extends Macroable {
   #emitter: Emitter
   #refiner: Refiner
   #failed: boolean = false
-  #bail: boolean = false
+  #bail?: boolean
 
   /**
    * Reference to registered hooks
@@ -135,7 +135,9 @@ export class Group<Context extends Record<any, any>> extends Macroable {
    * test fails
    */
   bail(toggle: boolean = true) {
-    this.#bail = toggle
+    if (this.#bail === undefined) {
+      this.#bail = toggle
+    }
     return this
   }
 
@@ -208,7 +210,7 @@ export class Group<Context extends Record<any, any>> extends Macroable {
     }
 
     const runner = new GroupRunner(this, this.#hooks, this.#emitter, {
-      bail: this.#bail,
+      bail: this.#bail ?? false,
     })
 
     await runner.run()

diff --git a/src/suite/main.ts b/src/suite/main.ts
@@ -42,7 +42,7 @@ export class Suite<Context extends Record<any, any>> extends Macroable {
   #refiner: Refiner
   #emitter: Emitter
   #failed: boolean = false
-  #bail: boolean = false
+  #bail?: boolean
 
   /**
    * Reference to registered hooks
@@ -128,8 +128,10 @@ export class Suite<Context extends Record<any, any>> extends Macroable {
    * test fails
    */
   bail(toggle: boolean = true) {
-    this.#bail = toggle
-    this.onGroup((group) => group.bail(toggle))
+    if (this.#bail === undefined) {
+      this.#bail = toggle
+      this.onGroup((group) => group.bail(toggle))
+    }
     return this
   }
 
@@ -178,7 +180,7 @@ export class Suite<Context extends Record<any, any>> extends Macroable {
     }
 
     const runner = new SuiteRunner(this, this.#hooks, this.#emitter, {
-      bail: this.#bail,
+      bail: this.#bail ?? false,
     })
     await runner.run()
     this.#failed = runner.failed