#2483 - fixed an issue with merging the config settings when passed programmatically

Author: beatfactor

lib/settings/settings.js

@@ -52,8 +52,9 @@ class Settings {
     return this.settings.test_workers === true || this.settings.test_workers && this.settings.test_workers.enabled;
   }
 
-  adaptSettings() {
-    this.inheritFromDefaultEnv();
+  adaptSettings(settings) {
+    lodashMerge(this.settings, settings);
+
     this.setCliOptions();
     this.setUnitTestsMode();
     this.setParallelMode();
@@ -266,9 +267,8 @@ class Settings {
       this.testEnv = testEnv;
     }
 
-    lodashMerge(this.settings, settings);
-
-    this.adaptSettings();
+    this.inheritFromDefaultEnv();
+    this.adaptSettings(settings);
     this.persistGlobals(settings);
 
     dotenv.config(this.settings.dotenv);

test/src/index/testSettings.js

@@ -57,6 +57,37 @@ describe('test Settings', function () {
     eq(request.defaultPathPrefix, '');
   });
 
+  it('test to overwrite webdriver settings programmatically', function() {
+    const parsedSettings = Settings.parse({
+      webdriver: {
+        start_process: false,
+        server_path: './bin/geckodriver',
+        log_path: './logs'
+      }
+    }, {
+      screenshots: {},
+      test_settings: {
+        default: {
+          webdriver: {
+            start_process: true,
+            server_path: './bin/chromedriver',
+            log_path: './logs',
+            request_timeout_options: {
+              retry_attempts: 1
+            }
+          }
+        }
+      }
+    });
+
+    assert.strictEqual(parsedSettings.webdriver.start_process, false);
+    assert.strictEqual(parsedSettings.webdriver.server_path, './bin/geckodriver');
+    assert.strictEqual(parsedSettings.webdriver.log_path, './logs');
+    assert.deepStrictEqual(parsedSettings.webdriver.request_timeout_options, {
+      retry_attempts: 1
+    });
+  });
+
   it('testSetSeleniumPort', function () {
     const Nightwatch = common.require('index.js');
     const Settings = common.require('settings/settings.js');