Merge 0689f1c into 3e3b213

lib/assert.js

@@ -16,6 +16,8 @@ class AssertionError extends Error {
 		this.name = 'AssertionError';
 
 		this.assertion = opts.assertion;
+		this.fixedSource = opts.fixedSource;
+		this.improperUsage = opts.improperUsage || false;
 		this.operator = opts.operator;
 		this.values = opts.values || [];
 
@@ -123,6 +125,7 @@ function wrapAssertions(callbacks) {
 			} else if (typeof fn !== 'function') {
 				fail(this, new AssertionError({
 					assertion: 'throws',
+					improperUsage: true,
 					message: '`t.throws()` must be called with a function, Promise, or Observable',
 					values: [formatAssertError.formatWithLabel('Called with:', fn)]
 				}));
@@ -190,6 +193,7 @@ function wrapAssertions(callbacks) {
 			} else if (typeof fn !== 'function') {
 				fail(this, new AssertionError({
 					assertion: 'notThrows',
+					improperUsage: true,
 					message: '`t.notThrows()` must be called with a function, Promise, or Observable',
 					values: [formatAssertError.formatWithLabel('Called with:', fn)]
 				}));
@@ -302,13 +306,15 @@ function wrapAssertions(callbacks) {
 			if (typeof string !== 'string') {
 				throw new AssertionError({
 					assertion: 'regex',
+					improperUsage: true,
 					message: '`t.regex()` must be called with a string',
 					values: [formatAssertError.formatWithLabel('Called with:', string)]
 				});
 			}
 			if (!(regex instanceof RegExp)) {
 				throw new AssertionError({
 					assertion: 'regex',
+					improperUsage: true,
 					message: '`t.regex()` must be called with a regular expression',
 					values: [formatAssertError.formatWithLabel('Called with:', regex)]
 				});
@@ -330,13 +336,15 @@ function wrapAssertions(callbacks) {
 			if (typeof string !== 'string') {
 				throw new AssertionError({
 					assertion: 'notRegex',
+					improperUsage: true,
 					message: '`t.notRegex()` must be called with a string',
 					values: [formatAssertError.formatWithLabel('Called with:', string)]
 				});
 			}
 			if (!(regex instanceof RegExp)) {
 				throw new AssertionError({
 					assertion: 'notRegex',
+					improperUsage: true,
 					message: '`t.notRegex()` must be called with a regular expression',
 					values: [formatAssertError.formatWithLabel('Called with:', regex)]
 				});

lib/main.js

@@ -13,8 +13,7 @@ const runner = new Runner({
 	match: opts.match
 });
 
-// Note that test files have require('ava')
-worker.avaRequired = true;
+worker.setRunner(runner);
 
 // If fail-fast is enabled, use this variable to detect
 // that no more tests should be logged

lib/reporters/improper-usage-messages.js

@@ -0,0 +1,21 @@
+'use strict';
+const chalk = require('chalk');
+
+exports.forError = error => {
+	if (!error.improperUsage) {
+		return null;
+	}
+
+	const assertion = error.assertion;
+	if (assertion !== 'throws' || !assertion === 'notThrows') {
+		return null;
+	}
+
+	return `Try wrapping the first argument to \`t.${assertion}()\` in a function:
+
+  ${chalk.cyan(`t.${assertion}(() => { `)}${chalk.grey('/* your code here */')}${chalk.cyan(' })')}
+
+Visit the following URL for more details:
+
+  ${chalk.blue.underline('https://github.com/avajs/ava#throwsfunctionpromise-error-message')}`;
+};

lib/reporters/mini.js

@@ -12,6 +12,7 @@ const formatAssertError = require('../format-assert-error');
 const extractStack = require('../extract-stack');
 const codeExcerpt = require('../code-excerpt');
 const colors = require('../colors');
+const improperUsageMessages = require('./improper-usage-messages');
 
 // TODO(@jamestalamge): This should be fixed in log-update and ansi-escapes once we are confident it's a good solution.
 const CSI = '\u001B[';
@@ -191,15 +192,20 @@ class MiniReporter {
 					}
 				}
 
+				if (test.error.message) {
+					status += '\n' + indentString(test.error.message, 2) + '\n';
+				}
+
 				if (test.error.avaAssertionError) {
 					const formatted = formatAssertError.formatSerializedError(test.error);
 					if (formatted) {
 						status += '\n' + indentString(formatted, 2);
 					}
-				}
 
-				if (test.error.message) {
-					status += '\n' + indentString(test.error.message, 2) + '\n';
+					const message = improperUsageMessages.forError(test.error);
+					if (message) {
+						status += '\n' + indentString(message, 2) + '\n';
+					}
 				}
 
 				if (test.error.stack) {

lib/reporters/verbose.js

@@ -8,6 +8,7 @@ const formatAssertError = require('../format-assert-error');
 const extractStack = require('../extract-stack');
 const codeExcerpt = require('../code-excerpt');
 const colors = require('../colors');
+const improperUsageMessages = require('./improper-usage-messages');
 
 class VerboseReporter {
 	constructor(options) {
@@ -111,15 +112,20 @@ class VerboseReporter {
 					}
 				}
 
+				if (test.error.message) {
+					output += '\n' + indentString(test.error.message, 2) + '\n';
+				}
+
 				if (test.error.avaAssertionError) {
 					const formatted = formatAssertError.formatSerializedError(test.error);
 					if (formatted) {
 						output += '\n' + indentString(formatted, 2);
 					}
-				}
 
-				if (test.error.message) {
-					output += '\n' + indentString(test.error.message, 2) + '\n';
+					const message = improperUsageMessages.forError(test.error);
+					if (message) {
+						output += '\n' + indentString(message, 2) + '\n';
+					}
 				}
 
 				if (test.error.stack) {

lib/runner.js

@@ -148,6 +148,9 @@ class Runner extends EventEmitter {
 
 		return Promise.resolve(this.tests.build().run()).then(this._buildStats);
 	}
+	attributeLeakedError(err) {
+		return this.tests.attributeLeakedError(err);
+	}
 }
 
 optionChain(chainableMethods, function (opts, args) {

lib/serialize-error.js

@@ -15,13 +15,15 @@ function filter(propertyName, isRoot) {
 }
 
 const stackUtils = new StackUtils();
-function buildSource(stack) {
+function extractSource(stack) {
 	if (!stack) {
 		return null;
 	}
 
 	const firstStackLine = extractStack(stack).split('\n')[0];
-	const source = stackUtils.parseLine(firstStackLine);
+	return stackUtils.parseLine(firstStackLine);
+}
+function buildSource(source) {
 	if (!source) {
 		return null;
 	}
@@ -49,21 +51,29 @@ module.exports = error => {
 	const stack = typeof error.stack === 'string' ?
 		beautifyStack(error.stack) :
 		null;
-	const source = buildSource(stack);
+
 	const retval = {
 		avaAssertionError: isAvaAssertionError(error),
-		source
+		source: buildSource(extractSource(stack))
 	};
 	if (stack) {
 		retval.stack = stack;
 	}
 
 	if (retval.avaAssertionError) {
+		retval.improperUsage = error.improperUsage;
 		retval.message = error.message;
 		retval.name = error.name;
 		retval.statements = error.statements;
 		retval.values = error.values;
 
+		if (error.fixedSource) {
+			const source = buildSource(error.fixedSource);
+			if (source) {
+				retval.source = source;
+			}
+		}
+
 		if (error.assertion) {
 			retval.assertion = error.assertion;
 		}

lib/test-collection.js

@@ -28,6 +28,8 @@ class TestCollection extends EventEmitter {
 			afterEachAlways: []
 		};
 
+		this.pendingTestInstances = new Set();
+
 		this._emitTestResult = this._emitTestResult.bind(this);
 	}
 	add(test) {
@@ -100,8 +102,9 @@ class TestCollection extends EventEmitter {
 			}
 		};
 	}
-	_emitTestResult(test) {
-		this.emit('test', test);
+	_emitTestResult(result) {
+		this.pendingTestInstances.delete(result.result);
+		this.emit('test', result);
 	}
 	_buildHooks(hooks, testTitle, context) {
 		return hooks.map(hook => {
@@ -125,14 +128,18 @@ class TestCollection extends EventEmitter {
 			context = null;
 		}
 
-		return new Test(hook.metadata, title, hook.fn, false, context, this._emitTestResult);
+		const test = new Test(hook.metadata, title, hook.fn, false, context, this._emitTestResult);
+		this.pendingTestInstances.add(test);
+		return test;
 	}
 	_buildTest(test, context) {
 		if (!context) {
 			context = null;
 		}
 
-		return new Test(test.metadata, test.title, test.fn, this.failWithoutAssertions, context, this._emitTestResult);
+		test = new Test(test.metadata, test.title, test.fn, this.failWithoutAssertions, context, this._emitTestResult);
+		this.pendingTestInstances.add(test);
+		return test;
 	}
 	_buildTestWithHooks(test) {
 		if (test.metadata.skipped || test.metadata.todo) {
@@ -169,6 +176,14 @@ class TestCollection extends EventEmitter {
 		}
 		return finalTests;
 	}
+	attributeLeakedError(err) {
+		for (const test of this.pendingTestInstances) {
+			if (test.attributeLeakedError(err)) {
+				return true;
+			}
+		}
+		return false;
+	}
 }
 
 module.exports = TestCollection;

lib/test-worker.js

@@ -24,7 +24,6 @@ const isObj = require('is-obj');
 const adapter = require('./process-adapter');
 const globals = require('./globals');
 const serializeError = require('./serialize-error');
-const throwsHelper = require('./throws-helper');
 
 const opts = adapter.opts;
 const testPath = opts.file;
@@ -41,20 +40,38 @@ adapter.installPrecompilerHook();
 const dependencies = [];
 adapter.installDependencyTracking(dependencies, testPath);
 
-// Check if test files required ava and show error, when they didn't
-exports.avaRequired = false;
+// Set when main.js is required (since test files should have `require('ava')`).
+let runner = null;
+exports.setRunner = newRunner => {
+	runner = newRunner;
+};
 
 require(testPath); // eslint-disable-line import/no-dynamic-require
 
 // If AVA was not required, show an error
-if (!exports.avaRequired) {
+if (!runner) {
 	adapter.send('no-tests', {avaRequired: false});
 }
 
-process.on('unhandledRejection', throwsHelper);
+function attributeLeakedError(err) {
+	if (!runner) {
+		return false;
+	}
+
+	return runner.attributeLeakedError(err);
+}
+
+const attributedRejections = new Set();
+process.on('unhandledRejection', (reason, promise) => {
+	if (attributeLeakedError(reason)) {
+		attributedRejections.add(promise);
+	}
+});
 
 process.on('uncaughtException', exception => {
-	throwsHelper(exception);
+	if (attributeLeakedError(exception)) {
+		return;
+	}
 
 	let serialized;
 	try {
@@ -85,7 +102,8 @@ process.on('ava-teardown', () => {
 	}
 	tearingDown = true;
 
-	let rejections = currentlyUnhandled();
+	let rejections = currentlyUnhandled()
+		.filter(rejection => !attributedRejections.has(rejection.promise));
 
 	if (rejections.length > 0) {
 		rejections = rejections.map(rejection => {