ava 0.15.0 → 0.17.0

package/lib/fork.js

@@ -6,7 +6,6 @@ var objectAssign = require('object-assign');
 var Promise = require('bluebird');
 var debug = require('debug')('ava');
 var AvaError = require('./ava-error');
-var doSend = require('./send');
 
 if (fs.realpathSync(__filename) !== __filename) {
 	console.warn(
@@ -31,7 +30,11 @@ if (env.NODE_PATH) {
 		.join(path.delimiter);
 }
 
-module.exports = function (file, opts) {
+// In case the test file imports a different AVA install, the presence of this variable allows it to require this one
+// instead.
+env.AVA_PATH = path.resolve(__dirname, '..');
+
+module.exports = function (file, opts, execArgv) {
 	opts = objectAssign({
 		file: file,
 		baseDir: process.cwd(),
@@ -42,20 +45,25 @@ module.exports = function (file, opts) {
 	}, opts);
 
 	var ps = childProcess.fork(path.join(__dirname, 'test-worker.js'), [JSON.stringify(opts)], {
-		cwd: path.dirname(file),
+		cwd: opts.pkgDir,
 		silent: true,
-		env: env
+		env: env,
+		execArgv: execArgv || process.execArgv
 	});
 
 	var relFile = path.relative('.', file);
 
 	var exiting = false;
-	var send = function (ps, name, data) {
+	var send = function (name, data) {
 		if (!exiting) {
 			// This seems to trigger a Node bug which kills the AVA master process, at
 			// least while running AVA's tests. See
 			// <https://github.com/novemberborn/_ava-tap-crash> for more details.
-			doSend(ps, name, data);
+			ps.send({
+				name: 'ava-' + name,
+				data: data,
+				ava: true
+			});
 		}
 	};
 
@@ -71,7 +79,7 @@ module.exports = function (file, opts) {
 				return;
 			}
 
-			event.name = event.name.replace(/^ava\-/, '');
+			event.name = event.name.replace(/^ava-/, '');
 			event.data.file = relFile;
 
 			debug('ipc %s:\n%o', event.name, event.data);
@@ -86,7 +94,7 @@ module.exports = function (file, opts) {
 		ps.on('results', function (data) {
 			results = data;
 			data.tests = testResults;
-			send(ps, 'teardown');
+			send('teardown');
 		});
 
 		ps.on('exit', function (code, signal) {
@@ -106,7 +114,7 @@ module.exports = function (file, opts) {
 		});
 
 		ps.on('no-tests', function (data) {
-			send(ps, 'teardown');
+			send('teardown');
 
 			var message = 'No tests found in ' + relFile;
 
@@ -120,13 +128,13 @@ module.exports = function (file, opts) {
 
 	// teardown finished, now exit
 	ps.on('teardown', function () {
-		send(ps, 'exit');
+		send('exit');
 		exiting = true;
 	});
 
 	// uncaught exception in fork, need to exit
 	ps.on('uncaughtException', function () {
-		send(ps, 'teardown');
+		send('teardown');
 	});
 
 	ps.stdout.on('data', function (data) {
@@ -144,13 +152,13 @@ module.exports = function (file, opts) {
 	};
 
 	promise.send = function (name, data) {
-		send(ps, name, data);
+		send(name, data);
 
 		return promise;
 	};
 
 	promise.exit = function () {
-		send(ps, 'init-exit');
+		send('init-exit');
 
 		return promise;
 	};
@@ -164,12 +172,12 @@ module.exports = function (file, opts) {
 
 	promise.run = function (options) {
 		if (isReady) {
-			send(ps, 'run', options);
+			send('run', options);
 			return promise;
 		}
 
 		ps.on('stats', function () {
-			send(ps, 'run', options);
+			send('run', options);
 		});
 
 		return promise;

package/lib/logger.js

@@ -1,15 +1,14 @@
 'use strict';
+var autoBind = require('auto-bind');
 
 function Logger(reporter) {
 	if (!(this instanceof Logger)) {
 		throw new TypeError('Class constructor Logger cannot be invoked without \'new\'');
 	}
 
-	Object.keys(Logger.prototype).forEach(function (key) {
-		this[key] = this[key].bind(this);
-	}, this);
-
 	this.reporter = reporter;
+
+	autoBind(this);
 }
 
 module.exports = Logger;
@@ -99,6 +98,6 @@ Logger.prototype.exit = function (code) {
 
 	// timeout required to correctly flush IO on Node.js 0.10 on Windows
 	setTimeout(function () {
-		process.exit(code); // eslint-disable-line
+		process.exit(code); // eslint-disable-line unicorn/no-process-exit
 	}, process.env.AVA_APPVEYOR ? 500 : 0);
 };

package/lib/main.js

@@ -0,0 +1,89 @@
+'use strict';
+
+var process = require('./process-adapter');
+var serializeError = require('./serialize-error');
+var globals = require('./globals');
+var Runner = require('./runner');
+var send = process.send;
+
+var opts = globals.options;
+var runner = new Runner({
+	serial: opts.serial,
+	bail: opts.failFast,
+	match: opts.match
+});
+
+// note that test files have require('ava')
+require('./test-worker').avaRequired = true;
+
+// if fail-fast is enabled, use this variable to detect
+// that no more tests should be logged
+var isFailed = false;
+
+Error.stackTraceLimit = Infinity;
+
+function test(props) {
+	if (isFailed) {
+		return;
+	}
+
+	var hasError = typeof props.error !== 'undefined';
+
+	// don't display anything if it's a passed hook
+	if (!hasError && props.type !== 'test') {
+		return;
+	}
+
+	if (hasError) {
+		props.error = serializeError(props.error);
+	} else {
+		props.error = null;
+	}
+
+	send('test', props);
+
+	if (hasError && opts.failFast) {
+		isFailed = true;
+		exit();
+	}
+}
+
+function exit() {
+	var stats = runner._buildStats();
+
+	send('results', {
+		stats: stats
+	});
+}
+
+globals.setImmediate(function () {
+	var hasExclusive = runner.tests.hasExclusive;
+	var numberOfTests = runner.tests.tests.concurrent.length + runner.tests.tests.serial.length;
+
+	if (numberOfTests === 0) {
+		send('no-tests', {avaRequired: true});
+		return;
+	}
+
+	send('stats', {
+		testCount: numberOfTests,
+		hasExclusive: hasExclusive
+	});
+
+	runner.on('test', test);
+
+	process.on('ava-run', function (options) {
+		runner.run(options).then(exit);
+	});
+
+	process.on('ava-init-exit', function () {
+		exit();
+	});
+});
+
+module.exports = runner.test;
+
+// TypeScript imports the `default` property for
+// an ES2015 default import (`import test from 'ava'`)
+// See: https://github.com/Microsoft/TypeScript/issues/2242#issuecomment-83694181
+module.exports.default = runner.test;

package/lib/prefix-title.js

@@ -0,0 +1,25 @@
+'use strict';
+var path = require('path');
+
+module.exports = function (file, base, separator) {
+	var prefix = file
+		.replace(base, function (match, offset) {
+			// only replace this.base if it is found at the start of the path
+			return offset === 0 ? '' : match;
+		})
+		.replace(/\.spec/, '')
+		.replace(/\.test/, '')
+		.replace(/test-/g, '')
+		.replace(/\.js$/, '')
+		.split(path.sep)
+		.filter(function (p) {
+			return p !== '__tests__';
+		})
+		.join(separator);
+
+	if (prefix.length > 0) {
+		prefix += separator;
+	}
+
+	return prefix;
+};

package/lib/process-adapter.js

@@ -0,0 +1,107 @@
+'use strict';
+var fs = require('fs');
+var path = require('path');
+var chalk = require('chalk');
+var sourceMapSupport = require('source-map-support');
+var installPrecompiler = require('require-precompiled');
+
+var debug = require('debug')('ava');
+
+// check if the test is being run without AVA cli
+var isForked = typeof process.send === 'function';
+
+if (!isForked) {
+	var fp = path.relative('.', process.argv[1]);
+
+	console.log();
+	console.error('Test files must be run with the AVA CLI:\n\n    ' + chalk.grey.dim('$') + ' ' + chalk.cyan('ava ' + fp) + '\n');
+
+	process.exit(1); // eslint-disable-line unicorn/no-process-exit
+}
+
+exports.send = function (name, data) {
+	process.send({
+		name: 'ava-' + name,
+		data: data,
+		ava: true
+	});
+};
+
+exports.on = process.on.bind(process);
+exports.emit = process.emit.bind(process);
+exports.exit = process.exit.bind(process);
+exports.env = process.env;
+
+var opts = exports.opts = JSON.parse(process.argv[2]);
+
+// Fake TTY support
+if (opts.tty) {
+	process.stdout.isTTY = true;
+	process.stdout.columns = opts.tty.columns || 80;
+	process.stdout.rows = opts.tty.rows;
+
+	var tty = require('tty');
+	var isatty = tty.isatty;
+
+	tty.isatty = function (fd) {
+		if (fd === 1 || fd === process.stdout) {
+			return true;
+		}
+
+		return isatty(fd);
+	};
+}
+
+if (debug.enabled) {
+	// Forward the `time-require` `--sorted` flag.
+	// Intended for internal optimization tests only.
+	if (opts._sorted) {
+		process.argv.push('--sorted');
+	}
+
+	require('time-require'); // eslint-disable-line import/no-unassigned-import
+}
+
+var sourceMapCache = Object.create(null);
+var cacheDir = opts.cacheDir;
+
+exports.installSourceMapSupport = function () {
+	sourceMapSupport.install({
+		environment: 'node',
+		handleUncaughtExceptions: false,
+		retrieveSourceMap: function (source) {
+			if (sourceMapCache[source]) {
+				return {
+					url: source,
+					map: fs.readFileSync(sourceMapCache[source], 'utf8')
+				};
+			}
+		}
+	});
+};
+
+exports.installPrecompilerHook = function () {
+	installPrecompiler(function (filename) {
+		var precompiled = opts.precompiled[filename];
+
+		if (precompiled) {
+			sourceMapCache[filename] = path.join(cacheDir, precompiled + '.js.map');
+			return fs.readFileSync(path.join(cacheDir, precompiled + '.js'), 'utf8');
+		}
+
+		return null;
+	});
+};
+
+exports.installDependencyTracking = function (dependencies, testPath) {
+	Object.keys(require.extensions).forEach(function (ext) {
+		var wrappedHandler = require.extensions[ext];
+		require.extensions[ext] = function (module, filename) {
+			if (filename !== testPath) {
+				dependencies.push(filename);
+			}
+
+			wrappedHandler(module, filename);
+		};
+	});
+};

package/lib/reporters/mini.js

@@ -123,11 +123,11 @@ MiniReporter.prototype.unhandledError = function (err) {
 
 MiniReporter.prototype.reportCounts = function (time) {
 	var lines = [
-		this.passCount > 0 ? '\n   ' + colors.pass(this.passCount, 'passed') : '',
-		this.knownFailureCount > 0 ? '\n   ' + colors.error(this.knownFailureCount, plur('known failure', this.knownFailureCount)) : '',
-		this.failCount > 0 ? '\n   ' + colors.error(this.failCount, 'failed') : '',
-		this.skipCount > 0 ? '\n   ' + colors.skip(this.skipCount, 'skipped') : '',
-		this.todoCount > 0 ? '\n   ' + colors.todo(this.todoCount, 'todo') : ''
+		this.passCount > 0 ? '\n  ' + colors.pass(this.passCount, 'passed') : '',
+		this.knownFailureCount > 0 ? '\n  ' + colors.error(this.knownFailureCount, plur('known failure', this.knownFailureCount)) : '',
+		this.failCount > 0 ? '\n  ' + colors.error(this.failCount, 'failed') : '',
+		this.skipCount > 0 ? '\n  ' + colors.skip(this.skipCount, 'skipped') : '',
+		this.todoCount > 0 ? '\n  ' + colors.todo(this.todoCount, 'todo') : ''
 	].filter(Boolean);
 
 	if (time && lines.length > 0) {
@@ -148,26 +148,22 @@ MiniReporter.prototype.finish = function (runStatus) {
 	var status = this.reportCounts(time);
 
 	if (this.rejectionCount > 0) {
-		status += '\n   ' + colors.error(this.rejectionCount, plur('rejection', this.rejectionCount));
+		status += '\n  ' + colors.error(this.rejectionCount, plur('rejection', this.rejectionCount));
 	}
 
 	if (this.exceptionCount > 0) {
-		status += '\n   ' + colors.error(this.exceptionCount, plur('exception', this.exceptionCount));
+		status += '\n  ' + colors.error(this.exceptionCount, plur('exception', this.exceptionCount));
 	}
 
 	if (runStatus.previousFailCount > 0) {
-		status += '\n   ' + colors.error(runStatus.previousFailCount, 'previous', plur('failure', runStatus.previousFailCount), 'in test files that were not rerun');
+		status += '\n  ' + colors.error(runStatus.previousFailCount, 'previous', plur('failure', runStatus.previousFailCount), 'in test files that were not rerun');
 	}
 
-	var i = 0;
-
 	if (this.knownFailureCount > 0) {
 		runStatus.knownFailures.forEach(function (test) {
-			i++;
-
 			var title = test.title;
 
-			status += '\n\n\n   ' + colors.error(i + '.', title);
+			status += '\n\n   ' + colors.title(title);
 			// TODO output description with link
 			// status += colors.stack(description);
 		});
@@ -179,19 +175,26 @@ MiniReporter.prototype.finish = function (runStatus) {
 				return;
 			}
 
-			i++;
-
 			var title = test.error ? test.title : 'Unhandled Error';
 			var description;
+			var errorTitle = '  ' + test.error.message + '\n';
+			var isPowerAssert = test.error.message.split('\n').length > 1;
 
 			if (test.error) {
-				description = '   ' + test.error.message + '\n  ' + stripFirstLine(test.error.stack).trimRight();
+				description = stripFirstLine(test.error.stack).trimRight();
 			} else {
 				description = JSON.stringify(test);
 			}
 
-			status += '\n\n\n   ' + colors.error(i + '.', title) + '\n';
-			status += colors.stack(description);
+			if (isPowerAssert) {
+				description = stripFirstLine(description).replace(/ {3}/g, ' ');
+			} else {
+				description.replace(/ {3}/g, '   ');
+			}
+
+			status += '\n\n  ' + colors.title(title) + '\n';
+			status += colors.stack(errorTitle);
+			status += colors.errorStack(description);
 		});
 	}
 
@@ -201,21 +204,23 @@ MiniReporter.prototype.finish = function (runStatus) {
 				return;
 			}
 
-			i++;
-
 			if (err.type === 'exception' && err.name === 'AvaError') {
-				status += '\n\n\n   ' + colors.error(cross + ' ' + err.message);
+				status += '\n\n  ' + colors.error(cross + ' ' + err.message);
 			} else {
 				var title = err.type === 'rejection' ? 'Unhandled Rejection' : 'Uncaught Exception';
 				var description = err.stack ? err.stack.trimRight() : JSON.stringify(err);
+				description = description.split('\n');
+				var errorTitle = description[0];
+				var errorStack = description.slice(1).join('\n');
 
-				status += '\n\n\n   ' + colors.error(i + '.', title) + '\n';
-				status += '   ' + colors.stack(description);
+				status += '\n\n  ' + colors.title(title) + '\n';
+				status += '  ' + colors.stack(errorTitle) + '\n';
+				status += colors.errorStack(errorStack);
 			}
 		});
 	}
 
-	return status + '\n';
+	return status + '\n\n';
 };
 
 MiniReporter.prototype.section = function () {
@@ -247,7 +252,7 @@ MiniReporter.prototype._update = function (data) {
 	lastLine = lastLine.substring(lastLine.length - (lastLine.length % columns));
 
 	// Don't delete the last log line if it's completely empty.
-	if (lastLine.length) {
+	if (lastLine.length > 0) {
 		ct++;
 	}
 
@@ -257,7 +262,7 @@ MiniReporter.prototype._update = function (data) {
 	// Rewrite the last log line.
 	str += lastLine;
 
-	if (str.length) {
+	if (str.length > 0) {
 		this.stream.write(str);
 	}
 
@@ -269,7 +274,7 @@ MiniReporter.prototype._update = function (data) {
 
 	var currentStatus = this.currentStatus;
 
-	if (currentStatus.length) {
+	if (currentStatus.length > 0) {
 		lastLine = this.lastLineTracker.lastLine();
 		// We need a newline at the end of the last log line, before the status message.
 		// However, if the last log line is the exact width of the terminal a newline is implied,

package/lib/run-status.js

@@ -1,12 +1,12 @@
 'use strict';
 var EventEmitter = require('events').EventEmitter;
-var path = require('path');
 var util = require('util');
 var chalk = require('chalk');
 var isObj = require('is-obj');
 var flatten = require('arr-flatten');
 var figures = require('figures');
-var formatter = require('./enhance-assert').formatter();
+var autoBind = require('auto-bind');
+var prefixTitle = require('./prefix-title');
 
 function RunStatus(opts) {
 	if (!(this instanceof RunStatus)) {
@@ -34,9 +34,7 @@ function RunStatus(opts) {
 	this.stats = [];
 	this.tests = [];
 
-	Object.keys(RunStatus.prototype).forEach(function (key) {
-		this[key] = this[key].bind(this);
-	}, this);
+	autoBind(this);
 }
 
 util.inherits(RunStatus, EventEmitter);
@@ -108,18 +106,8 @@ RunStatus.prototype.handleTest = function (test) {
 	test.title = this.prefixTitle(test.file) + test.title;
 
 	if (test.error) {
-		if (test.error.powerAssertContext) {
-			var message = formatter(test.error.powerAssertContext);
-
-			if (test.error.originalMessage) {
-				message = test.error.originalMessage + ' ' + message;
-			}
-
-			test.error.message = message;
-		}
-
 		if (test.error.name !== 'AssertionError') {
-			test.error.message = 'failed with "' + test.error.message + '"';
+			test.error.message = 'Error: ' + test.error.message;
 		}
 
 		this.errors.push(test);
@@ -139,26 +127,7 @@ RunStatus.prototype.prefixTitle = function (file) {
 
 	var separator = ' ' + chalk.gray.dim(figures.pointerSmall) + ' ';
 
-	var prefix = path.relative('.', file)
-		.replace(this.base, function (match, offset) {
-			// only replace this.base if it is found at the start of the path
-			return offset === 0 ? '' : match;
-		})
-		.replace(/\.spec/, '')
-		.replace(/\.test/, '')
-		.replace(/test\-/g, '')
-		.replace(/\.js$/, '')
-		.split(path.sep)
-		.filter(function (p) {
-			return p !== '__tests__';
-		})
-		.join(separator);
-
-	if (prefix.length > 0) {
-		prefix += separator;
-	}
-
-	return prefix;
+	return prefixTitle(file, this.base, separator);
 };
 
 RunStatus.prototype.handleOutput = function (channel, data) {

package/lib/runner.js

@@ -46,6 +46,7 @@ function Runner(options) {
 
 	this.results = [];
 	this.tests = new TestCollection();
+	this.hasStarted = false;
 	this._bail = options.bail;
 	this._serial = options.serial;
 	this._match = options.match || [];
@@ -61,6 +62,11 @@ optionChain(chainableMethods, function (opts, args) {
 	var fn;
 	var macroArgIndex;
 
+	if (this.hasStarted) {
+		throw new Error('All tests and hooks must be declared synchronously in your ' +
+		'test file, and cannot be nested within other tests or hooks.');
+	}
+
 	if (typeof args[0] === 'string') {
 		title = args[0];
 		fn = args[1];
@@ -196,5 +202,9 @@ Runner.prototype.run = function (options) {
 
 	this.tests.on('test', this._addTestResult);
 
+	this.hasStarted = true;
+
 	return Promise.resolve(this.tests.build(this._bail).run()).then(this._buildStats);
 };
+
+Runner._chainableMethods = chainableMethods.chainableMethods;

package/lib/sequence.js

@@ -1,5 +1,6 @@
 'use strict';
 var isPromise = require('is-promise');
+var autoBind = require('auto-bind');
 var AvaError = require('./ava-error');
 
 function noop() {}
@@ -21,10 +22,7 @@ function Sequence(tests, bail) {
 	this.tests = tests;
 	this.bail = bail || false;
 
-	// TODO(vdemedes): separate into a utility (it's being used in serveral places)
-	Object.keys(Sequence.prototype).forEach(function (key) {
-		this[key] = this[key].bind(this);
-	}, this);
+	autoBind(this);
 }
 
 Sequence.prototype.run = function () {