Runner: Read config from configFile if no basedir

Example fix for krakenjs#53
dwbruhn · Dec 8, 2018 · 63e6126 · 63e6126
1 parent aaec89b
commit 63e6126
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/master.js b/lib/master.js
@@ -48,7 +48,7 @@ module.exports = function master(Nemo) {
     log('single kickoff with instance %O', iconfig.tags);
     process.env = Object.assign({}, process.env, iconfig.conf.env || {});
     iconfig.tags.uid = uuid();
-    return instance({basedir: Nemo.program.baseDirectory, profile: iconfig, __dirname: __dirname}, err => {
+    return instance({basedir: Nemo.program.baseDirectory, configFile: Nemo.program.configFile, profile: iconfig, __dirname: __dirname}, err => {
       if (err) {
         console.error(err);
       }

diff --git a/lib/runner/mocha.js b/lib/runner/mocha.js
@@ -38,10 +38,12 @@ function MochaRunner(runnerConfig) {
           });
         }
         // plain JS config use case
-        return NemoCore.Configure({
+        // no instanceConfig.basedir, so read config from instanceConfig.configFile instead
+        let JSConfig = require(instanceConfig.configFile);
+        return NemoCore.Configure(Object.assign({}, JSConfig, {
           driver: driverConf,
           data: dataConf
-        });
+        }));
       })
       .then((nemoCoreConfig) => {
         NemoBaseConfig.merge(nemoCoreConfig);