fix: Fixed an issue in which tests were slowed down after a failing s…

…tep because Serenity continued to try to take screenshots
serenity-bdd · Feb 20, 2015 · d7f4cd3 · d7f4cd3
1 parent e20146d
commit d7f4cd3
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/core/src/main/java/net/thucydides/core/steps/BaseStepListener.java b/core/src/main/java/net/thucydides/core/steps/BaseStepListener.java
@@ -546,7 +546,7 @@ public void clearForcedResult() {
     }
 
     private void take(final ScreenshotType screenshotType) {
-        if (currentStepExists() && browserIsOpen()) {
+        if (shouldTakeScreenshots()) {
             try {
                 Optional<ScreenshotAndHtmlSource> screenshotAndHtmlSource = grabScreenshot();
                 if (screenshotAndHtmlSource.isPresent()) {
@@ -559,6 +559,12 @@ private void take(final ScreenshotType screenshotType) {
         }
     }
 
+    private boolean shouldTakeScreenshots() {
+        return (currentStepExists() && browserIsOpen()
+                && !StepEventBus.getEventBus().aStepInTheCurrentTestHasFailed()
+                && !StepEventBus.getEventBus().currentTestIsSuspended());
+    }
+
     private void removeDuplicatedInitalScreenshotsIfPresent() {
         if (currentStepHasMoreThanOneScreenshot() && getPreviousStep().isPresent() && getPreviousStep().get().hasScreenshots()) {
             ScreenshotAndHtmlSource lastScreenshotOfPreviousStep = lastScreenshotOf(getPreviousStep().get());