test: convert from tape to tap

package.json

@@ -31,8 +31,7 @@
     "nock": "^2.2.0",
     "sinopia": "^1.0.0",
     "standard": "^4.0.1",
-    "tap-spec": "^4.0.0",
+    "tap": "^1.2.0"
-    "tape": "^4.0.0"
   },
   "engines": {
     "iojs": "^1",
@@ -69,7 +68,7 @@
     "prepublish": "npm run build && ./bin/semantic-release.js pre",
     "pretest": "npm run build",
     "test": "./bin/test",
-    "test:integration": "node tests | tap-spec",
+    "test:integration": "tap tests/{scenarios,tap}/*.js",
     "test:style": "standard"
   }
 }

tests/index.js

@@ -1,11 +0,0 @@
-'use strict'
-
-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')()

tests/scenarios/custom-analyzer.js

@@ -3,23 +3,21 @@
 var path = require('path')
 
 var efh = require('error-first-handler')
-var test = require('tape')
+var test = require('tap').test
 
 var createModule = require('../lib/create-module')
 var commitToVersionTest = require('../lib/commit-to-version-test')
 
-module.exports = function () {
+test('custom-analyzer', function (t) {
   createModule({
     release: {
       analyzer: path.join(__dirname, '../lib/custom-analyzer')
     }
   }, efh()(function (name, cwd) {
-    test('custom-analyzer', function (t) {
     commitToVersionTest(t, 'HO', '0.0.0', 1, 'abort publish w/o changes', cwd)
     commitToVersionTest(t, 'BAZ', '1.0.0', 0, 'release 1.0.0 if unpublished', cwd)
     commitToVersionTest(t, 'BAZ', '1.0.1', 0, 'bump patch for fix', cwd)
     commitToVersionTest(t, 'BAR', '1.1.0', 0, 'bump minor for feature', cwd)
     commitToVersionTest(t, 'FOO', '2.0.0', 0, 'bump major for breaking change', cwd)
-    })
   }))
-}
+})

tests/scenarios/custom-verification.js

@@ -4,17 +4,16 @@ var path = require('path')
 
 var efh = require('error-first-handler')
 var nixt = require('nixt')
-var test = require('tape')
+var test = require('tap').test
 
 var createModule = require('../lib/create-module')
 
-module.exports = function () {
+test('custom-verification', function (t) {
   createModule({
     release: {
       verification: path.join(__dirname, '../lib/custom-verification')
     }
   }, efh()(function (name, cwd) {
-    test('custom-verification', function (t) {
     t.test('even commit count', function (t) {
       t.plan(1)
       nixt()
@@ -43,6 +42,5 @@ module.exports = function () {
           t.error(err, 'nixt')
         })
     })
-    })
   }))
-}
+})

tests/scenarios/ignore.js

@@ -4,22 +4,22 @@ var fs = require('fs')
 
 var efh = require('error-first-handler')
 var nixt = require('nixt')
-var test = require('tape')
+var test = require('tap').test
 
 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')
+  createModule(efh()(function (name, cwd) {
-      ignoreTest(t, 'npm i', 'not doing anything when the module is installed with abbrevd command')
+    ignoreTest(t, cwd, 'npm install', 'not doing anything when the module is installed')
-      ignoreTest(t, 'npm link', 'not doing anything when the module is linked')
+    ignoreTest(t, cwd, 'npm i', 'not doing anything when the module is installed with abbrevd command')
-      ignoreTest(t, 'npm lin', 'not doing anything when the module is linked with abbrevd command')
+    ignoreTest(t, cwd, 'npm link', 'not doing anything when the module is linked')
-      ignoreTest(t, 'npm pack', 'not doing anything when the module is packed')
+    ignoreTest(t, cwd, 'npm lin', 'not doing anything when the module is linked with abbrevd command')
-      ignoreTest(t, 'npm pa', 'not doing anything when the module is packed with abbrevd command')
+    ignoreTest(t, cwd, 'npm pack', 'not doing anything when the module is packed')
+    ignoreTest(t, cwd, 'npm pa', 'not doing anything when the module is packed with abbrevd command')
+  }))
 })
 
-    function ignoreTest (t, command, name, last) {
+function ignoreTest (t, cwd, command, name) {
   t.test(name, function (t) {
     t.plan(2)
 
@@ -36,5 +36,3 @@ module.exports = function () {
       })
   })
 }
-  }))
-}

tests/scenarios/postpublish.js

@@ -5,7 +5,7 @@ var path = require('path')
 var efh = require('error-first-handler')
 var GitHubApi = require('github')
 var nixt = require('nixt')
-var test = require('tape')
+var test = require('tap').test
 
 var createModule = require('../lib/create-module')
 
@@ -21,7 +21,7 @@ github.authenticate({
   token: '***'
 })
 
-module.exports = function () {
+test('postpublish', function (t) {
   createModule({
     version: '2.0.0',
     repository: {
@@ -29,7 +29,6 @@ module.exports = function () {
       url: 'http://github.com/user/repo'
     }
   }, efh()(function (name, cwd) {
-    test('postpublish', function (t) {
     var base = getBase(cwd)
 
     t.test('publish new version to github releases', function (t) {
@@ -66,7 +65,6 @@ module.exports = function () {
         t.ok(/\n\n\n#### Features\n\n\* \*\*cool:\*\*\n.*the next big thing/.test(res.body), 'body')
       })
     })
-    })
   }))
 
   createModule({
@@ -79,7 +77,6 @@ module.exports = function () {
       notes: path.join(__dirname, '../lib/custom-release-notes')
     }
   }, efh()(function (name, cwd) {
-    test('custom-release-notes', function (t) {
     var base = getBase(cwd)
 
     t.test('publish new version (with custom notes) to github releases', function (t) {
@@ -103,9 +100,8 @@ module.exports = function () {
         t.ok(/custom log/.test(res.body), 'body')
       })
     })
-    })
   }))
-}
+})
 
 function getBase (cwd) {
   return nixt()

tests/scenarios/prepublish.js

@@ -1,19 +1,17 @@
 'use strict'
 
 var efh = require('error-first-handler')
-var test = require('tape')
+var test = require('tap').test
 
 var createModule = require('../lib/create-module')
 var commitToVersionTest = require('../lib/commit-to-version-test')
 
-module.exports = function () {
-  createModule(efh()(function (name, cwd) {
 test('prepublish', function (t) {
+  createModule(efh()(function (name, cwd) {
     commitToVersionTest(t, 'refactor: change', '0.0.0', 1, 'abort publish w/o changes', cwd)
     commitToVersionTest(t, 'fix: change', '1.0.0', 0, 'release 1.0.0 if unpublished', cwd)
     commitToVersionTest(t, 'fix: change', '1.0.1', 0, 'bump patch for fix', cwd)
     commitToVersionTest(t, 'feat: change', '1.1.0', 0, 'bump minor for feature', cwd)
     commitToVersionTest(t, 'fix: BREAKING CHANGE: change', '2.0.0', 0, 'bump major for breaking change', cwd)
-    })
   }))
-}
+})

tests/scenarios/publish.js

@@ -2,11 +2,10 @@
 
 var efh = require('error-first-handler')
 var nixt = require('nixt')
-var test = require('tape')
+var test = require('tap').test
 
 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')
@@ -37,4 +36,3 @@ module.exports = function () {
     }))
   }
 })
-}

tests/scenarios/setup.js

@@ -5,18 +5,17 @@ var readFile = require('fs').readFileSync
 
 var efh = require('error-first-handler')
 var nixt = require('nixt')
-var test = require('tape')
+var test = require('tap').test
 
 var createModule = require('../lib/create-module')
 
-module.exports = function () {
+test('setup', function (t) {
   createModule({
     repository: {},
     scripts: {
       postpublish: 'npm run gh-pages'
     }
   }, efh()(function (name, cwd) {
-    test('setup', function (t) {
     t.test('setup "package.json"', function (t) {
       t.plan(5)
 
@@ -36,6 +35,5 @@ module.exports = function () {
           t.is(pkg.scripts.postpublish, 'npm run gh-pages && semantic-release post', 'post')
         })
     })
-    })
   }))
-}
+})

tests/scenarios/verify.js

@@ -2,16 +2,15 @@
 
 var efh = require('error-first-handler')
 var nixt = require('nixt')
-var test = require('tape')
+var test = require('tap').test
 
 var createModule = require('../lib/create-module')
 
-module.exports = function () {
 test('verify', function (t) {
   createModule({
     repository: {},
     scripts: {
-        prepublish: '../../../bin/semantic-release.js pre'
+      prepublish: '../../../bin/semantic-release.js pre --no-token'
     }
   }, efh()(function (name, cwd) {
     t.test('verify package and options before publishing', function (t) {
@@ -50,4 +49,3 @@ module.exports = function () {
     })
   }))
 })
-}

tests/tap/npm-info.js

@@ -1,6 +1,6 @@
 'use strict'
 
-var test = require('tape')
+var test = require('tap').test
 var nock = require('nock')
 
 var npmInfo = require('../../dist/lib/npm-info.js')
@@ -20,7 +20,6 @@ var defaultModule = {
 
 process.env.npm_config_registry = registry
 
-module.exports = function () {
 test('npm-info', function (t) {
   var regMock = nock(registry, {
     reqheaders: {
@@ -50,4 +49,3 @@ module.exports = function () {
     })
   })
 })
-}