Change the current working directory of tests to be the same directory as package.json

cli.js

@@ -57,18 +57,18 @@ var cli = meow([
 	'  ava [<file|directory|glob> ...]',
 	'',
 	'Options',
-	'  --init             Add AVA to your project',
-	'  --fail-fast        Stop after first test failure',
-	'  --serial, -s       Run tests serially',
-	'  --tap, -t          Generate TAP output',
-	'  --verbose, -v      Enable verbose output',
-	'  --no-cache         Disable the transpiler cache',
-	'  --no-power-assert  Disable Power Assert',
-	'  --match, -m        Only run tests with matching title (Can be repeated)',
-	'  --watch, -w        Re-run tests when tests and source files change',
-	'  --source, -S       Pattern to match source files so tests can be re-run (Can be repeated)',
-	'  --timeout, -T      Set global timeout',
-	'  --concurrency, -c  Maximum number of test files running at the same time (EXPERIMENTAL)',
+	'  --init				Add AVA to your project',
+	'  --fail-fast				Stop after first test failure',
+	'  --serial, -s			Run tests serially',
+	'  --tap, -t				Generate TAP output',
+	'  --verbose, -v			Enable verbose output',
+	'  --no-cache				Disable the transpiler cache',
+	'  --no-power-assert			Disable Power Assert',
+	'  --match, -m				Only run tests with matching title (Can be repeated)',
+	'  --watch, -w				Re-run tests when tests and source files change',
+	'  --source, -S			Pattern to match source files so tests can be re-run (Can be repeated)',
+	'  --timeout, -T			Set global timeout',
+	'  --concurrency, -c			Maximum number of test files running at the same time (EXPERIMENTAL)',
 	'',
 	'Examples',
 	'  ava',
@@ -138,6 +138,7 @@ var api = new Api({
 	match: arrify(cli.flags.match),
 	babelConfig: conf.babel,
 	resolveTestsFrom: cli.input.length === 0 ? pkgDir : process.cwd(),
+	pkgDir: pkgDir,
 	timeout: cli.flags.timeout,
 	concurrency: cli.flags.concurrency ? parseInt(cli.flags.concurrency, 10) : 0
 });

lib/fork.js

@@ -41,7 +41,7 @@ module.exports = function (file, opts, execArgv) {
 	}, opts);
 
 	var ps = childProcess.fork(path.join(__dirname, 'test-worker.js'), [JSON.stringify(opts)], {
-		cwd: path.dirname(file),
+		cwd: opts.pkgDir,
 		silent: true,
 		env: env,
 		execArgv: execArgv || process.execArgv

readme.md

@@ -247,7 +247,7 @@ If you're unable to use promises or observables, you may enable "callback mode"
 
 You must define all tests synchronously. They can't be defined inside `setTimeout`, `setImmediate`, etc.
 
-Test files are run from their current directory, so [`process.cwd()`](https://nodejs.org/api/process.html#process_process_cwd) is always the same as [`__dirname`](https://nodejs.org/api/globals.html#globals_dirname). You can just use relative paths instead of doing `path.join(__dirname, 'relative/path')`.
+AVA tries to run test files with their current working directory set to the directory that contains your `package.json` file.
 
 ### Creating tests
 

test/api.js

@@ -4,9 +4,13 @@ var fs = require('fs');
 var figures = require('figures');
 var rimraf = require('rimraf');
 var test = require('tap').test;
+var pkgConf = require('pkg-conf');
 var Api = require('../api');
 var testCapitalizerPlugin = require('./fixture/babel-plugin-test-capitalizer');
 
+var conf = pkgConf.sync('ava');
+var pkgDir = path.dirname(pkgConf.filepath(conf));
+
 test('must be called with new', function (t) {
 	t.throws(function () {
 		var api = Api;
@@ -18,6 +22,7 @@ test('must be called with new', function (t) {
 generateTests('Without Pool: ', function (options) {
 	options = options || {};
 	options.powerAssert = true;
+	options.pkgDir = options.pkgDir || pkgDir;
 	return new Api(options);
 });
 
@@ -63,6 +68,7 @@ generateTests('With Pool: ', function (options) {
 	options = options || {};
 	options.concurrency = 2;
 	options.powerAssert = true;
+	options.pkgDir = options.pkgDir || pkgDir;
 	return new Api(options);
 });
 
@@ -307,12 +313,23 @@ function generateTests(prefix, apiCreator) {
 			});
 	});
 
-	test(prefix + 'change process.cwd() to a test\'s directory', function (t) {
+	test(prefix + 'run from package.json folder by default', function (t) {
 		t.plan(1);
-
 		var api = apiCreator();
 
-		return api.run([path.join(__dirname, 'fixture/process-cwd.js')])
+		return api.run([path.join(__dirname, 'fixture/process-cwd-default.js')])
+			.then(function (result) {
+				t.is(result.passCount, 1);
+			});
+	});
+
+	test(prefix + 'change process.cwd() to a test\'s directory with pkgDir', function (t) {
+		t.plan(1);
+
+		var fullPath = path.join(__dirname, 'fixture/process-cwd-pkgDir.js');
+
+		var api = apiCreator({pkgDir: path.dirname(fullPath)});
+		return api.run([fullPath])
 			.then(function (result) {
 				t.is(result.passCount, 1);
 			});

test/fixture/process-cwd-default.js

@@ -0,0 +1,9 @@
+import test from '../../';
+import pkgConf from 'pkg-conf'
+import path from 'path'
+
+test(t => {
+	var conf = pkgConf.sync('ava')
+	var pkgDir = path.dirname(pkgConf.filepath(conf))
+	t.is(process.cwd(), pkgDir)
+});