Pass --no-color as is

avajs · Sep 18, 2017 · 889d87f · 889d87f
1 parent 6be4470
commit 889d87f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/lib/fork.js b/lib/fork.js
@@ -39,10 +39,14 @@ module.exports = (file, opts, execArgv) => {
 
 	const args = [JSON.stringify(opts)];
 
-	if (hasFlag('--color') || hasFlag('--no-color')) {
+	if (hasFlag('--color')) {
 		args.push(`--color=${opts.color}`);
 	}
 
+	if (hasFlag('--no-color')) {
+		args.push(`--no-color`);
+	}
+
 	const ps = childProcess.fork(path.join(__dirname, 'test-worker.js'), args, {
 		cwd: opts.projectDir,
 		silent: true,

diff --git a/lib/test-worker.js b/lib/test-worker.js
@@ -28,7 +28,7 @@ globals.options = opts;
 const serializeError = require('./serialize-error');
 
 // Initialize color support
-chalk.enabled = typeof opts.color === 'boolean' && opts.color;
+chalk.enabled = opts.color;
 
 (opts.require || []).forEach(require);
 

diff --git a/test/fork.js b/test/fork.js
@@ -140,8 +140,7 @@ test('color support is initialized correctly', t => {
 
 	return Promise.all([
 		fork(fixture('chalk-enabled.js'), {color: true}).run({}),
-		fork(fixture('chalk-disabled.js'), {color: false}).run({}),
-		fork(fixture('chalk-disabled.js'), {}).run({})
+		fork(fixture('chalk-disabled.js'), {color: false}).run({})
 	]).then(info => {
 		info.forEach(info => {
 			if (info.stats.failCount > 0) {