ava 1.2.1 → 1.4.1

package/index.d.ts

@@ -29,6 +29,9 @@ export type SnapshotOptions = {
 };
 
 export interface Assertions {
+	/** Assert that `actual` is [truthy](https://developer.mozilla.org/en-US/docs/Glossary/Truthy). Comes with power-assert. */
+	assert: AssertAssertion;
+
 	/** Assert that `actual` is [deeply equal](https://github.com/concordancejs/concordance#comparison-details) to `expected`. */
 	deepEqual: DeepEqualAssertion;
 
@@ -96,6 +99,14 @@ export interface Assertions {
 	truthy: TruthyAssertion;
 }
 
+export interface AssertAssertion {
+	/** Assert that `actual` is [truthy](https://developer.mozilla.org/en-US/docs/Glossary/Truthy). Comes with power-assert. */
+	(actual: any, message?: string): void;
+
+	/** Skip this assertion. */
+	skip(actual: any, message?: string): void;
+}
+
 export interface DeepEqualAssertion {
 	/** Assert that `actual` is [deeply equal](https://github.com/concordancejs/concordance#comparison-details) to `expected`. */
 	<ValueType = any>(actual: ValueType, expected: ValueType, message?: string): void;

package/index.js.flow

@@ -42,6 +42,9 @@ export type SnapshotOptions = {
 };
 
 export interface Assertions {
+	/** Assert that `actual` is [truthy](https://developer.mozilla.org/en-US/docs/Glossary/Truthy). Comes with power-assert. */
+	assert: AssertAssertion;
+
 	/** Assert that `actual` is [deeply equal](https://github.com/concordancejs/concordance#comparison-details) to `expected`. */
 	deepEqual: DeepEqualAssertion;
 
@@ -109,6 +112,14 @@ export interface Assertions {
 	truthy: TruthyAssertion;
 }
 
+export interface AssertAssertion {
+	/** Assert that `actual` is [truthy](https://developer.mozilla.org/en-US/docs/Glossary/Truthy). Comes with power-assert. */
+	(actual: any, message?: string): void;
+
+	/** Skip this assertion. */
+	skip(actual: any, message?: string): void;
+}
+
 export interface DeepEqualAssertion {
 	/** Assert that `actual` is [deeply equal](https://github.com/concordancejs/concordance#comparison-details) to `expected`. */
 	(actual: any, expected: any, message?: string): void;

package/lib/assert.js

@@ -215,7 +215,7 @@ function assertExpectations({assertion, actual, expectations, message, prefix, s
 		});
 	}
 
-	if (typeof expectations.code === 'string' && actual.code !== expectations.code) {
+	if (typeof expectations.code !== 'undefined' && actual.code !== expectations.code) {
 		throw new AssertionError({
 			assertion,
 			message,
@@ -589,110 +589,139 @@ function wrapAssertions(callbacks) {
 					message: message || 'No snapshot available, run with --update-snapshots'
 				}));
 			}
-		}
-	};
+		},
 
-	const enhancedAssertions = enhanceAssert(pass, fail, {
 		truthy(actual, message) {
-			if (!actual) {
-				throw new AssertionError({
+			if (actual) {
+				pass(this);
+			} else {
+				fail(this, new AssertionError({
 					assertion: 'truthy',
 					message,
 					operator: '!!',
 					values: [formatWithLabel('Value is not truthy:', actual)]
-				});
+				}));
 			}
 		},
 
 		falsy(actual, message) {
 			if (actual) {
-				throw new AssertionError({
+				fail(this, new AssertionError({
 					assertion: 'falsy',
 					message,
 					operator: '!',
 					values: [formatWithLabel('Value is not falsy:', actual)]
-				});
+				}));
+			} else {
+				pass(this);
 			}
 		},
 
 		true(actual, message) {
-			if (actual !== true) {
-				throw new AssertionError({
+			if (actual === true) {
+				pass(this);
+			} else {
+				fail(this, new AssertionError({
 					assertion: 'true',
 					message,
 					values: [formatWithLabel('Value is not `true`:', actual)]
-				});
+				}));
 			}
 		},
 
 		false(actual, message) {
-			if (actual !== false) {
-				throw new AssertionError({
+			if (actual === false) {
+				pass(this);
+			} else {
+				fail(this, new AssertionError({
 					assertion: 'false',
 					message,
 					values: [formatWithLabel('Value is not `false`:', actual)]
-				});
+				}));
 			}
 		},
 
 		regex(string, regex, message) {
 			if (typeof string !== 'string') {
-				throw new AssertionError({
+				fail(this, new AssertionError({
 					assertion: 'regex',
 					improperUsage: true,
 					message: '`t.regex()` must be called with a string',
 					values: [formatWithLabel('Called with:', string)]
-				});
+				}));
+				return;
 			}
 
 			if (!(regex instanceof RegExp)) {
-				throw new AssertionError({
+				fail(this, new AssertionError({
 					assertion: 'regex',
 					improperUsage: true,
 					message: '`t.regex()` must be called with a regular expression',
 					values: [formatWithLabel('Called with:', regex)]
-				});
+				}));
+				return;
 			}
 
 			if (!regex.test(string)) {
-				throw new AssertionError({
+				fail(this, new AssertionError({
 					assertion: 'regex',
 					message,
 					values: [
 						formatWithLabel('Value must match expression:', string),
 						formatWithLabel('Regular expression:', regex)
 					]
-				});
+				}));
+				return;
 			}
+
+			pass(this);
 		},
 
 		notRegex(string, regex, message) {
 			if (typeof string !== 'string') {
-				throw new AssertionError({
+				fail(this, new AssertionError({
 					assertion: 'notRegex',
 					improperUsage: true,
 					message: '`t.notRegex()` must be called with a string',
 					values: [formatWithLabel('Called with:', string)]
-				});
+				}));
+				return;
 			}
 
 			if (!(regex instanceof RegExp)) {
-				throw new AssertionError({
+				fail(this, new AssertionError({
 					assertion: 'notRegex',
 					improperUsage: true,
 					message: '`t.notRegex()` must be called with a regular expression',
 					values: [formatWithLabel('Called with:', regex)]
-				});
+				}));
+				return;
 			}
 
 			if (regex.test(string)) {
-				throw new AssertionError({
+				fail(this, new AssertionError({
 					assertion: 'notRegex',
 					message,
 					values: [
 						formatWithLabel('Value must not match expression:', string),
 						formatWithLabel('Regular expression:', regex)
 					]
+				}));
+				return;
+			}
+
+			pass(this);
+		}
+	};
+
+	const enhancedAssertions = enhanceAssert(pass, fail, {
+		assert(actual, message) {
+			if (!actual) {
+				throw new AssertionError({
+					assertion: 'assert',
+					message,
+					operator: '!!',
+					values: [formatWithLabel('Value is not truthy:', actual)]
 				});
 			}
 		}

package/lib/ava-files.js

@@ -171,7 +171,7 @@ class AvaFiles {
 
 		// Same defaults as used for Chokidar
 		if (!hasPositivePattern) {
-			mixedPatterns = ['package.json', '**/*.js'].concat(mixedPatterns);
+			mixedPatterns = ['package.json', '**/*.js', '**/*.snap'].concat(mixedPatterns);
 		}
 
 		filePath = matchable(filePath);

package/lib/enhance-assert.js

@@ -8,12 +8,7 @@ const concordanceOptions = require('./concordance-options').default;
 // https://github.com/avajs/babel-preset-transform-test-files/blob/master/espower-patterns.json
 // Then release a new version of that preset and bump the SemVer range here.
 const PATTERNS = [
-	't.truthy(value, [message])',
-	't.falsy(value, [message])',
-	't.true(value, [message])',
-	't.false(value, [message])',
-	't.regex(contents, regex, [message])',
-	't.notRegex(contents, regex, [message])'
+	't.assert(value, [message])'
 ];
 
 const computeStatement = node => generate(node).code;

package/lib/load-config.js

@@ -15,7 +15,15 @@ function loadConfig(defaults = {}) {
 	let fileConf;
 	try {
 		({default: fileConf = MISSING_DEFAULT_EXPORT} = esm(module, {
-			cjs: false,
+			cjs: {
+				cache: false,
+				extensions: false,
+				interop: false,
+				mutableNamespace: false,
+				namedExports: false,
+				paths: false,
+				vars: true
+			},
 			force: true,
 			mode: 'all'
 		})(path.join(projectDir, 'ava.config.js')));

package/lib/run-status.js

@@ -59,7 +59,6 @@ class RunStatus extends Emittery {
 			case 'declared-test':
 				stats.declaredTests++;
 				fileStats.declaredTests++;
-				this.addPendingTest(event);
 				break;
 			case 'hook-failed':
 				stats.failedHooks++;
@@ -84,6 +83,7 @@ class RunStatus extends Emittery {
 				} else {
 					stats.remainingTests++;
 					fileStats.remainingTests++;
+					this.addPendingTest(event);
 				}
 
 				break;

package/lib/test.js

@@ -278,7 +278,7 @@ class Test {
 	}
 
 	clearTimeout() {
-		clearTimeout(this.timeoutTimer);
+		nowAndTimers.clearTimeout(this.timeoutTimer);
 		this.timeoutTimer = null;
 	}
 

package/lib/watcher.js

@@ -6,6 +6,7 @@ const chokidar = require('chokidar');
 const flatten = require('arr-flatten');
 const union = require('array-union');
 const uniq = require('array-uniq');
+const chalk = require('./chalk').get();
 const AvaFiles = require('./ava-files');
 
 function rethrowAsync(err) {
@@ -18,6 +19,7 @@ function rethrowAsync(err) {
 
 const MIN_DEBOUNCE_DELAY = 10;
 const INITIAL_DEBOUNCE_DELAY = 100;
+const END_MESSAGE = chalk.gray('Type `r` and press enter to rerun tests\nType `u` and press enter to update snapshots\n');
 
 class Debouncer {
 	constructor(watcher) {
@@ -123,6 +125,7 @@ class Watcher {
 			})
 				.then(runStatus => {
 					reporter.endRun();
+					reporter.lineWriter.writeLine(END_MESSAGE);
 
 					if (this.clearLogOnNextRun && (
 						runStatus.stats.failedHooks > 0 ||

package/lib/worker/fake-tty.js

@@ -1,5 +1,6 @@
 'use strict';
 const tty = require('tty');
+const ansiEscapes = require('ansi-escapes');
 const options = require('./options').get();
 
 const fakeTTYs = new Set();
@@ -10,6 +11,27 @@ tty.isatty = fd => fakeTTYs.has(fd) || isatty(fd);
 const simulateTTY = (stream, {colorDepth, columns, rows}) => {
 	Object.assign(stream, {isTTY: true, columns, rows});
 
+	stream.clearLine = dir => {
+		switch (dir) {
+			case -1:
+				stream.write(ansiEscapes.eraseStartLine);
+				break;
+			case 1:
+				stream.write(ansiEscapes.eraseEndLine);
+				break;
+			default:
+				stream.write(ansiEscapes.eraseLine);
+		}
+	};
+
+	stream.clearScreenDown = () => stream.write(ansiEscapes.eraseDown);
+
+	stream.cursorTo = (x, y) => stream.write(ansiEscapes.cursorTo(x, y));
+
+	stream.getWindowSize = () => [80, 24];
+
+	stream.moveCursor = (x, y) => stream.write(ansiEscapes.cursorMove(x, y));
+
 	if (colorDepth !== undefined) {
 		stream.getColorDepth = () => colorDepth;
 	}

package/lib/worker/subprocess.js

@@ -111,7 +111,8 @@ ipc.options.then(options => {
 			const required = require(mod);
 
 			try {
-				if (required[Symbol.for('esm\u200D:package')]) {
+				if (required[Symbol.for('esm:package')] ||
+						required[Symbol.for('esm\u200D:package')]) {
 					require = required(module); // eslint-disable-line no-global-assign
 				}
 			} catch (_) {}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ava",
-	"version": "1.2.1",
+	"version": "1.4.1",
 	"description": "Testing can be a drag. AVA helps you get it done.",
 	"license": "MIT",
 	"repository": "avajs/ava",
@@ -12,7 +12,7 @@
 	"scripts": {
 		"lint": "xo",
 		"test:flow": "flow check test/flow-types",
-		"test:tap": "tap --no-cov --reporter=classic --timeout=300 --jobs=2 test/*.js test/reporters/*.js test/integration/*.js",
+		"test:tap": "tap --no-esm --no-cov --reporter=classic --timeout=300 --jobs=2 test/*.js test/reporters/*.js test/integration/*.js",
 		"test:typescript": "tsc --noEmit -p test/ts-types",
 		"test": "npm run lint && npm run test:flow && npm run test:typescript && nyc npm run test:tap"
 	},
@@ -61,15 +61,15 @@
 	],
 	"dependencies": {
 		"@ava/babel-preset-stage-4": "^2.0.0",
-		"@ava/babel-preset-transform-test-files": "^4.0.1",
+		"@ava/babel-preset-transform-test-files": "^5.0.0",
 		"@ava/write-file-atomic": "^2.2.0",
-		"@babel/core": "^7.2.2",
-		"@babel/generator": "^7.3.0",
+		"@babel/core": "^7.4.0",
+		"@babel/generator": "^7.4.0",
 		"@babel/plugin-syntax-async-generators": "^7.2.0",
 		"@babel/plugin-syntax-object-rest-spread": "^7.2.0",
 		"@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
 		"@concordance/react": "^2.0.0",
-		"ansi-escapes": "^3.1.0",
+		"ansi-escapes": "^3.2.0",
 		"ansi-styles": "^3.2.1",
 		"arr-flatten": "^1.1.0",
 		"array-union": "^1.0.1",
@@ -77,7 +77,7 @@
 		"arrify": "^1.0.0",
 		"bluebird": "^3.5.3",
 		"chalk": "^2.4.2",
-		"chokidar": "^2.0.4",
+		"chokidar": "^2.1.5",
 		"chunkd": "^1.0.0",
 		"ci-parallel-vars": "^1.0.0",
 		"clean-stack": "^2.0.0",
@@ -90,16 +90,16 @@
 		"convert-source-map": "^1.6.0",
 		"currently-unhandled": "^0.4.1",
 		"debug": "^4.1.1",
-		"del": "^3.0.0",
+		"del": "^4.0.0",
 		"dot-prop": "^4.2.0",
 		"emittery": "^0.4.1",
 		"empower-core": "^1.2.0",
 		"equal-length": "^1.0.0",
 		"escape-string-regexp": "^1.0.5",
-		"esm": "^3.1.3",
+		"esm": "^3.2.20",
 		"figures": "^2.0.0",
 		"find-up": "^3.0.0",
-		"get-port": "^4.1.0",
+		"get-port": "^4.2.0",
 		"globby": "^7.1.1",
 		"ignore-by-default": "^1.0.0",
 		"import-local": "^2.0.0",
@@ -116,24 +116,24 @@
 		"lodash.difference": "^4.3.0",
 		"lodash.flatten": "^4.2.0",
 		"loud-rejection": "^1.2.0",
-		"make-dir": "^1.3.0",
+		"make-dir": "^2.1.0",
 		"matcher": "^1.1.1",
 		"md5-hex": "^2.0.0",
 		"meow": "^5.0.0",
 		"ms": "^2.1.1",
 		"multimatch": "^3.0.0",
 		"observable-to-promise": "^0.5.0",
-		"ora": "^3.0.0",
+		"ora": "^3.2.0",
 		"package-hash": "^3.0.0",
-		"pkg-conf": "^2.1.0",
+		"pkg-conf": "^3.0.0",
 		"plur": "^3.0.1",
 		"pretty-ms": "^4.0.0",
 		"require-precompiled": "^0.1.0",
 		"resolve-cwd": "^2.0.0",
 		"slash": "^2.0.0",
-		"source-map-support": "^0.5.10",
+		"source-map-support": "^0.5.11",
 		"stack-utils": "^1.0.2",
-		"strip-ansi": "^5.0.0",
+		"strip-ansi": "^5.2.0",
 		"strip-bom-buf": "^1.0.0",
 		"supertap": "^1.0.0",
 		"supports-color": "^6.1.0",
@@ -144,37 +144,37 @@
 	},
 	"devDependencies": {
 		"cli-table3": "^0.5.1",
-		"codecov": "^3.1.0",
+		"codecov": "^3.2.0",
 		"delay": "^4.1.0",
 		"execa": "^1.0.0",
-		"flow-bin": "^0.91.0",
+		"flow-bin": "^0.95.1",
 		"get-stream": "^4.1.0",
 		"git-branch": "^2.0.1",
 		"has-ansi": "^3.0.0",
-		"lolex": "^3.0.0",
-		"nyc": "^13.1.0",
+		"lolex": "^3.1.0",
+		"nyc": "^13.3.0",
 		"proxyquire": "^2.1.0",
-		"react": "^16.7.0",
-		"react-test-renderer": "^16.7.0",
+		"react": "^16.8.5",
+		"react-test-renderer": "^16.8.5",
 		"replace-string": "^2.0.0",
 		"signal-exit": "^3.0.0",
-		"sinon": "^7.2.3",
+		"sinon": "^7.3.0",
 		"source-map-fixtures": "^2.1.0",
-		"tap": "^12.4.0",
+		"tap": "^12.6.1",
 		"temp-write": "^3.4.0",
 		"touch": "^3.1.0",
-		"ts-node": "^8.0.2",
-		"typescript": "^3.2.4",
+		"ts-node": "^8.0.3",
+		"typescript": "^3.3.4000",
 		"xo": "^0.24.0",
 		"zen-observable": "^0.8.13"
 	},
-	"typings": "index.d.ts",
 	"xo": {
 		"ignores": [
 			"media/**",
 			"test/fixture/ava-paths/target/test.js",
 			"test/fixture/{source-map-initial,syntax-error}.js",
 			"test/fixture/snapshots/test-sourcemaps/build/**",
+			"test/fixture/power-assert.js",
 			"**/*.ts",
 			"test/flow-types/*"
 		],

package/readme.md

@@ -184,7 +184,7 @@ In contrast AVA is highly opinionated and runs tests concurrently, with a separa
 
 ### How is the name written and pronounced?
 
-AVA, not Ava or ava. Pronounced [/ˈeɪvə/ ay-və](media/pronunciation.m4a?raw=true).
+AVA, not Ava or ava. Pronounced [`/ˈeɪvə/`](media/pronunciation.m4a?raw=true): Ay (f**a**ce, m**a**de) V (**v**ie, ha**v**e) A (comm**a**, **a**go)
 
 ### What is the header background?