Only pass color flag to worker and remove internal options

Author: kevva

lib/fork.js

@@ -4,6 +4,7 @@ const path = require('path');
 const fs = require('fs');
 const Promise = require('bluebird');
 const debug = require('debug')('ava');
+const hasFlag = require('has-flag');
 const AvaError = require('./ava-error');
 
 if (fs.realpathSync(__filename) !== __filename) {
@@ -36,7 +37,11 @@ module.exports = (file, opts, execArgv) => {
 		} : false
 	}, opts);
 
-	const args = [JSON.stringify(opts)].concat(process.argv.slice(2));
+	const args = [JSON.stringify(opts)];
+
+	if (hasFlag('--color') || hasFlag('--no-color')) {
+		args.push(`--color=${opts.color}`);
+	}
 
 	const ps = childProcess.fork(path.join(__dirname, 'test-worker.js'), args, {
 		cwd: opts.projectDir,

lib/process-adapter.js

@@ -29,6 +29,9 @@ exports.ipcChannel = process.channel || process._channel;
 const opts = JSON.parse(process.argv[2]);
 exports.opts = opts;
 
+// Remove internal `ava` options from arguments
+process.argv.splice(2, 1);
+
 // Fake TTY support
 if (opts.tty) {
 	process.stdout.isTTY = true;

lib/test-worker.js

@@ -1,9 +1,9 @@
 'use strict';
+const chalk = require('chalk');
 
 // Check if the test is being run without AVA cli
 {
 	const path = require('path');
-	const chalk = require('chalk');
 
 	const isForked = typeof process.send === 'function';
 	if (!isForked) {
@@ -27,6 +27,9 @@ globals.options = opts;
 
 const serializeError = require('./serialize-error');
 
+// Initialize color support
+chalk.enabled = typeof opts.color === 'boolean' && opts.color;
+
 (opts.require || []).forEach(require);
 
 adapter.installSourceMapSupport();

test/cli.js

@@ -802,3 +802,17 @@ test('--color enables formatting colors', t => {
 		t.end();
 	});
 });
+
+test('--no-color forwards flag to worker', t => {
+	execCli(['--no-color', 'no-color-flag.js'], {dirname: 'fixture'}, err => {
+		t.ok(err);
+		t.end();
+	});
+});
+
+test('--color forwards flag to worker', t => {
+	execCli(['--color', 'color-flag.js'], {dirname: 'fixture'}, err => {
+		t.ok(err);
+		t.end();
+	});
+});

test/fixture/arguments.js

@@ -0,0 +1,5 @@
+import test from '../../';
+
+test(t => {
+	t.is(process.argv[2], undefined);
+});

test/fixture/chalk-disabled.js

@@ -0,0 +1,6 @@
+import chalk from 'chalk';
+import test from '../../';
+
+test('should not support colors', t => {
+	t.false(chalk.enabled);
+});

test/fixture/chalk-enabled.js

@@ -0,0 +1,6 @@
+import chalk from 'chalk';
+import test from '../../';
+
+test('should support colors', t => {
+	t.true(chalk.enabled);
+});

test/fixture/color-flag.js

@@ -0,0 +1,5 @@
+import test from '../../';
+
+test(t => {
+	t.is(process.argv[2], '--color');
+});

test/fixture/no-color-flag.js

@@ -0,0 +1,5 @@
+import test from '../../';
+
+test(t => {
+	t.is(process.argv[2], '--no-color');
+});

test/fork.js

@@ -134,3 +134,29 @@ test('babelrc is ignored', t => {
 			t.end();
 		});
 });
+
+test('color support is initialized correctly', t => {
+	t.plan(1);
+
+	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({})
+	]).then(info => {
+		info.forEach(info => {
+			if (info.stats.failCount > 0) {
+				throw new Error(`${info.file} failed`);
+			}
+		});
+		t.is(info.length, 3);
+	});
+});
+
+test('doesn\'t pass internal options to worker', t => {
+	return fork(fixture('arguments.js'))
+		.run({})
+		.then(info => {
+			t.is(info.stats.passCount, 1);
+			t.end();
+		});
+});