Merge remote-tracking branch 'srid99/master'

awulder · Jan 20, 2013 · 3ec1503 · 3ec1503
2 parents 9928e67 + d5b6ef2
commit 3ec1503
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -35,6 +35,7 @@
     <fitnesse.expiration>0</fitnesse.expiration>
     <slf4j.version>1.6.4</slf4j.version>
     <operadriver.version>1.1</operadriver.version>
+    <phantomjsdriver.version>1.0.1</phantomjsdriver.version>
     <commons-lang.version>2.6</commons-lang.version>
   </properties>
 
@@ -60,6 +61,11 @@
       <artifactId>operadriver</artifactId>
       <version>${operadriver.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.github.detro.ghostdriver</groupId>
+      <artifactId>phantomjsdriver</artifactId>
+      <version>${phantomjsdriver.version}</version>
+    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>

diff --git a/src/main/java/com/xebia/incubator/xebium/DefaultWebDriverSupplier.java b/src/main/java/com/xebia/incubator/xebium/DefaultWebDriverSupplier.java
@@ -9,6 +9,7 @@
 import org.openqa.selenium.firefox.PreferencesWrapper;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 import org.openqa.selenium.ie.InternetExplorerDriver;
+import org.openqa.selenium.phantomjs.PhantomJSDriver;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.safari.SafariDriver;
 import org.slf4j.Logger;
@@ -88,6 +89,8 @@ public WebDriver newWebDriver() {
             capabilities.setCapability("opera.arguments", "-mobileui");
 
             driver = new OperaDriver(capabilities);
+        } else if ("phantomjs".equalsIgnoreCase(browser)) {
+            driver = new PhantomJSDriver(DesiredCapabilities.phantomjs());
 		} else {
 			try {
 				driver = new RemoteWebDriverSupplier(browser).get();