From 6ae46ce00414be87715f5d7483899149acc3023e Mon Sep 17 00:00:00 2001 From: Sindre Sorhus Date: Sun, 25 Oct 2015 16:55:18 +0700 Subject: [PATCH] code style tweaks --- cli.js | 13 +++++++------ lib/babel.js | 2 -- lib/fork.js | 14 +++++--------- lib/logger.js | 1 - lib/runner.js | 12 ++++-------- lib/test.js | 2 +- test/fixture/async-await.js | 1 - test/fixture/generators.js | 1 - test/fork.js | 4 ++-- test/test.js | 4 ++-- 10 files changed, 21 insertions(+), 33 deletions(-) diff --git a/cli.js b/cli.js index b3a0ae8..8f36264 100755 --- a/cli.js +++ b/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) { - return flatten(files); - }) + .then(flatten) .filter(function (file) { return path.extname(file) === '.js' && path.basename(file)[0] !== '_'; }); diff --git a/lib/babel.js b/lib/babel.js index fd8d066..f320685 100644 --- a/lib/babel.js +++ b/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]; diff --git a/lib/fork.js b/lib/fork.js index 89065bf..b34e0e3 100644 --- a/lib/fork.js +++ b/lib/fork.js @@ -1,23 +1,19 @@ 'use strict'; - var childProcess = require('child_process'); var Promise = require('bluebird'); -var dirname = require('path').dirname; -var join = require('path').join; - -module.exports = fork; +var path = require('path'); -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; -} +}; diff --git a/lib/logger.js b/lib/logger.js index 264800d..679d28c 100644 --- a/lib/logger.js +++ b/lib/logger.js @@ -1,5 +1,4 @@ 'use strict'; - var prettyMs = require('pretty-ms'); var figures = require('figures'); var Squeak = require('squeak'); diff --git a/lib/runner.js b/lib/runner.js index 5a6f8ec..2ef729b 100644 --- a/lib/runner.js +++ b/lib/runner.js @@ -76,13 +76,11 @@ Runner.prototype.addAfterEachHook = function (title, cb) { }; Runner.prototype._runTestWithHooks = function (test) { - var self = this; - - var beforeHooks = self.tests.beforeEach.map(function (hook) { + var beforeHooks = this.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) { diff --git a/lib/test.js b/lib/test.js index 9abb77c..7b339a7 100644 --- a/lib/test.js +++ b/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; diff --git a/test/fixture/async-await.js b/test/fixture/async-await.js index 3be620b..dc65987 100644 --- a/test/fixture/async-await.js +++ b/test/fixture/async-await.js @@ -1,5 +1,4 @@ 'use strict'; - const test = require('../../'); test('async function', async function (t) { diff --git a/test/fixture/generators.js b/test/fixture/generators.js index cab5f48..2db9118 100644 --- a/test/fixture/generators.js +++ b/test/fixture/generators.js @@ -1,5 +1,4 @@ 'use strict'; - const test = require('../../'); test('generator function', function * (t) { diff --git a/test/fork.js b/test/fork.js index 7eff5ac..4b619cd 100644 --- a/test/fork.js +++ b/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) { diff --git a/test/test.js b/test/test.js index 8506af0..9e061f1 100644 --- a/test/test.js +++ b/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(); }); });