Merge pull request #73 from YamStranger/webdriver_open_during_rest_fix

Fixed issue with browser when rest is used
serenity-bdd · Apr 19, 2016 · d3ea853 · d3ea853
2 parents 3919529 + 65abdec
commit d3ea853
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/net/serenitybdd/jbehave/SerenityReporter.java b/src/main/java/net/serenitybdd/jbehave/SerenityReporter.java
@@ -22,6 +22,7 @@
 import net.thucydides.core.util.NameConverter;
 import net.thucydides.core.webdriver.Configuration;
 import net.thucydides.core.webdriver.ThucydidesWebDriverSupport;
+import net.thucydides.core.webdriver.WebDriverFacade;
 import net.thucydides.core.webdriver.WebdriverProxyFactory;
 import org.codehaus.plexus.util.StringUtils;
 import org.jbehave.core.configuration.Keywords;
@@ -211,10 +212,12 @@ public void beforeScenario(String scenarioTitle) {
     }
 
     private boolean managedDriverIsNotAlive() {
-        try {
-            ThucydidesWebDriverSupport.getDriver().getTitle();
-        } catch (Exception e) {
-            return true;
+        if(((WebDriverFacade)ThucydidesWebDriverSupport.getDriver()).isInstantiated()) {
+            try {
+                ThucydidesWebDriverSupport.getDriver().getTitle();
+            } catch (Exception e) {
+                return true;
+            }
         }
         return false;
     }