fixes xebia#137 in teh original xebium impl

sglebs · Oct 20, 2014 · 570dbbc · 570dbbc
1 parent 0de55c5
commit 570dbbc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xebium</artifactId>
   <groupId>com.xebia.incubator</groupId>
-  <version>0.14-SNAPSHOT-mqm</version>
+  <version>0.15-SNAPSHOT-mqm</version>
   <name>Xebium</name>
   <packaging>jar</packaging>
 

diff --git a/src/main/java/com/xebia/incubator/xebium/DefaultWebDriverSupplier.java b/src/main/java/com/xebia/incubator/xebium/DefaultWebDriverSupplier.java
@@ -126,6 +126,10 @@ public void setBrowser(String browser) {
 		this.browser = browser;
 	}
 
+    public String getBrowser() {
+        return this.browser;
+    }
+
 	public void setCustomProfilePreferencesFile(
 			File customProfilePreferencesFile) {
 		this.customProfilePreferencesFile = customProfilePreferencesFile;

diff --git a/src/main/java/com/xebia/incubator/xebium/SeleniumDriverFixture.java b/src/main/java/com/xebia/incubator/xebium/SeleniumDriverFixture.java
@@ -259,7 +259,8 @@ private void setTimeoutOnSelenium() {
 		executeCommand("setTimeout", new String[] { "" + this.timeout });
         WebDriver.Timeouts timeouts = getWebDriver().manage().timeouts();
         timeouts.setScriptTimeout(this.timeout, TimeUnit.MILLISECONDS);
-        timeouts.pageLoadTimeout(this.timeout, TimeUnit.MILLISECONDS);
+        if (!defaultWebDriverSupplier.getBrowser().toLowerCase().equals("safari"))  //mqm fix for #137 - safari does not support this API
+            timeouts.pageLoadTimeout(this.timeout, TimeUnit.MILLISECONDS);
 	}
 
 	/**