precompile helpers and fixtures

Author: vdemedes

api.js

@@ -66,7 +66,7 @@ module.exports = Api;
 
 Api.prototype._runFile = function (file, runStatus, execArgv) {
 	var hash = this.precompiler.precompileFile(file);
-	var precompiled = {};
+	var precompiled = objectAssign({}, this._precompiledHelpers);
 	precompiled[file] = hash;
 
 	var options = objectAssign({}, this.options, {
@@ -137,7 +137,22 @@ Api.prototype._setupPrecompiler = function (files) {
 	});
 };
 
+Api.prototype._precompileHelpers = function () {
+	var self = this;
+
+	this._precompiledHelpers = {};
+
+	return new AvaFiles({cwd: this.options.resolveTestsFrom})
+		.findTestHelpers()
+		.map(function (file) { // eslint-disable-line array-callback-return
+			var hash = self.precompiler.precompileFile(file);
+			self._precompiledHelpers[file] = hash;
+		});
+};
+
 Api.prototype._run = function (files, options) {
+	var self = this;
+
 	options = options || {};
 
 	var runStatus = new RunStatus({
@@ -157,20 +172,23 @@ Api.prototype._run = function (files, options) {
 
 	this._setupPrecompiler(files);
 
-	if (this.options.timeout) {
-		this._setupTimeout(runStatus);
-	}
+	return this._precompileHelpers()
+		.then(function () {
+			if (self.options.timeout) {
+				self._setupTimeout(runStatus);
+			}
 
-	var overwatch;
-	if (this.options.concurrency > 0) {
-		var concurrency = this.options.serial ? 1 : this.options.concurrency;
-		overwatch = this._runWithPool(files, runStatus, concurrency);
-	} else {
-		// _runWithoutPool exists to preserve legacy behavior, specifically around `.only`
-		overwatch = this._runWithoutPool(files, runStatus);
-	}
+			var overwatch;
+			if (self.options.concurrency > 0) {
+				var concurrency = self.options.serial ? 1 : self.options.concurrency;
+				overwatch = self._runWithPool(files, runStatus, concurrency);
+			} else {
+				// _runWithoutPool exists to preserve legacy behavior, specifically around `.only`
+				overwatch = self._runWithoutPool(files, runStatus);
+			}
 
-	return overwatch;
+			return overwatch;
+		});
 };
 
 Api.prototype._computeForkExecArgs = function (files) {

test/api.js

@@ -76,6 +76,17 @@ function generateTests(prefix, apiCreator) {
 			});
 	});
 
+	test(prefix + 'precompile helpers', function (t) {
+		t.plan(1);
+
+		var api = apiCreator();
+
+		return api.run([path.join(__dirname, 'fixture/precompile-helpers/test/test.js')])
+			.then(function (result) {
+				t.is(result.passCount, 1);
+			});
+	});
+
 	test(prefix + 'generators support', function (t) {
 		t.plan(1);
 
@@ -697,7 +708,10 @@ function generateTests(prefix, apiCreator) {
 	test(prefix + 'caching is enabled by default', function (t) {
 		t.plan(3);
 		rimraf.sync(path.join(__dirname, 'fixture/caching/node_modules'));
-		var api = apiCreator();
+
+		var api = apiCreator({
+			resolveTestsFrom: path.join(__dirname, 'fixture/caching')
+		});
 
 		return api.run([path.join(__dirname, 'fixture/caching/test.js')])
 			.then(function () {
@@ -720,7 +734,11 @@ function generateTests(prefix, apiCreator) {
 	test(prefix + 'caching can be disabled', function (t) {
 		t.plan(1);
 		rimraf.sync(path.join(__dirname, 'fixture/caching/node_modules'));
-		var api = apiCreator({cacheEnabled: false});
+
+		var api = apiCreator({
+			resolveTestsFrom: path.join(__dirname, 'fixture/caching'),
+			cacheEnabled: false
+		});
 
 		return api.run([path.join(__dirname, 'fixture/caching/test.js')])
 			.then(function () {

test/fixture/precompile-helpers/test/_b.js

@@ -0,0 +1 @@
+export default async function () {}

test/fixture/precompile-helpers/test/helpers/a.js

@@ -0,0 +1 @@
+export default async function () {}

test/fixture/precompile-helpers/test/test.js

@@ -0,0 +1,10 @@
+import test from '../../../../';
+import a from './helpers/a';
+import b from './_b';
+
+test(async t => {
+	await a();
+	await b();
+
+	t.pass();
+});