MAD2-151 Browser not closing once the Automation Test Failed

4impact · May 2, 2017 · 5aee45e · 5aee45e
1 parent 5cb8ed2
commit 5aee45e
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/madcow-core/src/main/groovy/au/com/ps4impact/madcow/MadcowTestCase.groovy b/madcow-core/src/main/groovy/au/com/ps4impact/madcow/MadcowTestCase.groovy
@@ -163,9 +163,12 @@ class MadcowTestCase implements IJSONSerializable {
         }
 
         this.lastExecutedStep = step;
-        if (step.result.failed())
+        if (step.result.failed()) {
+            if (!new MadcowConfig().closeBrowserOnFail) {
+                stepRunner.setFailed()
+            }
             throw new RuntimeException("Step <${step.blade.line}> failed - ${step.result}");
-
+        }
         if ((step.children != null) && (!step.children.empty)) {
             step.stopWatch.reset();
             step.stopWatch.start();

diff --git a/madcow-core/src/main/groovy/au/com/ps4impact/madcow/config/MadcowConfig.groovy b/madcow-core/src/main/groovy/au/com/ps4impact/madcow/config/MadcowConfig.groovy
@@ -46,6 +46,7 @@ class MadcowConfig implements IJSONSerializable {
     public int retryCount = 0;
 
     public boolean parallel = true;
+    public boolean closeBrowserOnFail = true;
 
     public String stepRunner;
     public HashMap<String, String> stepRunnerParameters;
@@ -117,6 +118,16 @@ class MadcowConfig implements IJSONSerializable {
             }
         }
 
+        //get the default closeBrowserOnFail run setting if set
+        def closeBrowserOnFailTxt = this.execution."closeBrowserOnFail"?.text() ?: '';
+        if (closeBrowserOnFailTxt != '') {
+            try {
+                closeBrowserOnFail = !closeBrowserOnFailTxt.equals("false") as boolean;
+            } catch (ignored) {
+                throw new Exception('Invalid "closeBrowserOnFail" field specified - only true or false is allowed');
+            }
+        }
+
         // get the default retry count and use it if none is set
         def retriesText = this.execution."retries".text() ?: '1';
         if (retriesText != '') {

diff --git a/madcow-core/src/main/groovy/au/com/ps4impact/madcow/step/MadcowStepRunner.groovy b/madcow-core/src/main/groovy/au/com/ps4impact/madcow/step/MadcowStepRunner.groovy
@@ -32,6 +32,7 @@ import au.com.ps4impact.madcow.MadcowTestCase
 abstract class MadcowStepRunner {
 
     public MadcowTestCase testCase;
+    private boolean isFailed = false
 
     public MadcowStepRunner() {
         this(null);
@@ -46,6 +47,13 @@ abstract class MadcowStepRunner {
         // overridden in children
     }
 
+    public boolean isFailed(){
+        return isFailed
+    }
+
+    public boolean setFailed(){
+        isFailed = true
+    }
     /**
      * Execute a MadcowStep. This is the main entry point for calling
      * out to a MadcowStepRunner.

diff --git a/madcow-core/src/main/resources/madcow-config.xsd b/madcow-core/src/main/resources/madcow-config.xsd
@@ -43,6 +43,7 @@
                             </xs:element>
                             <xs:element name="env.default" type="xs:string" minOccurs="0" maxOccurs="1" />
                             <xs:element name="parallel" minOccurs="0" maxOccurs="1" type="xs:boolean"/>
+                            <xs:element name="closeBrowserOnFail" minOccurs="0" maxOccurs="1" type="xs:boolean"/>
                             <xs:element name="retries" minOccurs="0" maxOccurs="1">
                                 <xs:simpleType>
                                     <xs:restriction base="xs:nonNegativeInteger">

diff --git a/...river/src/main/groovy/au/com/ps4impact/madcow/runner/webdriver/WebDriverStepRunner.groovy b/...river/src/main/groovy/au/com/ps4impact/madcow/runner/webdriver/WebDriverStepRunner.groovy
@@ -21,6 +21,7 @@
 
 package au.com.ps4impact.madcow.runner.webdriver
 
+import au.com.ps4impact.madcow.config.MadcowConfig
 import au.com.ps4impact.madcow.runner.webdriver.driver.WebDriverType
 import au.com.ps4impact.madcow.step.MadcowStepRunner
 import au.com.ps4impact.madcow.step.MadcowStep
@@ -432,7 +433,8 @@ class WebDriverStepRunner extends MadcowStepRunner {
     }
 
     public void finishTestCase() {
-        if (_lazyDriver == null) {
+        //if test is failed and closeBrowserOnFail = false then don't close the browser
+        if (_lazyDriver == null || ( isFailed())) {
             return;
         }
         if (driverType == WebDriverType.CHROME) {