ava 3.3.0 → 3.4.0

package/index.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node"/>
-
 export interface Subscribable {
 	subscribe(observer: {
 		error(err: any): void,
@@ -247,16 +245,11 @@ export interface SnapshotAssertion {
 }
 
 export interface ThrowsAssertion {
-	/**
-	 * Assert that the function throws [an error](https://www.npmjs.com/package/is-error). If so, returns the error value.
-	 */
-	<ThrownError extends Error>(fn: () => any, expectations?: null, message?: string): ThrownError;
-
 	/**
 	 * Assert that the function throws [an error](https://www.npmjs.com/package/is-error). If so, returns the error value.
 	 * The error must satisfy all expectations.
 	 */
-	<ThrownError extends Error>(fn: () => any, expectations: ThrowsExpectation, message?: string): ThrownError;
+	<ThrownError extends Error>(fn: () => any, expectations?: ThrowsExpectation | null, message?: string): ThrownError;
 
 	/** Skip this assertion. */
 	skip(fn: () => any, expectations?: any, message?: string): void;

package/lib/assert.js

@@ -73,7 +73,7 @@ function getErrorWithLongStackTrace() {
 }
 
 function validateExpectations(assertion, expectations, numArgs) { // eslint-disable-line complexity
-	if (numArgs === 1 || expectations === null) {
+	if (numArgs === 1 || expectations === null || expectations === undefined) {
 		expectations = {};
 	} else if (
 		typeof expectations === 'function' ||
@@ -85,7 +85,7 @@ function validateExpectations(assertion, expectations, numArgs) { // eslint-disa
 	) {
 		throw new AssertionError({
 			assertion,
-			message: `The second argument to \`t.${assertion}()\` must be an expectation object or \`null\``,
+			message: `The second argument to \`t.${assertion}()\` must be an expectation object, \`null\` or \`undefined\``,
 			values: [formatWithLabel('Called with:', expectations)]
 		});
 	} else {

package/lib/beautify-stack.js

@@ -8,7 +8,7 @@ let ignoreStackLines = [];
 
 const avaInternals = /\/ava\/(?:lib\/|lib\/worker\/)?[\w-]+\.js:\d+:\d+\)?$/;
 const avaDependencies = /\/node_modules\/(?:@ava\/babel|@ava\/require-precompiled|append-transform|empower-core|nyc|require-precompiled|(?:ava\/node_modules\/)?(?:babel-runtime|core-js))\//;
-const stackFrameLine = /^.+( \(.+:\d+:\d+\)|:\d+:\d+)$/; // eslint-disable-line prefer-named-capture-group
+const stackFrameLine = /^.+( \(.+:\d+:\d+\)|:\d+:\d+)$/;
 
 if (!debug.enabled) {
 	ignoreStackLines = StackUtils.nodeInternals();

package/lib/load-config.js

@@ -7,42 +7,17 @@ const pkgConf = require('pkg-conf');
 
 const NO_SUCH_FILE = Symbol('no ava.config.js file');
 const MISSING_DEFAULT_EXPORT = Symbol('missing default export');
-const EXPERIMENTS = new Set(['tryAssertion']);
-
-class LegacyCommonJsAccessError extends Error {
-	constructor(thing, fileForErrorMessage) {
-		super(`${thing} is not available in ${fileForErrorMessage}. Use a .cjs file instead`);
-		this.name = 'LegacyCommonJsAccessError';
-	}
-}
+const EXPERIMENTS = new Set();
 
 // *Very* rudimentary support for loading ava.config.js files containing an `export default` statement.
-const evaluateJsConfig = (configFile, fileForErrorMessage) => {
+const evaluateJsConfig = configFile => {
 	const contents = fs.readFileSync(configFile, 'utf8');
 	const script = new vm.Script(`'use strict';(()=>{let __export__;\n${contents.replace(/export default/g, '__export__ =')};return __export__;})()`, {
 		filename: configFile,
 		lineOffset: -1
 	});
 	return {
-		default: script.runInNewContext({
-			console,
-			process,
-			get __dirname() {
-				throw new LegacyCommonJsAccessError('__dirname', fileForErrorMessage);
-			},
-			get __filename() {
-				throw new LegacyCommonJsAccessError('__filename', fileForErrorMessage);
-			},
-			get module() {
-				throw new LegacyCommonJsAccessError('module', fileForErrorMessage);
-			},
-			get exports() {
-				throw new LegacyCommonJsAccessError('exports', fileForErrorMessage);
-			},
-			get require() {
-				throw new LegacyCommonJsAccessError('require()', fileForErrorMessage);
-			}
-		})
+		default: script.runInThisContext()
 	};
 };
 
@@ -55,17 +30,13 @@ const loadJsConfig = ({projectDir, configFile = path.join(projectDir, 'ava.confi
 
 	let config;
 	try {
-		({default: config = MISSING_DEFAULT_EXPORT} = evaluateJsConfig(configFile, fileForErrorMessage));
+		({default: config = MISSING_DEFAULT_EXPORT} = evaluateJsConfig(configFile));
 	} catch (error) {
 		if (error.code === 'ENOENT') {
 			return null;
 		}
 
-		if (error.name === 'LegacyCommonJsAccessError') {
-			throw error;
-		} else {
-			throw Object.assign(new Error(`Error loading ${fileForErrorMessage}`), {parent: error});
-		}
+		throw Object.assign(new Error(`Error loading ${fileForErrorMessage}: ${error.message}`), {parent: error});
 	}
 
 	if (config === MISSING_DEFAULT_EXPORT) {

package/lib/test.js

@@ -69,22 +69,20 @@ class ExecutionContext extends assert.Assertions {
 		};
 
 		this.try = async (...attemptArgs) => {
-			if (test.experiments.tryAssertion !== true) {
-				throw new Error('t.try() is currently an experiment. Opt in by setting `nonSemVerExperiments.tryAssertion` to `true`.');
-			}
-
 			const {args, buildTitle, implementations, receivedImplementationArray} = parseTestArgs(attemptArgs);
 
 			if (implementations.length === 0) {
 				throw new TypeError('Expected an implementation.');
 			}
 
-			const attemptPromises = implementations.map(implementation => {
+			const attemptPromises = implementations.map((implementation, index) => {
 				let {title, isSet, isValid, isEmpty} = buildTitle(implementation);
 
 				if (!isSet || isEmpty) {
-					title = `${test.title} (attempt ${test.attemptCount + 1})`;
-				} else if (!isValid) {
+					title = `${test.title} ─ attempt ${test.attemptCount + 1 + index}`;
+				} else if (isValid) {
+					title = `${test.title} ─ ${title}`;
+				} else {
 					throw new TypeError('`t.try()` titles must be strings'); // Throw synchronously!
 				}
 
@@ -594,7 +592,7 @@ class Test {
 		if (this.metadata.callback) {
 			if (returnedObservable || returnedPromise) {
 				const asyncType = returnedObservable ? 'observables' : 'promises';
-				this.saveFirstError(new Error(`Do not return ${asyncType} from tests declared via \`test.cb(...)\`, if you want to return a promise simply declare the test via \`test(...)\``));
+				this.saveFirstError(new Error(`Do not return ${asyncType} from tests declared via \`test.cb(...)\`. Use \`test.cb(...)\` for legacy callback APIs. When using promises, observables or async functions, use \`test(...)\`.`));
 				return this.finishPromised();
 			}
 

package/lib/worker/subprocess.js

@@ -6,6 +6,15 @@ require('./ensure-forked'); // eslint-disable-line import/no-unassigned-import
 
 const ipc = require('./ipc');
 
+const supportsESM = async () => {
+	try {
+		await import('data:text/javascript,');
+		return true;
+	} catch {}
+
+	return false;
+};
+
 ipc.send({type: 'ready-for-options'});
 ipc.options.then(async options => {
 	require('./options').set(options);
@@ -134,23 +143,18 @@ ipc.options.then(async options => {
 		return null;
 	}).filter(provider => provider !== null);
 
-	// Lazily determine support since this prints an experimental warning.
-	let supportsESM = async () => {
-		try {
-			await import('../esm-probe.mjs');
-			supportsESM = async () => true;
-		} catch {
-			supportsESM = async () => false;
-		}
-
-		return supportsESM();
-	};
-
 	let requireFn = require;
+	let isESMSupported;
 	const load = async ref => {
 		for (const extension of extensionsToLoadAsModules) {
 			if (ref.endsWith(`.${extension}`)) {
-				if (await supportsESM()) { // eslint-disable-line no-await-in-loop
+				if (typeof isESMSupported !== 'boolean') {
+					// Lazily determine support since this prints an experimental warning.
+					// eslint-disable-next-line no-await-in-loop
+					isESMSupported = await supportsESM();
+				}
+
+				if (isESMSupported) {
 					return import(pathToFileURL(ref));
 				}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ava",
-	"version": "3.3.0",
+	"version": "3.4.0",
 	"description": "Testing can be a drag. AVA helps you get it done.",
 	"license": "MIT",
 	"repository": "avajs/ava",
@@ -95,8 +95,8 @@
 		"p-map": "^3.0.0",
 		"picomatch": "^2.2.1",
 		"pkg-conf": "^3.1.0",
-		"plur": "^3.1.1",
-		"pretty-ms": "^5.1.0",
+		"plur": "^4.0.0",
+		"pretty-ms": "^6.0.0",
 		"read-pkg": "^5.2.0",
 		"resolve-cwd": "^3.0.0",
 		"slash": "^3.0.0",
@@ -106,33 +106,32 @@
 		"supertap": "^1.0.0",
 		"temp-dir": "^2.0.0",
 		"trim-off-newlines": "^1.0.1",
-		"update-notifier": "^4.0.0",
+		"update-notifier": "^4.1.0",
 		"write-file-atomic": "^3.0.1",
 		"yargs": "^15.1.0"
 	},
 	"devDependencies": {
 		"@ava/babel": "^1.0.1",
-		"@types/node": "^10.17.13",
+		"@sinonjs/fake-timers": "^6.0.0",
 		"ansi-escapes": "^4.3.0",
 		"delay": "^4.3.0",
 		"esm": "^3.2.25",
 		"execa": "^4.0.0",
 		"get-stream": "^5.1.0",
-		"lolex": "^5.1.2",
 		"p-event": "^4.1.0",
 		"proxyquire": "^2.1.3",
 		"react": "^16.12.0",
 		"react-test-renderer": "^16.12.0",
 		"replace-string": "^3.0.0",
-		"sinon": "^8.1.0",
+		"sinon": "^8.1.1",
 		"source-map-fixtures": "^2.1.0",
 		"tap": "^14.10.6",
 		"temp-write": "^4.0.0",
-		"tempy": "^0.3.0",
+		"tempy": "^0.4.0",
 		"touch": "^3.1.0",
 		"ts-node": "^8.6.2",
 		"typescript": "^3.7.5",
-		"xo": "^0.25.3",
+		"xo": "^0.26.1",
 		"zen-observable": "^0.8.15"
 	},
 	"xo": {

package/lib/esm-probe.mjs

@@ -1,2 +0,0 @@
-// Keep this file in place.
-// It is there to check that ESM dynamic import actually works in the current Node.js version.