ava 0.21.0 → 0.25.0

package/lib/process-adapter.js

@@ -48,13 +48,13 @@ if (opts.tty) {
 }
 
 if (debug.enabled) {
-	// Forward the `time-require` `--sorted` flag.
+	// Forward the `@ladjs/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
+	require('@ladjs/time-require'); // eslint-disable-line import/no-unassigned-import
 }
 
 const sourceMapCache = new Map();

package/lib/reporters/improper-usage-messages.js

@@ -15,7 +15,9 @@ exports.forError = error => {
 Visit the following URL for more details:
 
   ${chalk.blue.underline('https://github.com/avajs/ava#throwsfunctionpromise-error-message')}`;
-	} else if (assertion === 'snapshot') {
+	}
+
+	if (assertion === 'snapshot') {
 		const name = error.improperUsage.name;
 		const snapPath = error.improperUsage.snapPath;
 

package/lib/reporters/mini.js

@@ -5,12 +5,12 @@ const lastLineTracker = require('last-line-stream/tracker');
 const plur = require('plur');
 const spinners = require('cli-spinners');
 const chalk = require('chalk');
+const figures = require('figures');
 const cliTruncate = require('cli-truncate');
 const cross = require('figures').cross;
 const indentString = require('indent-string');
 const ansiEscapes = require('ansi-escapes');
 const trimOffNewlines = require('trim-off-newlines');
-const extractStack = require('../extract-stack');
 const codeExcerpt = require('../code-excerpt');
 const colors = require('../colors');
 const formatSerializedError = require('./format-serialized-error');
@@ -33,6 +33,7 @@ class MiniReporter {
 		this.stream = process.stderr;
 		this.stringDecoder = new StringDecoder();
 	}
+
 	start() {
 		this.interval = setInterval(() => {
 			this.spinnerIndex = (this.spinnerIndex + 1) % this.spinnerFrames.length;
@@ -41,6 +42,7 @@ class MiniReporter {
 
 		return this.prefix('');
 	}
+
 	reset() {
 		this.clearInterval();
 		this.passCount = 0;
@@ -56,13 +58,16 @@ class MiniReporter {
 		this.spinnerIndex = 0;
 		this.lastLineTracker = lastLineTracker();
 	}
+
 	spinnerChar() {
 		return this.spinnerFrames[this.spinnerIndex];
 	}
+
 	clearInterval() {
 		clearInterval(this.interval);
 		this.interval = null;
 	}
+
 	test(test) {
 		if (test.todo) {
 			this.todoCount++;
@@ -83,6 +88,7 @@ class MiniReporter {
 
 		return this.prefix(this._test(test));
 	}
+
 	prefix(str) {
 		str = str || this.currentTest;
 		this.currentTest = str;
@@ -91,6 +97,7 @@ class MiniReporter {
 		// TODO(jamestalmage): Figure out why it's needed and document it here
 		return ` \n ${this.spinnerChar()} ${str}`;
 	}
+
 	_test(test) {
 		const SPINNER_WIDTH = 3;
 		const PADDING = 1;
@@ -102,6 +109,7 @@ class MiniReporter {
 
 		return title + '\n' + this.reportCounts();
 	}
+
 	unhandledError(err) {
 		if (err.type === 'exception') {
 			this.exceptionCount++;
@@ -109,6 +117,7 @@ class MiniReporter {
 			this.rejectionCount++;
 		}
 	}
+
 	reportCounts(time) {
 		const lines = [
 			this.passCount > 0 ? '\n  ' + colors.pass(this.passCount, 'passed') : '',
@@ -124,6 +133,7 @@ class MiniReporter {
 
 		return lines.join('');
 	}
+
 	finish(runStatus) {
 		this.clearInterval();
 		let time;
@@ -163,6 +173,21 @@ class MiniReporter {
 				}
 
 				status += '  ' + colors.title(test.title) + '\n';
+
+				if (test.logs) {
+					test.logs.forEach(log => {
+						const logLines = indentString(colors.log(log), 6);
+						const logLinesWithLeadingFigure = logLines.replace(
+							/^ {6}/,
+							`    ${colors.information(figures.info)} `
+						);
+
+						status += logLinesWithLeadingFigure + '\n';
+					});
+
+					status += '\n';
+				}
+
 				if (test.error.source) {
 					status += '  ' + colors.errorSource(test.error.source.file + ':' + test.error.source.line) + '\n';
 
@@ -191,9 +216,9 @@ class MiniReporter {
 				}
 
 				if (test.error.stack) {
-					const extracted = extractStack(test.error.stack);
-					if (extracted.includes('\n')) {
-						status += '\n' + indentString(colors.errorStack(extracted), 2) + '\n';
+					const stack = test.error.stack;
+					if (stack.includes('\n')) {
+						status += '\n' + indentString(colors.errorStack(stack), 2) + '\n';
 					}
 				}
 
@@ -212,14 +237,14 @@ class MiniReporter {
 					status += '  ' + colors.error(cross + ' ' + err.message) + '\n\n';
 				} else {
 					const title = err.type === 'rejection' ? 'Unhandled Rejection' : 'Uncaught Exception';
-					let description = err.stack ? err.stack.trimRight() : JSON.stringify(err);
-					description = description.split('\n');
-					const errorTitle = err.name ? description[0] : 'Threw non-error: ' + description[0];
-					const errorStack = description.slice(1).join('\n');
-
 					status += '  ' + colors.title(title) + '\n';
-					status += '  ' + colors.stack(errorTitle) + '\n';
-					status += colors.errorStack(errorStack) + '\n\n';
+
+					if (err.name) {
+						status += '  ' + colors.stack(err.summary) + '\n';
+						status += colors.errorStack(err.stack) + '\n\n';
+					} else {
+						status += '  Threw non-error: ' + err.summary + '\n';
+					}
 				}
 			});
 		}
@@ -235,24 +260,30 @@ class MiniReporter {
 
 		return '\n' + trimOffNewlines(status) + '\n';
 	}
+
 	section() {
 		return '\n' + chalk.gray.dim('\u2500'.repeat(process.stdout.columns || 80));
 	}
+
 	clear() {
 		return '';
 	}
+
 	write(str) {
 		cliCursor.hide();
 		this.currentStatus = str;
 		this._update();
 		this.statusLineCount = this.currentStatus.split('\n').length;
 	}
+
 	stdout(data) {
 		this._update(data);
 	}
+
 	stderr(data) {
 		this._update(data);
 	}
+
 	_update(data) {
 		let str = '';
 		let ct = this.statusLineCount;

package/lib/reporters/tap.js

@@ -1,14 +1,6 @@
 'use strict';
-const format = require('util').format;
-const indentString = require('indent-string');
+const supertap = require('supertap');
 const stripAnsi = require('strip-ansi');
-const yaml = require('js-yaml');
-const extractStack = require('../extract-stack');
-
-// Parses stack trace and extracts original function name, file name and line
-function getSourceFromStack(stack) {
-	return extractStack(stack).split('\n')[0];
-}
 
 function dumpError(error, includeMessage) {
 	const obj = Object.assign({}, error.object);
@@ -35,82 +27,64 @@ function dumpError(error, includeMessage) {
 	}
 
 	if (error.stack) {
-		obj.at = getSourceFromStack(error.stack);
+		obj.at = error.stack.split('\n')[0];
 	}
 
-	return `  ---\n${indentString(yaml.safeDump(obj).trim(), 4)}\n  ...`;
+	return obj;
 }
 
 class TapReporter {
 	constructor() {
 		this.i = 0;
 	}
+
 	start() {
-		return 'TAP version 13';
+		return supertap.start();
 	}
-	test(test) {
-		let output;
-
-		let directive = '';
-		const passed = test.todo ? 'not ok' : 'ok';
 
-		if (test.todo) {
-			directive = '# TODO';
-		} else if (test.skip) {
-			directive = '# SKIP';
-		}
-
-		const title = stripAnsi(test.title);
-
-		if (test.error) {
-			output = [
-				'# ' + title,
-				format('not ok %d - %s', ++this.i, title),
-				dumpError(test.error, true)
-			];
-		} else {
-			output = [
-				`# ${title}`,
-				format('%s %d - %s %s', passed, ++this.i, title, directive).trim()
-			];
-		}
-
-		return output.join('\n');
+	test(test) {
+		return supertap.test(test.title, {
+			passed: !test.error,
+			index: ++this.i,
+			todo: test.todo,
+			skip: test.skip,
+			comment: test.logs,
+			error: test.error ? dumpError(test.error, true) : null
+		});
 	}
+
 	unhandledError(err) {
-		const output = [
-			`# ${err.message}`,
-			format('not ok %d - %s', ++this.i, err.message)
-		];
+		let error;
+
 		// AvaErrors don't have stack traces
 		if (err.type !== 'exception' || err.name !== 'AvaError') {
-			output.push(dumpError(err, false));
+			error = dumpError(err, false);
 		}
 
-		return output.join('\n');
+		return supertap.test(err.message, {
+			passed: false,
+			index: ++this.i,
+			error
+		});
 	}
-	finish(runStatus) {
-		const output = [
-			'',
-			'1..' + (runStatus.passCount + runStatus.failCount + runStatus.skipCount),
-			'# tests ' + (runStatus.passCount + runStatus.failCount + runStatus.skipCount),
-			'# pass ' + runStatus.passCount
-		];
-
-		if (runStatus.skipCount > 0) {
-			output.push(`# skip ${runStatus.skipCount}`);
-		}
 
-		output.push('# fail ' + (runStatus.failCount + runStatus.rejectionCount + runStatus.exceptionCount), '');
-
-		return output.join('\n');
+	finish(runStatus) {
+		return supertap.finish({
+			passed: runStatus.passCount,
+			failed: runStatus.failCount,
+			skipped: runStatus.skipCount,
+			crashed: runStatus.rejectionCount + runStatus.exceptionCount
+		});
 	}
+
 	write(str) {
 		console.log(str);
 	}
+
 	stdout(data) {
 		process.stderr.write(data);
 	}
+
 	stderr(data) {
 		this.stdout(data);
 	}

package/lib/reporters/verbose.js

@@ -5,7 +5,6 @@ const figures = require('figures');
 const chalk = require('chalk');
 const plur = require('plur');
 const trimOffNewlines = require('trim-off-newlines');
-const extractStack = require('../extract-stack');
 const codeExcerpt = require('../code-excerpt');
 const colors = require('../colors');
 const formatSerializedError = require('./format-serialized-error');
@@ -20,34 +19,46 @@ class VerboseReporter {
 			colors[key].enabled = this.options.color;
 		}
 	}
+
 	start() {
 		return '';
 	}
+
 	test(test, runStatus) {
+		const lines = [];
 		if (test.error) {
-			return '  ' + colors.error(figures.cross) + ' ' + test.title + ' ' + colors.error(test.error.message);
-		}
-
-		if (test.todo) {
-			return '  ' + colors.todo('- ' + test.title);
+			lines.push('  ' + colors.error(figures.cross) + ' ' + test.title + ' ' + colors.error(test.error.message));
+		} else if (test.todo) {
+			lines.push('  ' + colors.todo('- ' + test.title));
 		} else if (test.skip) {
-			return '  ' + colors.skip('- ' + test.title);
-		}
+			lines.push('  ' + colors.skip('- ' + test.title));
+		} else if (test.failing) {
+			lines.push('  ' + colors.error(figures.tick) + ' ' + colors.error(test.title));
+		} else if (runStatus.fileCount === 1 && runStatus.testCount === 1 && test.title === '[anonymous]') {
+			// No output
+		} else {
+			// Display duration only over a threshold
+			const threshold = 100;
+			const duration = test.duration > threshold ? colors.duration(' (' + prettyMs(test.duration) + ')') : '';
 
-		if (test.failing) {
-			return '  ' + colors.error(figures.tick) + ' ' + colors.error(test.title);
+			lines.push('  ' + colors.pass(figures.tick) + ' ' + test.title + duration);
 		}
 
-		if (runStatus.fileCount === 1 && runStatus.testCount === 1 && test.title === '[anonymous]') {
-			return undefined;
-		}
+		if (test.logs) {
+			test.logs.forEach(log => {
+				const logLines = indentString(colors.log(log), 6);
+				const logLinesWithLeadingFigure = logLines.replace(
+					/^ {6}/,
+					`    ${colors.information(figures.info)} `
+				);
 
-		// Display duration only over a threshold
-		const threshold = 100;
-		const duration = test.duration > threshold ? colors.duration(' (' + prettyMs(test.duration) + ')') : '';
+				lines.push(logLinesWithLeadingFigure);
+			});
+		}
 
-		return '  ' + colors.pass(figures.tick) + ' ' + test.title + duration;
+		return lines.length > 0 ? lines.join('\n') : undefined;
 	}
+
 	unhandledError(err) {
 		if (err.type === 'exception' && err.name === 'AvaError') {
 			return colors.error('  ' + figures.cross + ' ' + err.message);
@@ -61,6 +72,7 @@ class VerboseReporter {
 		let output = colors.error(types[err.type] + ':', err.file) + '\n';
 
 		if (err.stack) {
+			output += '  ' + colors.stack(err.title || err.summary) + '\n';
 			output += '  ' + colors.stack(err.stack) + '\n';
 		} else {
 			output += '  ' + colors.stack(JSON.stringify(err)) + '\n';
@@ -70,6 +82,7 @@ class VerboseReporter {
 
 		return output;
 	}
+
 	finish(runStatus) {
 		let output = '';
 
@@ -86,7 +99,9 @@ class VerboseReporter {
 		].filter(Boolean);
 
 		if (lines.length > 0) {
-			lines[0] += ' ' + chalk.gray.dim('[' + new Date().toLocaleTimeString('en-US', {hour12: false}) + ']');
+			if (this.options.watching) {
+				lines[0] += ' ' + chalk.gray.dim('[' + new Date().toLocaleTimeString('en-US', {hour12: false}) + ']');
+			}
 			output += lines.join('\n') + '\n';
 		}
 
@@ -104,6 +119,21 @@ class VerboseReporter {
 				}
 
 				output += '  ' + colors.title(test.title) + '\n';
+
+				if (test.logs) {
+					test.logs.forEach(log => {
+						const logLines = indentString(colors.log(log), 6);
+						const logLinesWithLeadingFigure = logLines.replace(
+							/^ {6}/,
+							`    ${colors.information(figures.info)} `
+						);
+
+						output += logLinesWithLeadingFigure + '\n';
+					});
+
+					output += '\n';
+				}
+
 				if (test.error.source) {
 					output += '  ' + colors.errorSource(test.error.source.file + ':' + test.error.source.line) + '\n';
 
@@ -132,9 +162,9 @@ class VerboseReporter {
 				}
 
 				if (test.error.stack) {
-					const extracted = extractStack(test.error.stack);
-					if (extracted.includes('\n')) {
-						output += '\n' + indentString(colors.errorStack(extracted), 2) + '\n';
+					const stack = test.error.stack;
+					if (stack.includes('\n')) {
+						output += '\n' + indentString(colors.errorStack(stack), 2) + '\n';
 					}
 				}
 
@@ -153,15 +183,19 @@ class VerboseReporter {
 
 		return '\n' + trimOffNewlines(output) + '\n';
 	}
+
 	section() {
 		return chalk.gray.dim('\u2500'.repeat(process.stdout.columns || 80));
 	}
+
 	write(str) {
 		console.error(str);
 	}
+
 	stdout(data) {
 		process.stderr.write(data);
 	}
+
 	stderr(data) {
 		process.stderr.write(data);
 	}

package/lib/run-status.js

@@ -44,6 +44,7 @@ class RunStatus extends EventEmitter {
 
 		autoBind(this);
 	}
+
 	observeFork(emitter) {
 		emitter
 			.on('teardown', this.handleTeardown)
@@ -54,6 +55,7 @@ class RunStatus extends EventEmitter {
 			.on('stdout', this.handleOutput.bind(this, 'stdout'))
 			.on('stderr', this.handleOutput.bind(this, 'stderr'));
 	}
+
 	handleRejections(data) {
 		this.rejectionCount += data.rejections.length;
 
@@ -64,6 +66,7 @@ class RunStatus extends EventEmitter {
 			this.errors.push(err);
 		});
 	}
+
 	handleExceptions(data) {
 		this.exceptionCount++;
 		const err = data.exception;
@@ -72,10 +75,12 @@ class RunStatus extends EventEmitter {
 		this.emit('error', err, this);
 		this.errors.push(err);
 	}
+
 	handleTeardown(data) {
 		this.emit('dependencies', data.file, data.dependencies, this);
 		this.emit('touchedFiles', data.touchedFiles);
 	}
+
 	handleStats(stats) {
 		this.emit('stats', stats, this);
 
@@ -85,6 +90,7 @@ class RunStatus extends EventEmitter {
 
 		this.testCount += stats.testCount;
 	}
+
 	handleTest(test) {
 		test.title = this.prefixTitle(test.file) + test.title;
 
@@ -98,6 +104,7 @@ class RunStatus extends EventEmitter {
 
 		this.emit('test', test, this);
 	}
+
 	prefixTitle(file) {
 		if (!this.prefixTitles) {
 			return '';
@@ -107,9 +114,11 @@ class RunStatus extends EventEmitter {
 
 		return prefixTitle(file, this.base, separator);
 	}
+
 	handleOutput(channel, data) {
 		this.emit(channel, data, this);
 	}
+
 	processResults(results) {
 		// Assemble stats from all tests
 		this.stats = results.map(result => result.stats);

package/lib/runner.js

@@ -52,6 +52,7 @@ class Runner extends EventEmitter {
 		this.projectDir = options.projectDir;
 		this.serial = options.serial;
 		this.updateSnapshots = options.updateSnapshots;
+		this.snapshotDir = options.snapshotDir;
 
 		this.hasStarted = false;
 		this.results = [];
@@ -112,7 +113,7 @@ class Runner extends EventEmitter {
 		}
 
 		if (metadata.type === 'test' && this.match.length > 0) {
-			metadata.exclusive = title !== null && matcher([title], this.match).length === 1;
+			metadata.exclusive = matcher([title || ''], this.match).length === 1;
 		}
 
 		const validationError = validateTest(title, fn, metadata);
@@ -130,6 +131,7 @@ class Runner extends EventEmitter {
 	addTestResult(result) {
 		const test = result.result;
 		const props = {
+			logs: test.logs,
 			duration: test.duration,
 			title: test.title,
 			error: result.reason,
@@ -183,6 +185,8 @@ class Runner extends EventEmitter {
 	compareTestSnapshot(options) {
 		if (!this.snapshots) {
 			this.snapshots = snapshotManager.load({
+				file: this.file,
+				fixedLocation: this.snapshotDir,
 				name: path.basename(this.file),
 				projectDir: this.projectDir,
 				relFile: path.relative(this.projectDir, this.file),
@@ -219,6 +223,7 @@ class Runner extends EventEmitter {
 		});
 		return Bluebird.try(() => this.tests.build().run());
 	}
+
 	attributeLeakedError(err) {
 		return this.tests.attributeLeakedError(err);
 	}

package/lib/serialize-error.js

@@ -4,7 +4,6 @@ const cleanYamlObject = require('clean-yaml-object');
 const StackUtils = require('stack-utils');
 const assert = require('./assert');
 const beautifyStack = require('./beautify-stack');
-const extractStack = require('./extract-stack');
 
 function isAvaAssertionError(source) {
 	return source instanceof assert.AssertionError;
@@ -20,7 +19,7 @@ function extractSource(stack) {
 		return null;
 	}
 
-	const firstStackLine = extractStack(stack).split('\n')[0];
+	const firstStackLine = stack.split('\n')[0];
 	return stackUtils.parseLine(firstStackLine);
 }
 function buildSource(source) {
@@ -90,5 +89,11 @@ module.exports = error => {
 		}
 	}
 
+	if (typeof error.stack === 'string') {
+		retval.summary = error.stack.split('\n')[0];
+	} else {
+		retval.summary = JSON.stringify(error);
+	}
+
 	return retval;
 };

package/lib/snapshot-manager.js

@@ -11,6 +11,7 @@ const indentString = require('indent-string');
 const makeDir = require('make-dir');
 const md5Hex = require('md5-hex');
 const Buffer = require('safe-buffer').Buffer;
+const convertSourceMap = require('convert-source-map');
 
 const concordanceOptions = require('./concordance-options').snapshotManager;
 
@@ -355,18 +356,39 @@ class Manager {
 	}
 }
 
-function determineSnapshotDir(projectDir, testDir) {
-	const parts = new Set(path.relative(projectDir, testDir).split(path.sep));
+function determineSnapshotDir(options) {
+	const testDir = determineSourceMappedDir(options);
+	if (options.fixedLocation) {
+		const relativeTestLocation = path.relative(options.projectDir, testDir);
+		return path.join(options.fixedLocation, relativeTestLocation);
+	}
+
+	const parts = new Set(path.relative(options.projectDir, testDir).split(path.sep));
 	if (parts.has('__tests__')) {
 		return path.join(testDir, '__snapshots__');
-	} else if (parts.has('test') || parts.has('tests')) { // Accept tests, even though it's not in the default test patterns
+	}
+	if (parts.has('test') || parts.has('tests')) { // Accept tests, even though it's not in the default test patterns
 		return path.join(testDir, 'snapshots');
 	}
+
 	return testDir;
 }
 
+function determineSourceMappedDir(options) {
+	const source = tryRead(options.file).toString();
+	const converter = convertSourceMap.fromSource(source) || convertSourceMap.fromMapFileSource(source, options.testDir);
+	if (converter) {
+		const map = converter.toObject();
+		const firstSource = `${map.sourceRoot || ''}${map.sources[0]}`;
+		const sourceFile = path.resolve(options.testDir, firstSource);
+		return path.dirname(sourceFile);
+	}
+
+	return options.testDir;
+}
+
 function load(options) {
-	const dir = determineSnapshotDir(options.projectDir, options.testDir);
+	const dir = determineSnapshotDir(options);
 	const reportFile = `${options.name}.md`;
 	const snapFile = `${options.name}.snap`;
 	const snapPath = path.join(dir, snapFile);