bump selenium version, use phantomjs if it is found

Conflicts: smoke-test/src/test/java/org/opennms/smoketest/OpenNMSSeleniumTestCase.java
OpenNMS · Sep 17, 2013 · 220e8b4 · 220e8b4
1 parent 367b0c0
commit 220e8b4
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/smoke-test/pom.xml b/smoke-test/pom.xml
@@ -8,11 +8,34 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>smoke-test</artifactId>
   <name>OpenNMS Smoke Test</name>
+  <properties>
+    <seleniumVersion>2.35.0</seleniumVersion>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>selenium-java</artifactId>
-      <version>2.33.0</version>
+      <version>${seleniumVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-chrome-driver</artifactId>
+      <version>${seleniumVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-firefox-driver</artifactId>
+      <version>${seleniumVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-safari-driver</artifactId>
+      <version>${seleniumVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.github.detro.ghostdriver</groupId>
+      <artifactId>phantomjsdriver</artifactId>
+      <version>1.0.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>

diff --git a/smoke-test/src/test/java/org/opennms/smoketest/OpenNMSSeleniumTestCase.java b/smoke-test/src/test/java/org/opennms/smoketest/OpenNMSSeleniumTestCase.java
@@ -38,6 +38,7 @@
 import org.openqa.selenium.WebDriverBackedSelenium;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.phantomjs.PhantomJSDriver;
 
 import com.thoughtworks.selenium.SeleneseTestBase;
 import com.thoughtworks.selenium.SeleniumException;
@@ -69,7 +70,12 @@ public void setUp() throws Exception {
 
         // otherwise, Firefox
         if (driver == null) {
-            driver = new FirefoxDriver();
+            final File phantomJS = new File("/usr/local/bin/phantomjs");
+            if (phantomJS.exists()) {
+                driver = new PhantomJSDriver();
+            } else {
+                driver = new FirefoxDriver();
+            }
         }
 
         String baseUrl = "http://localhost:8980/";