Make sure soft asserts don't make webdriver calls unnecessarily.

serenity-bdd · May 20, 2016 · d2bb531 · d2bb531
1 parent fe81e68
commit d2bb531
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/serenity-core/src/main/java/net/thucydides/core/steps/StepEventBus.java b/serenity-core/src/main/java/net/thucydides/core/steps/StepEventBus.java
@@ -376,6 +376,7 @@ public void dropAllListeners() {
     }
 
     public boolean webdriverCallsAreSuspended() {
+
         if (softAssertsActive()) {
             return !webdriverSuspensions.isEmpty();
         }

diff --git a/.../test/java/net/serenitybdd/core/webdriver/integration/WhenInstanciatingAAppiumDriver.java b/.../test/java/net/serenitybdd/core/webdriver/integration/WhenInstanciatingAAppiumDriver.java
@@ -10,8 +10,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-;
-
 public class WhenInstanciatingAAppiumDriver {
 
     private EnvironmentVariables environmentVariables;

diff --git a/serenity-screenplay/src/main/java/net/serenitybdd/screenplay/EventBusInterface.java b/serenity-screenplay/src/main/java/net/serenitybdd/screenplay/EventBusInterface.java
@@ -51,10 +51,10 @@ public void reportStepSkippedFor(Performable todo) {
     public boolean aStepHasFailed() { return StepEventBus.getEventBus().getBaseStepListener().aStepHasFailed(); }
 
     public boolean shouldIgnoreConsequences() {
-        if ((StepEventBus.getEventBus().currentTestIsSuspended() || StepEventBus.getEventBus().aStepInTheCurrentTestHasFailed())) {
-            return true;
-        };
-        return (!StepEventBus.getEventBus().softAssertsActive());
+        if (StepEventBus.getEventBus().softAssertsActive() && !StepEventBus.getEventBus().currentTestIsSuspended() ) {
+            return false;
+        }
+        return (StepEventBus.getEventBus().currentTestIsSuspended() || StepEventBus.getEventBus().aStepInTheCurrentTestHasFailed());
     }
 
     public void enableSoftAsserts() {