fix: updated isAlive implementation to work with appium

serenity-bdd · May 11, 2016 · b902c2e · b902c2e
1 parent fab8b79
commit b902c2e
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/serenity-core/src/main/java/net/thucydides/core/webdriver/WebDriverFactory.java b/serenity-core/src/main/java/net/thucydides/core/webdriver/WebDriverFactory.java
@@ -793,12 +793,19 @@ public Duration getDefaultImplicitTimeout() {
 
     public static boolean isAlive(final WebDriver driver) {
         try {
-            driver.getCurrentUrl();
+            WebDriver local = driver;
+            if(driver instanceof WebDriverFacade){
+                local = ((WebDriverFacade)driver).getDriverInstance();
+            }
+            if(!(local instanceof AppiumDriver)){
+                local.getCurrentUrl();
+            }
         } catch (Exception e) {
             return false;
         }
         return true;
     }
+
     public static boolean isNotAlive(final WebDriver driver){
         return !isAlive(driver);
     }