fixed an issue with cli_args for selenium

xuaniyo · May 25, 2014 · 7be3c86 · 7be3c86
1 parent 565627d
commit 7be3c86
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -6,10 +6,10 @@ UI automated testing framework powered by [Node.js](http://nodejs.org/). It uses
 
 ***
 
-#### [Homepage](http://nightwatchjs.org) | [Developer Guide](http://nightwatchjs.org/guide) | [API Reference](http://nightwatchjs.org/api) 
+#### [Homepage](http://nightwatchjs.org) | [Developer Guide](http://nightwatchjs.org/guide) | [API Reference](http://nightwatchjs.org/api)
 
 ### Selenium WebDriver standalone server
-Nightwatch works with the Selenium standalone server so the first thing you need to do is download the selenium server jar file `selenium-server-standalone-2.x.x.jar` from the Selenium releases page:  
+Nightwatch works with the Selenium standalone server so the first thing you need to do is download the selenium server jar file `selenium-server-standalone-2.x.x.jar` from the Selenium releases page:
 **http://selenium-release.storage.googleapis.com/index.html**
 
 ### Install Nightwatch
@@ -25,7 +25,10 @@ $ npm install
 The tests for nightwatch are written using [nodeunit](https://github.com/caolan/nodeunit) as the test framework. To run the nodeunit tests do:
 ```sh
 $ npm test
-```  
+```
 
 ### Discuss
 In addition to [Twitter](https://twitter.com/nightwatchjs), the [Mailing List/Google Group](https://groups.google.com/forum/#!forum/nightwatchjs) is also available for Nightwatch related discussions.
+
+### Setup Guides
+Browser specific setup and usage guides along with debugging instructions can be found on the [**Wiki**](https://github.com/beatfactor/nightwatch/wiki).
diff --git a/bin/_clirunner.js b/bin/_clirunner.js
@@ -209,6 +209,7 @@ CliRunner.prototype = {
     }
     this.settings.parallelMode = this.parallelMode;
     var self = this;
+
     Selenium.startServer(this.settings, function(error, child, error_out, exitcode) {
       if (error) {
         if (self.test_settings.output) {
@@ -356,7 +357,7 @@ CliRunner.prototype = {
     if (!this.manageSelenium) {
       return this;
     }
-    this.settings.selenium.cli_args = {};
+    this.settings.selenium.cli_args = this.settings.selenium.cli_args || {};
 
     var deprecationNotice = function(propertyName, newSettingName) {
       console.warn(Logger.colors.brown('DEPRECATION NOTICE: Property ' + propertyName + ' is deprecated since v0.5. Please' +