Fixed: default selenium.start_session value is not applied when selen…

…ium is undefined #450
nightwatchjs · May 15, 2015 · b05ac93 · b05ac93
1 parent 241f7a2
commit b05ac93
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/lib/runner/cli/clirunner.js b/lib/runner/cli/clirunner.js
@@ -68,8 +68,6 @@ CliRunner.prototype = {
 
       this.manageSelenium = !this.isParallelMode() && this.settings.selenium &&
         this.settings.selenium.start_process || false;
-      this.startSession = this.settings.selenium && (this.settings.selenium.start_session ||
-        typeof this.settings.selenium.start_session == 'undefined');
 
       if (typeof this.settings.src_folders == 'string') {
         this.settings.src_folders = [this.settings.src_folders];
@@ -422,18 +420,18 @@ CliRunner.prototype = {
       }
     }
 
-    // overwrite selenium settings per environment
+    this.settings.selenium = this.settings.selenium || {};
+
     // overwrite selenium settings per environment
     if (this.test_settings.selenium && typeof (this.test_settings.selenium) == 'object') {
-      this.settings.selenium = this.settings.selenium || {};
       for (var prop in this.test_settings.selenium) {
         this.settings.selenium[prop] = this.test_settings.selenium[prop];
       }
-
-      this.manageSelenium = this.settings.selenium.start_process || false;
-      this.startSession = this.settings.selenium.start_session || typeof this.settings.selenium.start_session == 'undefined';
     }
 
+    this.manageSelenium = this.settings.selenium.start_process || false;
+    this.startSession = this.settings.selenium.start_session || typeof this.settings.selenium.start_session == 'undefined';
+
     this.mergeSeleniumOptions();
     this.disableCliColorsIfNeeded();
 

diff --git a/tests/src/runner/testCliRunner.js b/tests/src/runner/testCliRunner.js
@@ -213,6 +213,7 @@ module.exports = {
     test.equals(runner.output_folder, 'output');
     test.equals(runner.parallelMode, false);
     test.equals(runner.manageSelenium, false);
+    test.equals(runner.startSession, true);
 
     test.done();