code improvement related to #1502

karatelabs · Mar 6, 2021 · aa4ed47 · aa4ed47
1 parent 83f5741
commit aa4ed47
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/karate-core/src/main/java/com/intuit/karate/Runner.java b/karate-core/src/main/java/com/intuit/karate/Runner.java
@@ -185,6 +185,7 @@ public static class Builder {
         boolean outputJunitXml;
         boolean outputCucumberJson;
         boolean dryRun;
+        boolean debugMode;
         Map<String, String> systemProperties;
         Map<String, Object> suiteCache;
         SuiteReports suiteReports;
@@ -485,6 +486,11 @@ public Builder dryRun(boolean value) {
             dryRun = value;
             return this;
         }
+
+        public Builder debugMode(boolean value) {
+            debugMode = value;
+            return this;
+        }        
 
         public Builder suiteCache(Map<String, Object> value) {
             suiteCache = value;

diff --git a/karate-core/src/main/java/com/intuit/karate/Suite.java b/karate-core/src/main/java/com/intuit/karate/Suite.java
@@ -68,6 +68,7 @@ public class Suite implements Runnable {
     public final String env;
     public final String tagSelector;
     public final boolean dryRun;
+    public final boolean debugMode;
     public final File workingDir;
     public final String buildDir;
     public final String reportDir;
@@ -124,6 +125,7 @@ public Suite() {
     public Suite(Runner.Builder rb) {
         if (rb.forTempUse) {
             dryRun = false;
+            debugMode = false;
             backupReportDir = false;
             outputHtmlReport = false;
             outputCucumberJson = false;
@@ -162,6 +164,7 @@ public Suite(Runner.Builder rb) {
             outputCucumberJson = rb.outputCucumberJson;
             outputJunitXml = rb.outputJunitXml;
             dryRun = rb.dryRun;
+            debugMode = rb.debugMode;
             classLoader = rb.classLoader;
             clientFactory = rb.clientFactory;
             env = rb.env;

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
@@ -358,9 +358,9 @@ public void beforeRun() {
                 evalConfigJs(featureRuntime.suite.karateConfig, "karate-config.js");
                 evalConfigJs(featureRuntime.suite.karateConfigEnv, "karate-config-" + featureRuntime.suite.env + ".js");
             }
-            if (background == null) {
+            if (background == null || scenario.isOutlineExample()) {
                 featureRuntime.suite.hooks.forEach(h -> h.beforeScenario(this));
-            } else {
+            } else if (featureRuntime.suite.debugMode) {
                 featureRuntime.suite.hooks.stream()
                         .filter(DebugThread.class::isInstance)
                         .forEach(h -> h.beforeScenario(this));
@@ -394,14 +394,12 @@ public void run() {
         } finally {
             if (!scenario.isDynamic()) { // don't add "fake" scenario to feature results
                 afterRun();
-            } else {
+            } else if (featureRuntime.suite.debugMode) {
                 // if it's a dynamic scenario running under the debugger
                 // we still want to execute the afterScenario() hook of the debugger server
-                if (!dryRun) {
-                    featureRuntime.suite.hooks.stream()
-                            .filter(DebugThread.class::isInstance)
-                            .forEach(h -> h.afterScenario(this));
-                }
+                featureRuntime.suite.hooks.stream()
+                        .filter(DebugThread.class::isInstance)
+                        .forEach(h -> h.afterScenario(this));
             }
             if (caller.isNone()) {
                 logAppender.close(); // reclaim memory

diff --git a/karate-core/src/main/java/com/intuit/karate/debug/DapServerHandler.java b/karate-core/src/main/java/com/intuit/karate/debug/DapServerHandler.java
@@ -424,6 +424,7 @@ private void start() {
         }
         runnerThread = new Thread(() -> {
             Runner.path(options.getPaths())
+                    .debugMode(true)
                     .hookFactory(this)
                     .hooks(options.createHooks())
                     .tags(options.getTags())