Finish ES2015ifying the codebase \o/

bench/run.js

@@ -62,24 +62,24 @@ if (process.argv.length === 2) {
 	let currentArgs = [];
 	let shouldFail = false;
 
-	process.argv.slice(2).forEach(arg => {
+	for (const arg of process.argv.slice(2)) {
 		if (arg === '--') {
 			list.push({
 				args: currentArgs,
 				shouldFail
 			});
 			currentArgs = [];
 			shouldFail = false;
-			return;
+			continue;
 		}
 
 		if (arg === '--should-fail') {
 			shouldFail = true;
-			return;
+			continue;
 		}
 
 		currentArgs.push(arg);
-	});
+	}
 
 	if (currentArgs.length > 0) {
 		list.push({
@@ -89,9 +89,9 @@ if (process.argv.length === 2) {
 	}
 }
 
-list.forEach(definition => {
+for (const definition of list) {
 	definition.args = ['--verbose'].concat(definition.args);
-});
+}
 
 let combined = [];
 for (let i = 0; i < 11; i++) {

lib/assert.js

@@ -165,8 +165,8 @@ x._snapshot = function (tree, optionalMessage, match, snapshotStateGetter) {
 		snapshotState: state
 	};
 
-	// symbols can't be serialized and saved in a snapshot,
-	// that's why tree is saved in `jsx` prop, so that JSX can be detected later
+	// Symbols can't be serialized and saved in a snapshot, that's why tree
+	// is saved in the `__ava_react_jsx` prop, so that JSX can be detected later
 	const serializedTree = tree.$$typeof === Symbol.for('react.test.json') ? {__ava_react_jsx: tree} : tree; // eslint-disable-line camelcase
 	const result = toMatchSnapshot.call(context, JSON.stringify(serializedTree));
 

lib/cli.js

@@ -10,9 +10,9 @@ const isCi = require('is-ci');
 const hasFlag = require('has-flag');
 const Api = require('../api');
 const colors = require('./colors');
-const verboseReporter = require('./reporters/verbose');
-const miniReporter = require('./reporters/mini');
-const tapReporter = require('./reporters/tap');
+const VerboseReporter = require('./reporters/verbose');
+const MiniReporter = require('./reporters/mini');
+const TapReporter = require('./reporters/tap');
 const Logger = require('./logger');
 const Watcher = require('./watcher');
 const babelConfig = require('./babel-config');
@@ -127,11 +127,11 @@ exports.run = () => {
 	let reporter;
 
 	if (cli.flags.tap && !cli.flags.watch) {
-		reporter = tapReporter();
+		reporter = new TapReporter();
 	} else if (cli.flags.verbose || isCi) {
-		reporter = verboseReporter({basePath: pkgDir});
+		reporter = new VerboseReporter({basePath: pkgDir});
 	} else {
-		reporter = miniReporter({watching: cli.flags.watch, basePath: pkgDir});
+		reporter = new MiniReporter({watching: cli.flags.watch, basePath: pkgDir});
 	}
 
 	reporter.api = api;

lib/code-excerpt.js

@@ -5,9 +5,8 @@ const codeExcerpt = require('code-excerpt');
 const truncate = require('cli-truncate');
 const chalk = require('chalk');
 
-const formatLineNumber = (lineNumber, maxLineNumber) => {
-	return ' '.repeat(String(maxLineNumber).length - String(lineNumber).length) + lineNumber;
-};
+const formatLineNumber = (lineNumber, maxLineNumber) =>
+	' '.repeat(String(maxLineNumber).length - String(lineNumber).length) + lineNumber;
 
 module.exports = (file, line, options) => {
 	options = options || {};

lib/enhance-assert.js

@@ -66,7 +66,6 @@ const formatter = () => {
 		return args
 			.map(arg => {
 				const range = getNode(ast, arg.espath).range;
-
 				return [computeStatement(tokens, range), arg.value];
 			})
 			.reverse();