Revert "Issue 1793"

joelpramos · Nov 7, 2021 · 1b17385 · 1b17385
1 parent f87143e
commit 1b17385
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/karate-core/src/main/java/com/intuit/karate/core/ScenarioRuntime.java b/karate-core/src/main/java/com/intuit/karate/core/ScenarioRuntime.java
@@ -355,7 +355,7 @@ public void beforeRun() {
         if (this.isDynamicBackground()) {
             steps = scenario.getBackgroundSteps();
         } else {
-            steps = background == null ? scenario.getStepsIncludingBackground() : scenario.getSteps();
+            steps = scenario.getStepsIncludingBackground();
         }
         ScenarioEngine.set(engine);
         engine.init();

diff --git a/karate-core/src/test/java/com/intuit/karate/core/runner/hooks/HooksTest.java b/karate-core/src/test/java/com/intuit/karate/core/runner/hooks/HooksTest.java
@@ -145,9 +145,12 @@ void testDynamicOutlineHookNoScenarioExecution() {
         assertEquals(0, testRuntimeHook.getRuntimeHookTracker().get("beforeScenario").values().stream().mapToInt(Integer::intValue).sum());
         assertEquals(0, testRuntimeHook.getRuntimeHookTracker().get("afterScenario").values().stream().mapToInt(Integer::intValue).sum());
 
+        // 5 because steps are added again to each scenario outline to execute again ...
+        // background steps are re-run on each scenario outline
+        // so 2 steps per each scenario outline + 1 step that takes to compute the background section
         // needed to provide the value on the Examples table
-        assertEquals(3, testRuntimeHook.getRuntimeHookTracker().get("beforeStep").values().stream().mapToInt(Integer::intValue).sum());
-        assertEquals(3, testRuntimeHook.getRuntimeHookTracker().get("afterStep").values().stream().mapToInt(Integer::intValue).sum());
+        assertEquals(5, testRuntimeHook.getRuntimeHookTracker().get("beforeStep").values().stream().mapToInt(Integer::intValue).sum());
+        assertEquals(5, testRuntimeHook.getRuntimeHookTracker().get("afterStep").values().stream().mapToInt(Integer::intValue).sum());
     }
 
     @Test