Assume test files import the correct AVA installation

These workarounds are too tricky to support with ESM entrypoints.

Author: novemberborn

index.js

@@ -1,8 +1,2 @@
 'use strict';
-
-// Ensure the same AVA install is loaded by the test file as by the test worker
-if (process.env.AVA_PATH && process.env.AVA_PATH !== __dirname) {
-	module.exports = require(process.env.AVA_PATH);
-} else {
-	module.exports = require('./lib/worker/main');
-}
+module.exports = require('./lib/worker/main');

lib/fork.js

@@ -1,7 +1,6 @@
 'use strict';
 const {Worker} = require('worker_threads');
 const childProcess = require('child_process');
-const path = require('path');
 const fs = require('fs');
 const Emittery = require('emittery');
 const {controlFlow} = require('./ipc-flow-control');
@@ -10,9 +9,6 @@ if (fs.realpathSync(__filename) !== __filename) {
 	console.warn('WARNING: `npm link ava` and the `--preserve-symlink` flag are incompatible. We have detected that AVA is linked via `npm link`, and that you are using either an early version of Node 6, or the `--preserve-symlink` flag. This breaks AVA. You should upgrade to Node 6.2.0+, avoid the `--preserve-symlink` flag, or avoid using `npm link ava`.');
 }
 
-// In case the test file imports a different AVA install,
-// the presence of this variable allows it to require this one instead
-const AVA_PATH = path.resolve(__dirname, '..');
 const WORKER_PATH = require.resolve('./worker/base.js');
 
 class SharedWorkerChannel extends Emittery {
@@ -67,7 +63,7 @@ const createWorker = (options, execArgv) => {
 	if (options.workerThreads) {
 		worker = new Worker(WORKER_PATH, {
 			argv: options.workerArgv,
-			env: {NODE_ENV: 'test', ...process.env, ...options.environmentVariables, AVA_PATH},
+			env: {NODE_ENV: 'test', ...process.env, ...options.environmentVariables},
 			execArgv,
 			workerData: {
 				options
@@ -89,7 +85,7 @@ const createWorker = (options, execArgv) => {
 		worker = childProcess.fork(WORKER_PATH, options.workerArgv, {
 			cwd: options.projectDir,
 			silent: true,
-			env: {NODE_ENV: 'test', ...process.env, ...options.environmentVariables, AVA_PATH},
+			env: {NODE_ENV: 'test', ...process.env, ...options.environmentVariables},
 			execArgv
 		});
 		postMessage = controlFlow(worker);

plugin.js

@@ -1,9 +1,2 @@
 'use strict';
-const path = require('path');
-
-// Ensure the same AVA install is loaded by the test file as by the test worker
-if (process.env.AVA_PATH && process.env.AVA_PATH !== __dirname) {
-	module.exports = require(path.join(process.env.AVA_PATH, 'plugin'));
-} else {
-	module.exports = require('./lib/worker/plugin');
-}
+module.exports = require('./lib/worker/plugin');

test-tap/integration/assorted.js

@@ -66,24 +66,6 @@ test('should warn ava is required without the cli', t => {
 	});
 });
 
-test('workers ensure test files load the same version of ava', t => {
-	const target = path.join(__dirname, '..', 'fixture', 'ava-paths', 'target');
-
-	// Copy the index.js so the testFile imports it. It should then load the correct AVA install.
-	const targetInstall = path.join(target, 'node_modules/ava');
-	fs.mkdirSync(targetInstall, {recursive: true});
-	fs.writeFileSync(
-		path.join(targetInstall, 'index.js'),
-		fs.readFileSync(path.join(__dirname, '../../index.js'))
-	);
-
-	const testFile = path.join(target, 'test.js');
-	execCli([testFile], {dirname: path.join('fixture', 'ava-paths', 'cwd')}, err => {
-		t.ifError(err);
-		t.end();
-	});
-});
-
 test('tests without assertions do not fail if failWithoutAssertions option is set to false', t => {
 	execCli([], {dirname: 'fixture/pkg-conf/fail-without-assertions'}, err => {
 		t.ifError(err);

test/helpers/exec.js

@@ -44,7 +44,8 @@ exports.fixture = async (args, options = {}) => {
 	const cwd = options.cwd || exports.cwd();
 	const running = execa.node(cliPath, args, defaultsDeep({
 		env: {
-			AVA_EMIT_RUN_STATUS_OVER_IPC: 'I\'ll find a payphone baby / Take some time to talk to you'
+			AVA_EMIT_RUN_STATUS_OVER_IPC: 'I\'ll find a payphone baby / Take some time to talk to you',
+			TEST_AVA_IMPORT_FROM: process.cwd()
 		},
 		cwd,
 		serialization: 'advanced',

test/snapshot-removal/fixtures/fixed-snapshot-dir/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 if (process.env.TEMPLATE) {
 	test('some snapshots', t => {

test/snapshot-removal/fixtures/no-snapshots/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('without snapshots', t => {
 	t.pass();

test/snapshot-removal/fixtures/only-test/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 if (process.env.TEMPLATE) {
 	test('some snapshots', t => {

test/snapshot-removal/fixtures/removal/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 if (process.env.TEMPLATE) {
 	test('some snapshots', t => {

test/snapshot-removal/fixtures/skipped-snapshots-in-try/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 if (process.env.TEMPLATE) {
 	test('skipped snapshots in try', async t => {

test/snapshot-removal/fixtures/skipped-snapshots/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 if (process.env.TEMPLATE) {
 	test('some snapshots', t => {

test/snapshot-removal/fixtures/skipped-tests/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 if (process.env.TEMPLATE) {
 	test('some snapshots', t => {

test/snapshot-removal/fixtures/snapshot-dir/test/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 if (process.env.TEMPLATE) {
 	test('some snapshots', t => {

test/snapshot-removal/fixtures/try/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 if (process.env.TEMPLATE) {
 	test('snapshots in try', async t => {

test/snapshot-workflow/fixtures/adding-skipped-snapshots/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('foo', t => {
 	t.snapshot({foo: 'one'});

test/snapshot-workflow/fixtures/adding-snapshots/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('foo', t => {
 	t.snapshot({foo: 'one'});

test/snapshot-workflow/fixtures/adding-test/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('foo', t => {
 	t.snapshot({foo: 'one'});

test/snapshot-workflow/fixtures/changing-label/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('foo', t => {
 	t.snapshot({foo: 'one'}, process.env.TEMPLATE ? undefined : 'a new message');

test/snapshot-workflow/fixtures/changing-title/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test(`a ${process.env.TEMPLATE ? '' : 'new '}title`, t => {
 	t.snapshot({foo: 'one'});

test/snapshot-workflow/fixtures/commit-skip/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('commit a skipped snapshot', async t => {
 	t.snapshot(1);

test/snapshot-workflow/fixtures/discard-skip/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('discard a skipped snapshot', async t => {
 	t.snapshot(1);

test/snapshot-workflow/fixtures/filling-in-blanks/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('foo', t => {
 	t.snapshot({foo: 'one'});

test/snapshot-workflow/fixtures/first-run/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('foo', t => {
 	t.snapshot({foo: 'one'});

test/snapshot-workflow/fixtures/invalid-snapfile/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('foo', t => {
 	t.snapshot.skip({foo: 'one'});

test/snapshot-workflow/fixtures/removing-all-snapshots/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('foo', t => {
 	if (process.env.TEMPLATE) {

test/snapshot-workflow/fixtures/removing-snapshots/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('foo', t => {
 	t.snapshot({foo: 'one'});

test/snapshot-workflow/fixtures/removing-test/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('foo', t => {
 	t.snapshot({foo: 'one'});

test/snapshot-workflow/fixtures/reorder/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 if (process.env.TEMPLATE) {
 	test('first test', t => {

test/snapshot-workflow/fixtures/select-test-update/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('foo', t => {
 	t.snapshot(process.env.TEMPLATE ? {foo: 'one'} : {foo: 'new'});

test/snapshot-workflow/fixtures/skipping-snapshot-update/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('foo', t => {
 	if (process.env.TEMPLATE) {

test/snapshot-workflow/fixtures/skipping-snapshot/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 test('foo', t => {
 	(process.env.TEMPLATE ? t.snapshot : t.snapshot.skip)({foo: 'one'});

test/snapshot-workflow/fixtures/skipping-test-update/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 (process.env.TEMPLATE ? test : test.skip)('foo', t => {
 	t.snapshot(process.env.TEMPLATE ? {foo: 'one'} : ['something new']);

test/snapshot-workflow/fixtures/skipping-test/test.js

@@ -1,4 +1,4 @@
-const test = require(process.env.AVA_PATH); // This fixture is copied to a temporary directory, so require AVA through its configured path.
+const test = require(process.env.TEST_AVA_IMPORT_FROM); // This fixture is copied to a temporary directory, so require AVA through its configured path.
 
 (process.env.TEMPLATE ? test : test.skip)('foo', t => {
 	t.snapshot({foo: 'one'});