Merge pull request #176 from klieber/topic/issue176

1.3.1.1 fails to run FirefoxDriver
searls · Apr 27, 2013 · 5759e6f · 5759e6f
2 parents f8d0839 + aab2d94
commit 5759e6f
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -93,6 +93,7 @@
   <properties>
     <powermock.version>1.4.12</powermock.version>
     <jetty.version>8.1.10.v20130312</jetty.version>
+    <selenium.version>2.32.0</selenium.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
@@ -149,7 +150,23 @@
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>selenium-java</artifactId>
-      <version>2.31.0</version>
+      <version>${selenium.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-server</artifactId>
+      <version>${selenium.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>servlet-api-2.5</artifactId>
+          <groupId>org.mortbay.jetty</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-remote-driver</artifactId>
+      <version>${selenium.version}</version>
     </dependency>
     <dependency>
       <groupId>org.antlr</groupId>
@@ -171,11 +188,6 @@
       <artifactId>backport-util-concurrent</artifactId>
       <version>3.1</version>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-    </dependency>
     <dependency>
       <groupId>com.github.detro.ghostdriver</groupId>
       <artifactId>phantomjsdriver</artifactId>

diff --git a/src/test/resources/examples/jasmine-webapp-firefox/pom.xml b/src/test/resources/examples/jasmine-webapp-firefox/pom.xml
@@ -0,0 +1,32 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.github.searls</groupId>
+    <artifactId>jasmine-example-superpom</artifactId>
+    <version>%{project.version}</version>
+  </parent>
+  <artifactId>jasmine-webapp-passing</artifactId>
+  <packaging>war</packaging>
+  <name>Example Webapp using Jasmine Maven Plugin</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.github.searls</groupId>
+        <artifactId>jasmine-maven-plugin</artifactId>
+        <version>%{project.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <webDriverClassName>org.openqa.selenium.firefox.FirefoxDriver</webDriverClassName>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/test/resources/examples/jasmine-webapp-firefox/src/main/javascript/HelloWorld.js b/src/test/resources/examples/jasmine-webapp-firefox/src/main/javascript/HelloWorld.js
@@ -0,0 +1,5 @@
+var HelloWorld = function() {
+  this.greeting = function() {
+    return "Hello, World";
+  }
+}
diff --git a/src/test/resources/examples/jasmine-webapp-firefox/src/test/javascript/HelloWorldSpec.js b/src/test/resources/examples/jasmine-webapp-firefox/src/test/javascript/HelloWorldSpec.js
@@ -0,0 +1,8 @@
+describe('HelloWorld',function(){
+
+  it('should say hello',function(){
+    var helloWorld = new HelloWorld();
+    expect(helloWorld.greeting()).toBe("Hello, World");
+  });
+
+});