Properly resolve test files in non-watch mode.

Author: jamestalmage

api.js

@@ -25,6 +25,7 @@ function Api(options) {
 
 	this.options = objectAssign({}, options);
 	this.options.cwd = this.options.cwd || process.cwd();
+	this.options.resolveTestsFrom = this.options.resolveTestsFrom || this.options.cwd;
 	this.options.match = this.options.match || [];
 	this.options.require = (this.options.require || []).map(function (moduleId) {
 		var ret = resolveCwd(moduleId);
@@ -74,7 +75,7 @@ Api.prototype._onTimeout = function (runStatus) {
 Api.prototype.run = function (files, options) {
 	var self = this;
 
-	return new AvaFiles({files: files})
+	return new AvaFiles({files: files, cwd: this.options.resolveTestsFrom})
 		.findTestFiles()
 		.then(function (files) {
 			return self._run(files, options);

cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 
+var path = require('path');
 var debug = require('debug')('ava');
 
 // Prefer the local installation of AVA.
@@ -43,6 +44,8 @@ var conf = pkgConf.sync('ava', {
 	}
 });
 
+var pkgDir = path.dirname(pkgConf.filepath(conf));
+
 // check for valid babel config shortcuts (can be either "default" or "inherit")
 var isValidShortcut = ['default', 'inherit'].indexOf(conf.babel) !== -1;
 
@@ -136,6 +139,7 @@ var api = new Api({
 	explicitTitles: cli.flags.watch,
 	match: arrify(cli.flags.match),
 	babelConfig: conf.babel,
+	resolveTestsFrom: cli.input.length === 0 ? pkgDir : process.cwd(),
 	timeout: cli.flags.timeout,
 	concurrency: cli.flags.concurrency ? parseInt(cli.flags.concurrency, 10) : 0
 });

test/cli.js

@@ -176,6 +176,39 @@ test('pkg-conf: cli takes precedence', function (t) {
 	});
 });
 
+test('pkg-conf(resolve-dir): works as expected when run from the package.json directory', function (t) {
+	execCli(['--verbose'], {dirname: 'fixture/pkg-conf/resolve-dir'}, function (err, stdout, stderr) {
+		t.ifError(err);
+		t.match(stderr, /dir-a-base-1/);
+		t.match(stderr, /dir-a-base-2/);
+		t.notMatch(stderr, /dir-a-wrapper/);
+		t.notMatch(stdout, /dir-a-wrapper/);
+		t.end();
+	});
+});
+
+test('pkg-conf(resolve-dir): resolves tests from the package.json dir if none are specified on cli', function (t) {
+	execCli(['--verbose'], {dirname: 'fixture/pkg-conf/resolve-dir/dir-a-wrapper'}, function (err, stdout, stderr) {
+		t.ifError(err);
+		t.match(stderr, /dir-a-base-1/);
+		t.match(stderr, /dir-a-base-2/);
+		t.notMatch(stderr, /dir-a-wrapper/);
+		t.notMatch(stdout, /dir-a-wrapper/);
+		t.end();
+	});
+});
+
+test('pkg-conf(resolve-dir): resolves tests process.cwd() if globs are passed on the command line', function (t) {
+	execCli(['--verbose', 'dir-a/*.js'], {dirname: 'fixture/pkg-conf/resolve-dir/dir-a-wrapper'}, function (err, stdout, stderr) {
+		t.ifError(err);
+		t.match(stderr, /dir-a-wrapper-3/);
+		t.match(stderr, /dir-a-wrapper-4/);
+		t.notMatch(stderr, /dir-a-base/);
+		t.notMatch(stdout, /dir-a-base/);
+		t.end();
+	});
+});
+
 test('watcher reruns test files when they changed', function (t) {
 	var killed = false;
 

test/fixture/pkg-conf/resolve-dir/dir-a-wrapper/dir-a/dir-a-wrapper-3.js

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

test/fixture/pkg-conf/resolve-dir/dir-a-wrapper/dir-a/dir-a-wrapper-4.js

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

test/fixture/pkg-conf/resolve-dir/dir-a/dir-a-base-1.js

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

test/fixture/pkg-conf/resolve-dir/dir-a/dir-a-base-2.js

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

test/fixture/pkg-conf/resolve-dir/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "application-name",
+  "version": "0.0.1",
+  "ava": {
+    "files": "dir-a/*.js"
+  }
+}