Ensure the watcher supports custom extensions

Fixes #1881.

Author: novemberborn

lib/cli.js

@@ -188,6 +188,7 @@ exports.run = () => { // eslint-disable-line complexity
 	}
 
 	const match = arrify(conf.match);
+	const resolveTestsFrom = cli.input.length === 0 ? projectDir : process.cwd();
 	const api = new Api({
 		failFast: conf.failFast,
 		failWithoutAssertions: conf.failWithoutAssertions !== false,
@@ -198,7 +199,7 @@ exports.run = () => { // eslint-disable-line complexity
 		extensions,
 		match,
 		babelConfig,
-		resolveTestsFrom: cli.input.length === 0 ? projectDir : process.cwd(),
+		resolveTestsFrom,
 		projectDir,
 		timeout: conf.timeout,
 		concurrency: conf.concurrency ? parseInt(conf.concurrency, 10) : 0,
@@ -234,7 +235,14 @@ exports.run = () => { // eslint-disable-line complexity
 	const files = cli.input.length > 0 ? cli.input : arrify(conf.files);
 
 	if (conf.watch) {
-		const watcher = new Watcher(reporter, api, files, arrify(conf.sources));
+		const watcher = new Watcher({
+			api,
+			reporter,
+			extensions: extensions.all,
+			files,
+			sources: arrify(conf.sources),
+			resolveTestsFrom
+		});
 		watcher.observeStdin(process.stdin);
 	} else {
 		api.run(files).then(runStatus => {

lib/watcher.js

@@ -78,9 +78,11 @@ class TestDependency {
 }
 
 class Watcher {
-	constructor(reporter, api, files, sources) {
+	constructor({reporter, api, extensions, files, sources, resolveTestsFrom}) {
 		this.debouncer = new Debouncer(this);
 		this.avaFiles = new AvaFiles({
+			cwd: resolveTestsFrom,
+			extensions,
 			files,
 			sources
 		});

test/fixture/watcher/custom-extensions/package.json

@@ -0,0 +1,9 @@
+{
+	"ava": {
+		"babel": {
+			"extensions": [
+				"foo"
+			]
+		}
+	}
+}

test/fixture/watcher/custom-extensions/test.foo

@@ -0,0 +1,5 @@
+import test from '../../../..';
+
+test('works', t => {
+	t.pass();
+});

test/integration/watcher.js

@@ -30,6 +30,32 @@ test('watcher reruns test files when they changed', t => {
 	});
 });
 
+test('watcher respects custom test file extensions', t => {
+	let killed = false;
+
+	const child = execCli(['--verbose', '--watch'], {dirname: 'fixture/watcher/custom-extensions', env: {CI: ''}}, err => {
+		t.ok(killed);
+		t.ifError(err);
+		t.end();
+	});
+
+	let buffer = '';
+	let passedFirst = false;
+	child.stdout.on('data', str => {
+		buffer += str;
+		if (/1 test passed/.test(buffer)) {
+			if (!passedFirst) {
+				touch.sync(path.join(__dirname, '../fixture/watcher/custom-extensions/test.foo'));
+				buffer = '';
+				passedFirst = true;
+			} else if (!killed) {
+				child.kill();
+				killed = true;
+			}
+		}
+	});
+});
+
 test('watcher reruns test files when source dependencies change', t => {
 	let killed = false;
 

test/watcher.js

@@ -147,7 +147,7 @@ group('chokidar', (beforeEach, test, group) => {
 		Subject = proxyWatcher();
 	});
 
-	const start = (specificFiles, sources) => new Subject(reporter, api, specificFiles || files, sources || []);
+	const start = (specificFiles, sources) => new Subject({reporter, api, files: specificFiles || files, sources: sources || []});
 
 	const emitChokidar = (event, path) => {
 		chokidarEmitter.emit('all', event, path);