From 649af78c569c881878c4f7df4e6ed555b05ec0cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6nnemann?= Date: Thu, 11 Jun 2015 15:23:33 -0700 Subject: [PATCH] style(tests): require deps in every file --- tests/index.js | 22 +++++++++------------- tests/scenarios/custom-analyzer.js | 4 +++- tests/scenarios/custom-verification.js | 5 ++++- tests/scenarios/ignore.js | 5 ++++- tests/scenarios/postpublish.js | 5 ++++- tests/scenarios/prepublish.js | 4 +++- tests/scenarios/publish.js | 5 ++++- tests/scenarios/setup.js | 5 ++++- tests/scenarios/verify.js | 5 ++++- tests/tap/npm-info.js | 3 ++- 10 files changed, 41 insertions(+), 22 deletions(-) diff --git a/tests/index.js b/tests/index.js index dc61116b..e9c1c42d 100644 --- a/tests/index.js +++ b/tests/index.js @@ -1,15 +1,11 @@ 'use strict' -var test = require('tape') - -var createModule = require('./lib/create-module') - -require('./tap/npm-info')(test) -require('./scenarios/custom-analyzer')(test, createModule) -require('./scenarios/custom-verification')(test, createModule) -require('./scenarios/ignore')(test, createModule) -require('./scenarios/prepublish')(test, createModule) -require('./scenarios/postpublish')(test, createModule) -require('./scenarios/publish')(test, createModule) -require('./scenarios/verify')(test, createModule) -require('./scenarios/setup')(test, createModule) +require('./tap/npm-info')() +require('./scenarios/custom-analyzer')() +require('./scenarios/custom-verification')() +require('./scenarios/ignore')() +require('./scenarios/prepublish')() +require('./scenarios/postpublish')() +require('./scenarios/publish')() +require('./scenarios/verify')() +require('./scenarios/setup')() diff --git a/tests/scenarios/custom-analyzer.js b/tests/scenarios/custom-analyzer.js index d571cb78..aa38ce55 100644 --- a/tests/scenarios/custom-analyzer.js +++ b/tests/scenarios/custom-analyzer.js @@ -3,10 +3,12 @@ var path = require('path') var efh = require('error-first-handler') +var test = require('tape') +var createModule = require('../lib/create-module') var commitToVersionTest = require('../lib/commit-to-version-test') -module.exports = function (test, createModule) { +module.exports = function () { createModule({ release: { analyzer: path.join(__dirname, '../lib/custom-analyzer') diff --git a/tests/scenarios/custom-verification.js b/tests/scenarios/custom-verification.js index d9b05879..4f7b9f3f 100644 --- a/tests/scenarios/custom-verification.js +++ b/tests/scenarios/custom-verification.js @@ -4,8 +4,11 @@ var path = require('path') var efh = require('error-first-handler') var nixt = require('nixt') +var test = require('tape') -module.exports = function (test, createModule) { +var createModule = require('../lib/create-module') + +module.exports = function () { createModule({ release: { verification: path.join(__dirname, '../lib/custom-verification') diff --git a/tests/scenarios/ignore.js b/tests/scenarios/ignore.js index 793d352e..6190be7b 100644 --- a/tests/scenarios/ignore.js +++ b/tests/scenarios/ignore.js @@ -4,8 +4,11 @@ var fs = require('fs') var efh = require('error-first-handler') var nixt = require('nixt') +var test = require('tape') -module.exports = function (test, createModule) { +var createModule = require('../lib/create-module') + +module.exports = function () { createModule(efh()(function (name, cwd) { test('ignore', function (t) { ignoreTest(t, 'npm install', 'not doing anything when the module is installed') diff --git a/tests/scenarios/postpublish.js b/tests/scenarios/postpublish.js index d7ec9599..739fd186 100644 --- a/tests/scenarios/postpublish.js +++ b/tests/scenarios/postpublish.js @@ -5,6 +5,9 @@ var path = require('path') var efh = require('error-first-handler') var GitHubApi = require('github') var nixt = require('nixt') +var test = require('tape') + +var createModule = require('../lib/create-module') var github = new GitHubApi({ version: '3.0.0', @@ -18,7 +21,7 @@ github.authenticate({ token: '***' }) -module.exports = function (test, createModule) { +module.exports = function () { createModule({ version: '2.0.0', repository: { diff --git a/tests/scenarios/prepublish.js b/tests/scenarios/prepublish.js index 22b8e112..bda3d788 100644 --- a/tests/scenarios/prepublish.js +++ b/tests/scenarios/prepublish.js @@ -1,10 +1,12 @@ 'use strict' var efh = require('error-first-handler') +var test = require('tape') +var createModule = require('../lib/create-module') var commitToVersionTest = require('../lib/commit-to-version-test') -module.exports = function (test, createModule) { +module.exports = function () { createModule(efh()(function (name, cwd) { test('prepublish', function (t) { commitToVersionTest(t, 'refactor: change', '0.0.0', 1, 'abort publish w/o changes', cwd) diff --git a/tests/scenarios/publish.js b/tests/scenarios/publish.js index 4826d22f..9fd03029 100644 --- a/tests/scenarios/publish.js +++ b/tests/scenarios/publish.js @@ -2,8 +2,11 @@ var efh = require('error-first-handler') var nixt = require('nixt') +var test = require('tape') -module.exports = function (test, createModule) { +var createModule = require('../lib/create-module') + +module.exports = function () { test('publish', function (t) { publishTest(t, 'npm publish', 'pre and post hooks work as a part of publish') publishTest(t, 'npm pub', 'pre and post hooks work as a part of publish with abbrevd command') diff --git a/tests/scenarios/setup.js b/tests/scenarios/setup.js index 1670f435..01befe6e 100644 --- a/tests/scenarios/setup.js +++ b/tests/scenarios/setup.js @@ -5,8 +5,11 @@ var readFile = require('fs').readFileSync var efh = require('error-first-handler') var nixt = require('nixt') +var test = require('tape') -module.exports = function (test, createModule) { +var createModule = require('../lib/create-module') + +module.exports = function () { createModule({ repository: {}, scripts: { diff --git a/tests/scenarios/verify.js b/tests/scenarios/verify.js index cf333051..a1b86b61 100644 --- a/tests/scenarios/verify.js +++ b/tests/scenarios/verify.js @@ -2,8 +2,11 @@ var efh = require('error-first-handler') var nixt = require('nixt') +var test = require('tape') -module.exports = function (test, createModule) { +var createModule = require('../lib/create-module') + +module.exports = function () { test('verify', function (t) { createModule({ repository: {}, diff --git a/tests/tap/npm-info.js b/tests/tap/npm-info.js index ad25efb0..732dcc5d 100644 --- a/tests/tap/npm-info.js +++ b/tests/tap/npm-info.js @@ -1,5 +1,6 @@ 'use strict' +var test = require('tape') var nock = require('nock') var npmInfo = require('../../dist/lib/npm-info.js') @@ -19,7 +20,7 @@ var defaultModule = { process.env.npm_config_registry = registry -module.exports = function (test) { +module.exports = function () { test('npm-info', function (t) { var regMock = nock(registry, { reqheaders: {