diff --git a/src/main/java/com/github/searls/jasmine/mojo/AbstractJasmineMojo.java b/src/main/java/com/github/searls/jasmine/mojo/AbstractJasmineMojo.java index 8d20b1b6a..2226afb61 100644 --- a/src/main/java/com/github/searls/jasmine/mojo/AbstractJasmineMojo.java +++ b/src/main/java/com/github/searls/jasmine/mojo/AbstractJasmineMojo.java @@ -66,13 +66,32 @@ public abstract class AbstractJasmineMojo extends AbstractMojo implements Jasmin protected String webDriverClassName; /** - * Web driver capabilities used to initialize a DesiredCapabilities instance when creating a web driver. - *

- * This property will be ignored if org.openqa.selenium.htmlunit.HtmlUnitDriver is used; use the browserVersion - * property instead. - *

- * For org.openqa.selenium.phantomjs.PhantomJSDriver, include "phantomjs.binary.path" if phantomJS is not in the - * system command path of the build machine. + *

Web driver capabilities used to initialize a DesiredCapabilities instance when creating a web driver.

+ * + *

Capabilities value can be either a String, a List, or a Map.

+ * + *

Example:

+ * 
+   * <webDriverCapabilities>
+   *   <capability>
+   *     <name>phantomjs.binary.path</name>
+   *     <value>/opt/phantomjs/bin/phantomjs</value>
+   *   </capability>
+   *   <capability>
+   *     <name>phantomjs.cli.args</name>
+   *     <list>
+   *       <value>--disk-cache=true</value>
+   *       <value>--max-disk-cache-size=256</value>
+   *     </list>
+   *   </capability>
+   *   <capability>
+   *     <name>proxy</name>
+   *     <map>
+   *       <httpProxy>myproxyserver.com:8000</httpProxy>
+   *     </map>
+   *   </capability>
+   * </webDriverCapabilities>
+   *
* * @since 1.3.1.1 */ @@ -274,6 +293,8 @@ public abstract class AbstractJasmineMojo extends AbstractMojo implements Jasmin protected boolean keepServerAlive; /** + *

Allows specifying which source files should be included and in what order.

+ * 
 	 * <sourceIncludes>
 	 *   <include>vendor/**/*.js</include>
 	 *   <include>myBootstrapFile.js</include>
diff --git a/src/site/markdown/phantomjs.md b/src/site/markdown/phantomjs.md
index ff39ff292..3b37a7c23 100644
--- a/src/site/markdown/phantomjs.md
+++ b/src/site/markdown/phantomjs.md
@@ -1,5 +1,5 @@
 Using with PhantomJS
-===================================
+====================
 Starting with version `1.3.1.1` it is possible to configure the jasmine-maven-plugin to use [PhantomJS](http://phantomjs.org) instead of [HtmlUnit](http://htmlunit.sourceforge.net/) to execute your specs.
 
 Here is an example configuration:
@@ -25,43 +25,66 @@ Here is an example configuration:
   
 
 ```
-The above configuration assumes that the `phantomjs` binary is on your systems `PATH`.
+The above configuration assumes that the `phantomjs` binary is on your systems `PATH`. If you would prefer, you can also specify the location of the binary using a configuration like this:
 
-If you would prefer, you can also use [klieber's phantomjs-maven-plugin](https://github.com/klieber/phantomjs-maven-plugin) to pull down a version of phantomjs:
 ```
-      
-        com.github.klieber
-        phantomjs-maven-plugin
-        0.2.1
-        
-          
-            
-              install
-            
-          
-        
-        
-          1.9.2
-        
-      
+
+  
+    
+      com.github.searls
+      jasmine-maven-plugin
+      ${jasmine-plugin-version}
+      
+        
+          
+            test
+          
+          
+            org.openqa.selenium.phantomjs.PhantomJSDriver
+            
+              
+                phantomjs.binary.path
+                /opt/phantomjs/bin/phantomjs
+              
+            
+          
+        
+      
+    
+  
+
 ```
-If you use com.github.klieber.phantomjs-maven-plugin edit the jasmine-maven-plugin configuration to point to the phantomjs that gets installed dynamically:
 
-```
-
-  ${phantomjs.binary}
-
-```
+For more information on configuration options for PhantomJSDriver see its [documentation](https://github.com/detro/ghostdriver).
+
+Automatically installing phantomjs
+----------------------------------
+One of the downsides of using phantomjs instead of HtmlUnit is it requires native binaries be present on the system you are running your build on. The [phantomjs-maven-plugin](https://klieber.github.io/phantomjs-maven-plugin) solves that problem by automatically pulling down phantomjs when needed.
 
-If you would prefer, you can also specify the location of the binary using a configuration like this:
+Here's an example using `phantomjs-maven-plugin` with the `jasmine-maven-plugin`:
 
 ```
 
   
+    
+      com.github.klieber
+      phantomjs-maven-plugin
+      ${phantomjs-maven-plugin.version}
+      
+        
+          
+            install
+          
+        
+      
+      
+        1.9.2
+      
+    
     
       com.github.searls
       jasmine-maven-plugin
-      ${jasmine-plugin-version}
+      ${jasmine-maven-plugin-version}
       
         
           
@@ -70,7 +93,10 @@ If you would prefer, you can also specify the location of the binary using a con
           
             org.openqa.selenium.phantomjs.PhantomJSDriver
             
-              /opt/phantomjs/bin/phantomjs
+              
+                phantomjs.binary.path
+                ${phantomjs.binary}
+              
             
           
         
@@ -79,5 +105,3 @@ If you would prefer, you can also specify the location of the binary using a con
   
 
 ```
-
-For more information on configuration options for PhantomJSDriver see its [documentation](https://github.com/detro/ghostdriver).