fix(command): Prevent premature resolution during tests from nested c…

…ommands
lerna · Jul 25, 2018 · 151363f · 151363f
1 parent 649048c
commit 151363f
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/core/command/index.js b/core/command/index.js
@@ -77,7 +77,14 @@ class Command {
     });
 
     // passed via yargs context in tests, never actual CLI
-    runner = runner.then(argv.onResolved, argv.onRejected);
+    /* istanbul ignore else */
+    if (argv.onResolved || argv.onRejected) {
+      runner = runner.then(argv.onResolved, argv.onRejected);
+
+      // when nested, never resolve inner with outer callbacks
+      delete argv.onResolved; // eslint-disable-line no-param-reassign
+      delete argv.onRejected; // eslint-disable-line no-param-reassign
+    }
 
     // proxy "Promise" methods to "private" instance
     this.then = (onResolved, onRejected) => runner.then(onResolved, onRejected);