Various minor cleanup

test/cli.js

@@ -141,7 +141,7 @@ test('babel require hook only applies to the test file', t => {
 test('throwing a anonymous function will report the function to the console', t => {
 	execCli('fixture/throw-anonymous-function.js', (err, stdout, stderr) => {
 		t.ok(err);
-		t.match(stderr, /function \(\) \{\}/);
+		t.match(stderr, /\(\) => \{\}/);
 		// TODO(jamestalmage)
 		// t.ok(/1 uncaught exception[^s]/.test(stdout));
 		t.end();

test/fixture/_generate_source-map-initial.js

@@ -1,22 +1,23 @@
 'use strict';
+const fs = require('fs');
+const path = require('path');
+const babel = require('babel-core');
 
-var babel = require('babel-core');
-var fs = require('fs');
-var path = require('path');
+const transformed = babel.transform(`
+import {mapFile} from 'source-map-fixtures';
+import test from '../../';
 
-var transformed = babel.transform([
-	"import { mapFile } from 'source-map-fixtures'",
-	"import test from '../../'",
-	"const fixture = mapFile('throws').require()",
-	// The uncaught exception is passed to the corresponding cli test. The line
-	// numbers from the 'throws' fixture (which uses a map file), as well as the
-	// line of the fixture.run() call, should match the source lines from this
-	// string.
-	"test('throw an uncaught exception', t => {",
-	"  setImmediate(run)",
-	"})",
-	"const run = () => fixture.run()"
-].join('\n'), {
+const fixture = mapFile('throws').require();
+
+// The uncaught exception is passed to the corresponding cli test. The line
+// numbers from the 'throws' fixture (which uses a map file), as well as the
+// line of the fixture.run() call, should match the source lines from this
+// string.
+test('throw an uncaught exception', t => {
+	setImmediate(run);
+})
+const run = () => fixture.run();
+`, {
 	filename: 'source-map-initial-input.js',
 	sourceMaps: true
 });
@@ -27,4 +28,5 @@ fs.writeFileSync(
 fs.writeFileSync(
 	path.join(__dirname, 'source-map-initial.js.map'),
 	JSON.stringify(transformed.map));
+
 console.log('Generated source-map-initial.js');

test/fixture/async-await.js

@@ -2,16 +2,12 @@ import test from '../../';
 
 test('async function', async function (t) {
 	t.plan(1);
-
 	const value = await Promise.resolve(1);
-
 	t.is(value, 1);
 });
 
 test('arrow async function', async t => {
 	t.plan(1);
-
 	const value = await Promise.resolve(1);
-
 	t.is(value, 1);
 });

test/fixture/ava-paths/target/test.js

@@ -1,5 +1,6 @@
-/* eslint-disable import/no-extraneous-dependencies */
-/* eslint-disable import/no-unresolved */
+/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved */
 import test from 'ava';
 
-test(t => t.pass());
+test(t => {
+	t.pass();
+});

test/fixture/babel-plugin-foo-to-bar.js

@@ -1,19 +1,22 @@
-module.exports = function (babel) {
-	var t = babel.types;
+'use strict';
+
+function isRequire(path) {
+	return path.isCallExpression() && path.get('callee').isIdentifier() && (path.get('callee').node.name === 'require');
+}
+
+module.exports = babel => {
+	const t = babel.types;
 
 	return {
 		visitor: {
-			CallExpression: function (path) {
+			CallExpression: path => {
 				// skip require calls
 				var firstArg = path.get('arguments')[0];
+
 				if (!isRequire(path) && firstArg && firstArg.isStringLiteral() && /foo/i.test(firstArg.node.value)) {
 					firstArg.replaceWith(t.stringLiteral(firstArg.node.value.replace('foo', 'bar').replace('FOO', 'BAR')));
 				}
 			}
 		}
 	};
 };
-
-function isRequire(path) {
-	return path.isCallExpression() && path.get('callee').isIdentifier() && (path.get('callee').node.name === 'require');
-}

test/fixture/babel-plugin-test-capitalizer.js

@@ -1,19 +1,22 @@
-module.exports = function (babel) {
-	var t = babel.types;
+'use strict';
+
+function isRequire(path) {
+	return path.isCallExpression() && path.get('callee').isIdentifier() && (path.get('callee').node.name === 'require');
+}
+
+module.exports = babel => {
+	const t = babel.types;
 
 	return {
 		visitor: {
-			CallExpression: function (path) {
+			CallExpression: path => {
 				// skip require calls
-				var firstArg = path.get('arguments')[0];
+				const firstArg = path.get('arguments')[0];
+
 				if (!isRequire(path) && firstArg && firstArg.isStringLiteral() && !/repeated test/.test(firstArg.node.value)) {
 					firstArg.replaceWith(t.stringLiteral(firstArg.node.value.toUpperCase()));
 				}
 			}
 		}
 	};
 };
-
-function isRequire(path) {
-	return path.isCallExpression() && path.get('callee').isIdentifier() && (path.get('callee').node.name === 'require');
-}

test/fixture/babel-plugin-test-doubler.js

@@ -1,3 +1,4 @@
+'use strict';
 /*
  A Babel plugin that causes each AVA test to be duplicated with a new title.
 
@@ -11,28 +12,31 @@
   This is used by some integration tests to validate correct handling of Babel config options.
 */
 
-function plugin(babel) {
-	var t = babel.types;
-	var anonCount = 1;
+module.exports = babel => {
+	const t = babel.types;
+	const anonCount = 1;
 
 	return {
 		visitor: {
-			CallExpression: function (path) {
-				var node = path.node;
-				var callee = node.callee;
-				var args = node.arguments;
+			CallExpression: path => {
+				const node = path.node;
+				const callee = node.callee;
+				let args = node.arguments;
+
 				if (callee.type === 'Identifier' && callee.name === 'test') {
 					if (args.length === 1) {
-						args = [t.StringLiteral('repeated test: anonymous' + anonCount++), args[0]];
+						args = [t.StringLiteral(`repeated test: anonymous${anonCount++}`), args[0]];
 					} else if (args.length === 2 && args[0].type === 'StringLiteral') {
 						if (/^repeated test/.test(args[0].value)) {
 							return;
 						}
+
 						args = args.slice();
-						args[0] = t.StringLiteral('repeated test: ' + args[0].value);
+						args[0] = t.StringLiteral(`repeated test: ${args[0].value}`);
 					} else {
-						throw new Error('the plugin does not know how to handle this call to test');
+						throw new Error('The plugin does not know how to handle this call to test');
 					}
+
 					path.insertAfter(t.CallExpression(
 						t.Identifier('test'),
 						args
@@ -41,6 +45,4 @@ function plugin(babel) {
 			}
 		}
 	};
-}
-
-module.exports = plugin;
+};

test/fixture/caching/test.js

@@ -1,3 +1,5 @@
-import test from '../../../'
+import test from '../../../';
 
-test(t => t.true(2 + 2 === 4));
+test(t => {
+	t.true(2 + 2 === 4);
+});

test/fixture/destructuring-public-api.js

@@ -1,17 +1,19 @@
 import test from '../../';
 
-test.beforeEach(t => t.context = 'bar');
+test.beforeEach(t => {
+	t.context = 'bar';
+});
 
-test.cb('callback mode', ({context: foo, ... t}) => {
+test.cb('callback mode', ({context: foo, ...t}) => {
 	t.is(foo, 'bar');
 	t.end();
 });
 
-test.cb('callback mode #2', ({context: foo, end, ... t}) => {
+test.cb('callback mode #2', ({context: foo, end, ...t}) => {
 	t.is(foo, 'bar');
 	end();
 });
 
-test('sync', ({context: foo, ... t}) => {
+test('sync', ({context: foo, ...t}) => {
 	t.is(foo, 'bar');
 });

test/fixture/exclusive-nonexclusive.js

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

test/fixture/exclusive.js

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

test/fixture/fake-timers.js

@@ -1,5 +1,5 @@
-import test from '../../';
 import sinon from 'sinon';
+import test from '../../';
 
 test(t => {
 	sinon.useFakeTimers(Date.now() + 10000);

test/fixture/generators.js

@@ -2,8 +2,6 @@ import test from '../../';
 
 test('generator function', function * (t) {
 	t.plan(1);
-
 	const value = yield Promise.resolve(1);
-
 	t.is(value, 1);
 });

test/fixture/immediate-0-exit.js

@@ -1 +1,2 @@
+'use strict';
 process.exit(0);

test/fixture/immediate-3-exit.js

@@ -1 +1,2 @@
+'use strict';
 process.exit(3);

test/fixture/improper-t-throws-unhandled-rejection.js

@@ -4,7 +4,7 @@ test.cb(t => {
 	Promise.resolve().then(() => {
 		t.throws(throwSync());
 	});
-	
+
 	setTimeout(t.end, 20);
 });
 

test/fixture/install-global.js

@@ -1 +1,2 @@
+'use strict';
 global.foo = 'bar';

test/fixture/long-running.js

@@ -4,6 +4,4 @@ test.cb('slow', t => {
 	setTimeout(t.end, 5000);
 });
 
-test('fast', t => {
-
-});
+test('fast', () => {});

test/fixture/loud-rejection.js

@@ -1,7 +1,7 @@
 import test from '../../';
 
 test.cb('creates an unhandled rejection', t => {
-	Promise.reject(new Error(`You can't handle this!`));
+	Promise.reject(new Error('You can\'t handle this!'));
 
 	setTimeout(() => {
 		t.end();

test/fixture/node-paths.js

@@ -1,6 +1,6 @@
-import test from '../../';
 import foo from 'nested/foo';
 import bar from 'path/bar';
+import test from '../../';
 
 test('relative require', t => {
 	t.is(foo, 'bar');

test/fixture/node-paths/deep/nested/path/bar.js

@@ -1 +1,2 @@
+'use strict';
 module.exports = 'baz';

test/fixture/node-paths/modules/nested/foo.js

@@ -1 +1,2 @@
+'use strict';
 module.exports = 'bar';

test/fixture/pkg-conf/defaults/test.js

@@ -1,4 +1,4 @@
-import test from '../../../../'
+import test from '../../../../';
 
 const opts = JSON.parse(process.argv[2]);
 

test/fixture/pkg-conf/pkg-overrides/actual.js

@@ -1,5 +1,5 @@
-import test from '../../../../';
 import path from 'path';
+import test from '../../../../';
 
 const opts = JSON.parse(process.argv[2]);
 

test/fixture/pkg-conf/pkg-overrides/required.js

@@ -1,3 +1,2 @@
 'use strict';
-
 module.exports = 'foo';

test/fixture/pkg-conf/precedence/c.js

@@ -1,5 +1,5 @@
-import test from '../../../../';
 import path from 'path';
+import test from '../../../../';
 
 const opts = JSON.parse(process.argv[2]);
 

test/fixture/pkg-conf/precedence/default-required.js

@@ -1 +1,2 @@
-module.exports = "bar";
+'use strict';
+module.exports = 'bar';

test/fixture/pkg-conf/precedence/required.js

@@ -1,3 +1,2 @@
 'use strict';
-
 module.exports = 'foo';

test/fixture/power-assert.js

@@ -2,24 +2,23 @@ import test from '../../';
 
 test.serial(t => {
 	const a = 'foo';
-
 	t.true(a === 'bar');
 });
 
 test.serial(t => {
 	const a = 'bar';
-
 	t.true(a === 'foo', 'with message');
 });
 
 test.serial(t => {
 	const o = {};
-
 	t.true(o === {...o});
 });
 
 test.serial(t => {
-	const React = { createElement: function(type) { return type } }
+	const React = {
+		createElement: type => type
+	};
 
 	t.true(<div /> === <span />);
 });

test/fixture/serial.js

@@ -1,6 +1,6 @@
 import test from '../../';
 
-var tests = [];
+const tests = [];
 
 test.cb('first', t => {
 	setTimeout(() => {