ava 0.15.0 → 0.17.0

package/lib/test-worker.js

@@ -1,98 +1,36 @@
 'use strict';
-var opts = JSON.parse(process.argv[2]);
-var testPath = opts.file;
-
-// 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);
-	};
-}
-
-var path = require('path');
-var fs = require('fs');
-var debug = require('debug')('ava');
-var sourceMapSupport = require('source-map-support');
-
-if (debug.enabled) {
-	// Forward the `time-require` `--sorted` flag.
-	// Intended for internal optimization tests only.
-	if (opts._sorted) {
-		process.argv.push('--sorted');
-	}
+/* eslint-disable import/order */
+var process = require('./process-adapter');
 
-	require('time-require');
-}
+var opts = process.opts;
+var testPath = opts.file;
 
 // bind globals first before anything has a chance to interfere
 var globals = require('./globals');
 globals.options = opts;
-var Promise = require('bluebird'); // eslint-disable-line
+var Promise = require('bluebird');
 
 // Bluebird specific
 Promise.longStackTraces();
 
 (opts.require || []).forEach(require);
 
-var sourceMapCache = Object.create(null);
-
-sourceMapSupport.install({
-	environment: 'node',
-	handleUncaughtExceptions: false,
-	retrieveSourceMap: function (source) {
-		if (sourceMapCache[source]) {
-			return {
-				url: source,
-				map: fs.readFileSync(sourceMapCache[source], 'utf8')
-			};
-		}
-	}
-});
+process.installSourceMapSupport();
 
-var loudRejection = require('loud-rejection/api')(process); // eslint-disable-line
+var currentlyUnhandled = require('currently-unhandled')();
 var serializeError = require('./serialize-error');
-var send = require('./send');
+var send = process.send;
 var throwsHelper = require('./throws-helper');
-var installPrecompiler = require('require-precompiled'); // eslint-disable-line
-var cacheDir = opts.cacheDir;
 
 // check if test files required ava and show error, when they didn't
 exports.avaRequired = false;
 
-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;
-});
+process.installPrecompilerHook();
 
 var dependencies = [];
-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);
-	};
-});
+process.installDependencyTracking(dependencies, testPath);
 
-require(testPath);
+require(testPath); // eslint-disable-line import/no-dynamic-require
 
 process.on('unhandledRejection', throwsHelper);
 
@@ -120,7 +58,7 @@ process.on('ava-exit', function () {
 	var delay = process.env.AVA_APPVEYOR ? 100 : 0;
 
 	globals.setTimeout(function () {
-		process.exit(0); // eslint-disable-line
+		process.exit(0); // eslint-disable-line xo/no-process-exit
 	}, delay);
 });
 
@@ -132,7 +70,7 @@ process.on('ava-teardown', function () {
 	}
 	tearingDown = true;
 
-	var rejections = loudRejection.currentlyUnhandled();
+	var rejections = currentlyUnhandled();
 
 	if (rejections.length === 0) {
 		exit();

package/lib/test.js

@@ -13,6 +13,7 @@ var assert = require('./assert');
 var enhanceAssert = require('./enhance-assert');
 var globals = require('./globals');
 var throwsHelper = require('./throws-helper');
+var formatter = enhanceAssert.formatter();
 
 function Test(title, fn, contextRef, report) {
 	if (!(this instanceof Test)) {
@@ -117,7 +118,7 @@ Test.prototype.promise = function () {
 	if (!this._promise) {
 		this._promise = {};
 
-		this._promise.promise = new Promise(function (resolve, reject) { // eslint-disable-line
+		this._promise.promise = new Promise(function (resolve, reject) { // eslint-disable-line no-use-extend-native/no-use-extend-native
 			self._promise.resolve = resolve;
 			self._promise.reject = reject;
 		}).tap(function (result) {
@@ -188,15 +189,22 @@ Test.prototype.run = function () {
 Test.prototype._result = function () {
 	var reason = this.assertError;
 	var passed = reason === undefined;
+
 	if (this.metadata.failing) {
 		passed = !passed;
+
 		if (passed) {
 			reason = undefined;
 		} else {
 			reason = new Error('Test was expected to fail, but succeeded, you should stop marking the test as failing');
 		}
 	}
-	return {passed: passed, result: this, reason: reason};
+
+	return {
+		passed: passed,
+		result: this,
+		reason: reason
+	};
 };
 
 Object.defineProperty(Test.prototype, 'end', {
@@ -218,9 +226,10 @@ Test.prototype._end = function (err) {
 				operator: 'callback'
 			});
 		}
-		this._setAssertError(err);
 
+		this._setAssertError(err);
 		this.exit();
+
 		return;
 	}
 
@@ -294,8 +303,12 @@ function PublicApi(test) {
 
 function onAssertionEvent(event) {
 	if (event.assertionThrew) {
-		event.error.powerAssertContext = event.powerAssertContext;
-		event.error.originalMessage = event.originalMessage;
+		if (event.powerAssertContext) {
+			event.error.message = formatter(event.powerAssertContext);
+			if (event.originalMessage) {
+				event.error.message = event.originalMessage + ' ' + event.error.message;
+			}
+		}
 		this._test._setAssertError(event.error);
 		this._test._assert(null);
 		return null;

package/lib/throws-helper.js

@@ -4,20 +4,22 @@ var path = require('path');
 var chalk = require('chalk');
 var globals = require('./globals');
 
-module.exports = function throwsHelper(error) {
+module.exports = function (error) {
 	if (!error || !error._avaThrowsHelperData) {
 		return;
 	}
+
 	var data = error._avaThrowsHelperData;
 	var codeFrame = require('babel-code-frame');
 	var frame = '';
+
 	try {
 		var rawLines = fs.readFileSync(data.filename, 'utf8');
 		frame = codeFrame(rawLines, data.line, data.column, {highlightCode: true});
-	} catch (e) {
-		console.warn(e);
-		console.warn(e);
+	} catch (err) {
+		console.warn(err);
 	}
+
 	console.error(
 		[
 			'Improper usage of t.throws detected at ' + chalk.bold.yellow('%s (%d:%d)') + ':',

package/lib/watcher.js

@@ -1,20 +1,12 @@
 'use strict';
 var nodePath = require('path');
 var debug = require('debug')('ava:watcher');
-var diff = require('arr-diff');
+var diff = require('lodash.difference');
+var chokidar = require('chokidar');
 var flatten = require('arr-flatten');
 var union = require('array-union');
 var uniq = require('array-uniq');
-var AvaError = require('./ava-error');
-var AvaFiles = require('./ava-files');
-
-function requireChokidar() {
-	try {
-		return require('chokidar');
-	} catch (err) {
-		throw new AvaError('The optional dependency chokidar failed to install and is required for --watch. Chokidar is likely not supported on your platform.');
-	}
-}
+var AvaFiles = require('ava-files');
 
 function rethrowAsync(err) {
 	// Don't swallow exceptions. Note that any expected error should already have
@@ -26,9 +18,10 @@ function rethrowAsync(err) {
 
 function Watcher(logger, api, files, sources) {
 	this.debouncer = new Debouncer(this);
-	this.avaFiles = new AvaFiles(files, sources);
-
-	this.isTest = this.avaFiles.makeTestMatcher();
+	this.avaFiles = new AvaFiles({
+		files: files,
+		sources: sources
+	});
 
 	this.clearLogOnNextRun = true;
 	this.runVector = 0;
@@ -96,7 +89,7 @@ Watcher.prototype.watchFiles = function () {
 	var self = this;
 	var patterns = this.avaFiles.getChokidarPatterns();
 
-	requireChokidar().watch(patterns.paths, {
+	chokidar.watch(patterns.paths, {
 		ignored: patterns.ignored,
 		ignoreInitial: true
 	}).on('all', function (event, path) {
@@ -110,7 +103,6 @@ Watcher.prototype.watchFiles = function () {
 
 Watcher.prototype.trackTestDependencies = function (api) {
 	var self = this;
-	var isSource = this.avaFiles.makeSourceMatcher();
 
 	var relative = function (absPath) {
 		return nodePath.relative('.', absPath);
@@ -118,7 +110,7 @@ Watcher.prototype.trackTestDependencies = function (api) {
 
 	api.on('test-run', function (runStatus) {
 		runStatus.on('dependencies', function (file, dependencies) {
-			var sourceDeps = dependencies.map(relative).filter(isSource);
+			var sourceDeps = dependencies.map(relative).filter(self.avaFiles.isSource);
 			self.updateTestDependencies(file, sourceDeps);
 		});
 	});
@@ -266,7 +258,7 @@ Watcher.prototype.runAfterChanges = function () {
 	this.dirtyStates = {};
 
 	var dirtyPaths = Object.keys(dirtyStates);
-	var dirtyTests = dirtyPaths.filter(this.isTest);
+	var dirtyTests = dirtyPaths.filter(this.avaFiles.isTest);
 	var dirtySources = diff(dirtyPaths, dirtyTests);
 	var addedOrChangedTests = dirtyTests.filter(function (path) {
 		return dirtyStates[path] !== 'unlink';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ava",
-  "version": "0.15.0",
+  "version": "0.17.0",
   "description": "Futuristic test runner 🚀",
   "license": "MIT",
   "repository": "avajs/ava",
@@ -30,21 +30,30 @@
       "name": "Juan Soto",
       "email": "juan@juansoto.me",
       "url": "juansoto.me"
+    },
+    {
+      "name": "Jeroen Engels",
+      "email": "jfm.engels@gmail.com",
+      "url": "github.com/jfmengels"
     }
   ],
   "bin": "cli.js",
+  "typings": "types/generated.d.ts",
   "engines": {
     "node": ">=0.10.0"
   },
   "scripts": {
-    "test": "xo && nyc --cache --reporter=lcov --reporter=text tap --no-cov --timeout=150 test/*.js test/reporters/*.js",
+    "test": "scripts/xo.js && nyc --cache --reporter=lcov --reporter=text tap --no-cov --timeout=150 test/*.js test/reporters/*.js",
     "test-win": "tap --no-cov --reporter=classic --timeout=150 test/*.js test/reporters/*.js",
-    "visual": "node test/visual/run-visual-tests.js"
+    "visual": "node test/visual/run-visual-tests.js",
+    "prepublish": "npm run make-ts",
+    "make-ts": "babel-node --presets=babel-preset-es2015 --plugins=transform-runtime types/make.js"
   },
   "files": [
     "lib",
     "*.js",
-    "index.d.ts"
+    "*.js.flow",
+    "types/generated.d.ts"
   ],
   "keywords": [
     "test",
@@ -77,24 +86,27 @@
     "tap"
   ],
   "dependencies": {
-    "arr-diff": "^2.0.0",
     "arr-flatten": "^1.0.1",
     "array-union": "^1.0.1",
     "array-uniq": "^1.0.2",
     "arrify": "^1.0.0",
+    "auto-bind": "^0.1.0",
+    "ava-files": "^0.2.0",
     "ava-init": "^0.1.0",
-    "babel-code-frame": "^6.7.5",
-    "babel-core": "^6.3.21",
-    "babel-plugin-ava-throws-helper": "0.0.4",
-    "babel-plugin-detective": "^1.0.2",
-    "babel-plugin-espower": "^2.1.0",
-    "babel-plugin-transform-runtime": "^6.3.13",
-    "babel-preset-es2015": "^6.3.13",
-    "babel-preset-stage-2": "^6.3.13",
-    "babel-runtime": "^6.3.19",
+    "babel-code-frame": "^6.16.0",
+    "babel-core": "^6.17.0",
+    "babel-plugin-ava-throws-helper": "^0.1.0",
+    "babel-plugin-detective": "^2.0.0",
+    "babel-plugin-espower": "^2.3.1",
+    "babel-plugin-transform-runtime": "^6.15.0",
+    "babel-preset-es2015": "^6.16.0",
+    "babel-preset-es2015-node4": "^2.1.0",
+    "babel-preset-stage-2": "^6.17.0",
+    "babel-runtime": "^6.11.6",
     "bluebird": "^3.0.0",
     "caching-transform": "^1.0.0",
     "chalk": "^1.0.0",
+    "chokidar": "^1.4.2",
     "clean-yaml-object": "^0.1.0",
     "cli-cursor": "^1.0.2",
     "cli-spinners": "^0.1.2",
@@ -103,12 +115,13 @@
     "common-path-prefix": "^1.0.0",
     "convert-source-map": "^1.2.0",
     "core-assert": "^0.2.0",
+    "currently-unhandled": "^0.4.1",
     "debug": "^2.2.0",
-    "empower-core": "^0.5.0",
+    "empower-core": "^0.6.1",
     "figures": "^1.4.0",
     "find-cache-dir": "^0.1.1",
     "fn-name": "^2.0.0",
-    "globby": "^4.0.0",
+    "get-port": "^2.1.0",
     "has-flag": "^2.0.0",
     "ignore-by-default": "^1.0.0",
     "is-ci": "^1.0.7",
@@ -118,37 +131,40 @@
     "is-promise": "^2.1.0",
     "last-line-stream": "^1.0.0",
     "lodash.debounce": "^4.0.3",
+    "lodash.difference": "^4.3.0",
+    "lodash.isequal": "^4.4.0",
     "loud-rejection": "^1.2.0",
     "matcher": "^0.1.1",
     "max-timeout": "^1.0.0",
     "md5-hex": "^1.2.0",
     "meow": "^3.7.0",
     "ms": "^0.7.1",
-    "multimatch": "^2.1.0",
-    "not-so-shallow": "^0.1.3",
     "object-assign": "^4.0.1",
     "observable-to-promise": "^0.4.0",
     "option-chain": "^0.1.0",
     "package-hash": "^1.1.0",
     "pkg-conf": "^1.0.1",
     "plur": "^2.0.0",
-    "power-assert-formatter": "^1.3.0",
-    "power-assert-renderers": "^0.1.0",
+    "power-assert-context-formatter": "^1.0.4",
+    "power-assert-renderer-assertion": "^1.0.1",
+    "power-assert-renderer-succinct": "^1.0.1",
     "pretty-ms": "^2.0.0",
     "repeating": "^2.0.0",
     "require-precompiled": "^0.1.0",
     "resolve-cwd": "^1.0.0",
+    "semver": "^5.3.0",
     "set-immediate-shim": "^1.0.1",
-    "slash": "^1.0.0",
     "source-map-support": "^0.4.0",
     "stack-utils": "^0.4.0",
     "strip-ansi": "^3.0.1",
     "strip-bom": "^2.0.0",
     "time-require": "^0.1.2",
     "unique-temp-dir": "^1.0.0",
-    "update-notifier": "^0.7.0"
+    "update-notifier": "^1.0.0"
   },
   "devDependencies": {
+    "babel-cli": "^6.10.1",
+    "babel-preset-react": "^6.5.0",
     "cli-table2": "^0.2.0",
     "coveralls": "^2.11.4",
     "delay": "^1.3.0",
@@ -159,19 +175,22 @@
     "inquirer": "^1.0.2",
     "lolex": "^1.4.0",
     "mkdirp": "^0.5.1",
-    "nyc": "^6.0.0",
+    "nyc": "^9.0.1",
     "pify": "^2.3.0",
     "proxyquire": "^1.7.4",
     "rimraf": "^2.5.0",
-    "signal-exit": "^2.1.2",
+    "signal-exit": "^3.0.0",
     "sinon": "^1.17.2",
     "source-map-fixtures": "^2.1.0",
-    "tap": "^5.4.2",
+    "tap": "^8.0.0",
     "touch": "^1.0.0",
-    "xo": "*",
-    "zen-observable": "^0.2.1"
+    "xo": "^0.17.0",
+    "zen-observable": "^0.3.0"
   },
-  "optionalDependencies": {
-    "chokidar": "^1.4.2"
+  "xo": {
+    "rules": {
+      "import/newline-after-import": "off",
+      "no-use-extend-native/no-use-extend-native": "off"
+    }
   }
 }

package/profile.js

@@ -9,7 +9,6 @@ var EventEmitter = require('events').EventEmitter;
 var meow = require('meow');
 var Promise = require('bluebird');
 var pkgConf = require('pkg-conf');
-var arrify = require('arrify');
 var findCacheDir = require('find-cache-dir');
 var uniqueTempDir = require('unique-temp-dir');
 var CachingPrecompiler = require('./lib/caching-precompiler');
@@ -35,12 +34,10 @@ var cli = meow([
 	'Options',
 	'  --fail-fast    Stop after first test failure',
 	'  --serial, -s   Run tests serially',
-	'  --require, -r  Module to preload (Can be repeated)',
 	''
 ], {
 	string: [
-		'_',
-		'require'
+		'_'
 	],
 	boolean: [
 		'fail-fast',
@@ -50,7 +47,6 @@ var cli = meow([
 	],
 	default: conf,
 	alias: {
-		r: 'require',
 		s: 'serial'
 	}
 });
@@ -60,15 +56,23 @@ if (cli.input.length !== 1) {
 }
 
 var file = path.resolve(cli.input[0]);
-var cacheDir = findCacheDir({name: 'ava', files: [file]}) || uniqueTempDir();
+var cacheDir = findCacheDir({
+	name: 'ava',
+	files: [file]
+}) || uniqueTempDir();
+
+var precompiler = new CachingPrecompiler({
+	path: cacheDir,
+	babel: conf.babel
+});
+
 var precompiled = {};
-precompiled[file] = new CachingPrecompiler(cacheDir, conf.babel).precompileFile(file);
+precompiled[file] = precompiler.precompileFile(file);
 
 var opts = {
 	file: file,
 	failFast: cli.flags.failFast,
 	serial: cli.flags.serial,
-	require: arrify(cli.flags.require),
 	tty: false,
 	cacheDir: cacheDir,
 	precompiled: precompiled
@@ -102,12 +106,13 @@ events.on('results', function (data) {
 	if (console.profileEnd) {
 		console.profileEnd();
 	}
+
 	console.log('RESULTS:', data.stats);
 
 	if (process.exit) {
 		// Delay is For Node 0.10 which emits uncaughtExceptions async.
 		setTimeout(function () {
-			process.exit(data.stats.failCount + uncaughtExceptionCount); // eslint-disable-line
+			process.exit(data.stats.failCount + uncaughtExceptionCount); // eslint-disable-line unicorn/no-process-exit
 		}, 20);
 	}
 });
@@ -134,5 +139,5 @@ if (console.profile) {
 }
 
 setImmediate(function () {
-	require('./lib/test-worker');
+	require('./lib/test-worker'); // eslint-disable-line import/no-unassigned-import
 });