fix: connect argv from config to command and test

mozilla · Dec 10, 2017 · 66e696c · 66e696c
1 parent 67d04a8
commit 66e696c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/program.js b/src/program.js
@@ -155,18 +155,19 @@ export class Program {
         });
       }
 
+      let argvFromConfig = { ...argv };
       if (argv.config) {
         const configFileName = path.resolve(argv.config);
         const configObject = loadJSConfigFile(configFileName);
-        applyConfigToArgv({
+        argvFromConfig = applyConfigToArgv({
           argv,
           configFileName,
           configObject,
           options: this.options,
         });
       }
 
-      await runCommand(argv, {shouldExitProgram});
+      await runCommand(argvFromConfig, {shouldExitProgram});
 
     } catch (error) {
       if (!(error instanceof UsageError) || argv.verbose) {

diff --git a/tests/unit/test.program.js b/tests/unit/test.program.js
@@ -472,10 +472,16 @@ describe('program.main', () => {
       prop: 'prop',
     };
     const resolvedFakePath = path.resolve(fakePath);
+    const expectedArgv = {
+      _: ['lint'],
+      config: fakePath,
+    };
     const fakeLoadJSConfigFile = sinon.spy(() => {
       return configObject;
     });
-    const fakeApplyConfigToArgv = sinon.spy(() => {});
+    const fakeApplyConfigToArgv = sinon.spy(() => {
+      return expectedArgv;
+    });
 
     return execProgram(
       ['lint', '--config', fakePath],