code style tweaks

cli.js

@@ -8,9 +8,9 @@ var globby = require('globby');
 var meow = require('meow');
 var updateNotifier = require('update-notifier');
 var chalk = require('chalk');
+var Promise = require('bluebird');
 var fork = require('./lib/fork');
 var log = require('./lib/logger');
-var Promise = require('bluebird');
 
 // Bluebird specific
 Promise.longStackTraces();
@@ -37,7 +37,10 @@ var cli = meow({
 	]
 }, {
 	string: ['_'],
-	boolean: ['fail-fast', 'serial']
+	boolean: [
+		'fail-fast',
+		'serial'
+	]
 });
 
 var fileCount = 0;
@@ -151,7 +154,7 @@ function init(files) {
 
 	return handlePaths(files)
 		.map(function (file) {
-			return path.join(process.cwd(), file);
+			return path.resolve('.', file);
 		})
 		.then(function (files) {
 			if (files.length === 0) {
@@ -189,9 +192,7 @@ function handlePaths(files) {
 
 			return file;
 		})
-		.then(function (files) {
+		.then(flatten)
-			return flatten(files);
-		})
 		.filter(function (file) {
 			return path.extname(file) === '.js' && path.basename(file)[0] !== '_';
 		});

lib/babel.js

@@ -1,8 +1,6 @@
 'use strict';
-
 var resolveFrom = require('resolve-from');
 var createEspowerPlugin = require('babel-plugin-espower/create');
-
 var hasGenerators = parseInt(process.version.slice(1), 10) > 0;
 var path = process.argv[2];
 

lib/fork.js

@@ -1,23 +1,19 @@
 'use strict';
-
 var childProcess = require('child_process');
 var Promise = require('bluebird');
-var dirname = require('path').dirname;
+var path = require('path');
-var join = require('path').join;
-
-module.exports = fork;
 
-function fork(args) {
+module.exports = function (args) {
 	if (!Array.isArray(args)) {
 		args = [args];
 	}
 
-	var babel = join(__dirname, 'babel.js');
+	var babel = path.join(__dirname, 'babel.js');
 	var file = args[0];
 
 	var options = {
 		silent: true,
-		cwd: dirname(file)
+		cwd: path.dirname(file)
 	};
 
 	var ps = childProcess.fork(babel, args, options);
@@ -58,4 +54,4 @@ function fork(args) {
 	};
 
 	return promise;
-}
+};

lib/logger.js

@@ -1,5 +1,4 @@
 'use strict';
-
 var prettyMs = require('pretty-ms');
 var figures = require('figures');
 var Squeak = require('squeak');

lib/runner.js

@@ -76,13 +76,11 @@ Runner.prototype.addAfterEachHook = function (title, cb) {
 };
 
 Runner.prototype._runTestWithHooks = function (test) {
-	var self = this;
+	var beforeHooks = this.tests.beforeEach.map(function (hook) {
-
-	var beforeHooks = self.tests.beforeEach.map(function (hook) {
 		return new Test(hook.title, hook.fn);
 	});
 
-	var afterHooks = self.tests.afterEach.map(function (hook) {
+	var afterHooks = this.tests.afterEach.map(function (hook) {
 		return new Test(hook.title, hook.fn);
 	});
 
@@ -96,14 +94,12 @@ Runner.prototype._runTestWithHooks = function (test) {
 };
 
 Runner.prototype._runTest = function (test) {
-	var self = this;
-
 	// add test result regardless of state
 	// but on error, don't execute next tests
 	return test.run()
 		.finally(function () {
-			self._addTestResult(test);
+			this._addTestResult(test);
-		});
+		}.bind(this));
 };
 
 Runner.prototype.concurrent = function (tests) {

lib/test.js

@@ -3,8 +3,8 @@ var isGenerator = require('is-generator').fn;
 var Promise = require('bluebird');
 var setImmediate = require('set-immediate-shim');
 var fnName = require('fn-name');
-var assert = require('./assert');
 var co = require('co');
+var assert = require('./assert');
 
 var TIMEOUT_MAX_VALUE = 2147483647;
 

test/fixture/async-await.js

@@ -1,5 +1,4 @@
 'use strict';
-
 const test = require('../../');
 
 test('async function', async function (t) {

test/fixture/generators.js

@@ -1,5 +1,4 @@
 'use strict';
-
 const test = require('../../');
 
 test('generator function', function * (t) {

test/fork.js

@@ -1,10 +1,10 @@
 'use strict';
 var test = require('tape');
-var join = require('path').join;
+var path = require('path');
 var fork = require('../lib/fork.js');
 
 function fixture(name) {
-	return join(__dirname, 'fixture', name);
+	return path.join(__dirname, 'fixture', name);
 }
 
 test('emits test event', function (t) {

test/test.js

@@ -3,7 +3,7 @@ var childProcess = require('child_process');
 var Promise = require('bluebird');
 var figures = require('figures');
 var test = require('tape');
-var join = require('path').join;
+var path = require('path');
 var Runner = require('../lib/runner');
 var ava = require('../lib/test');
 
@@ -866,7 +866,7 @@ test('change process.cwd() to a test\'s directory', function (t) {
 
 	execCli('fixture/process-cwd.js', function (err, stdout) {
 		t.ifError(err);
-		t.is(stdout.trim(), join(__dirname, 'fixture'));
+		t.is(stdout.trim(), path.join(__dirname, 'fixture'));
 		t.end();
 	});
 });