test: 0.8 / 0.10 compatibility

othiym23 · othiym23 · commit 50bbb3b78884 · 2015-08-25T23:22:14.000-07:00
- use `readable-stream` to get Readable
- include hackaround for missing setImmediate
- explicitly shut down mock registry
diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
   "devDependencies": {
     "negotiator": "^0.4.9",
     "nock": "^0.56.0",
+    "readable-stream": "^2.0.2",
     "standard": "^4.0.0",
     "tap": "^1.2.0"
   },
diff --git a/test/access.js b/test/access.js
@@ -285,6 +285,11 @@ test('access command base validation', function (t) {
   t.end()
 })
 
+test('cleanup', function (t) {
+  server.close()
+  t.end()
+})
+
 function onJsonReq (req, cb) {
   var buffer = ''
   req.setEncoding('utf8')
diff --git a/test/adduser-new.js b/test/adduser-new.js
@@ -51,6 +51,7 @@ tap.test('create new user account', function (t) {
     function (er, data) {
       if (er) throw er
       t.deepEqual(data, auth, 'received expected auth data')
+      server.close()
       t.end()
     }
   )
diff --git a/test/adduser-update.js b/test/adduser-update.js
@@ -61,6 +61,7 @@ tap.test('update a user acct', function (t) {
     function (er, data) {
       if (er) throw er
       t.deepEqual(data, auth, 'got expected auth data')
+      server.close()
       t.end()
     }
   )
diff --git a/test/deprecate.js b/test/deprecate.js
@@ -150,6 +150,7 @@ test('deprecate a package', function (t) {
       t.ifError(er)
       t.ok(data.deprecated, 'was deprecated')
 
+      server.close()
       t.end()
     }
   )
diff --git a/test/dist-tags-add.js b/test/dist-tags-add.js
@@ -136,6 +136,7 @@ test('add a new dist-tag to a package', function (t) {
     t.ifError(error, 'no errors')
     t.ok(data.test, 'dist-tag added')
 
+    server.close()
     t.end()
   })
 })
diff --git a/test/dist-tags-fetch.js b/test/dist-tags-fetch.js
@@ -93,6 +93,7 @@ test('fetch dist-tags for a package', function (t) {
     t.ifError(error, 'no errors')
     t.same(data, { a: '1.0.0', b: '2.0.0' }, 'etag filtered from response')
 
+    server.close()
     t.end()
   })
 })
diff --git a/test/dist-tags-rm.js b/test/dist-tags-rm.js
@@ -112,6 +112,7 @@ test('remove a dist-tag from a package', function (t) {
     t.ifError(error, 'no errors')
     t.notOk(data.test, 'dist-tag removed')
 
+    server.close()
     t.end()
   })
 })
diff --git a/test/dist-tags-set.js b/test/dist-tags-set.js
@@ -116,6 +116,7 @@ test('set dist-tags for a package', function (t) {
     t.ifError(error, 'no errors')
     t.ok(data.a && data.b, 'dist-tags set')
 
+    server.close()
     t.end()
   })
 })
diff --git a/test/dist-tags-update.js b/test/dist-tags-update.js
@@ -107,6 +107,7 @@ test('update dist-tags for a package', function (t) {
     t.ifError(error, 'no errors')
     t.ok(data.a && data.b, 'dist-tags set')
 
+    server.close()
     t.end()
   })
 })
diff --git a/test/fetch-404.js b/test/fetch-404.js
@@ -28,6 +28,7 @@ tap.test('fetch with a 404 response', function (t) {
         'fetch failed with status code 404',
         'got expected error message'
       )
+      server.close()
       t.end()
     }
   )
diff --git a/test/fetch-408.js b/test/fetch-408.js
@@ -40,6 +40,7 @@ tap.test('fetch with retry on timeout', function (t) {
 
       var sink = cat(function (data) {
         t.deepEqual(data, readFileSync(tgz))
+        server.close()
         t.end()
       })
 
diff --git a/test/fetch-503.js b/test/fetch-503.js
@@ -40,6 +40,7 @@ tap.test('fetch with retry on server error', function (t) {
 
       var sink = cat(function (data) {
         t.deepEqual(data, readFileSync(tgz))
+        server.close()
         t.end()
       })
 
diff --git a/test/fetch-authed.js b/test/fetch-authed.js
@@ -44,6 +44,7 @@ tap.test('basic fetch with scoped always-auth enabled', function (t) {
 
       var sink = cat(function (data) {
         t.deepEqual(data, readFileSync(tgz))
+        server.close()
         t.end()
       })
 
diff --git a/test/fetch-basic.js b/test/fetch-basic.js
@@ -79,6 +79,7 @@ test('basic fetch', function (t) {
 
       var sink = concat(function (data) {
         t.deepEqual(data, readFileSync(tgz))
+        server.close()
         t.end()
       })
 
diff --git a/test/fetch-github-api-json.js b/test/fetch-github-api-json.js
@@ -54,6 +54,7 @@ tap.test("fetch accepts github api's json", function (t) {
 
       var sink = cat(function (data) {
         t.deepEqual(data, readFileSync(tgz))
+        server.close()
         t.end()
       })
 
diff --git a/test/fetch-not-authed.js b/test/fetch-not-authed.js
@@ -40,6 +40,7 @@ tap.test('basic fetch with scoped always-auth disabled', function (t) {
 
       var sink = cat(function (data) {
         t.deepEqual(data, readFileSync(tgz))
+        server.close()
         t.end()
       })
 
diff --git a/test/get-403.js b/test/get-403.js
@@ -23,6 +23,7 @@ tap.test('get returns 403', function (t) {
       t.equal(er.statusCode, 403, 'status code was attached to error as expected')
       t.equal(er.code, 'E403', 'error code was formatted as expected')
 
+      server.close()
       t.end()
     }
   )
diff --git a/test/get-basic.js b/test/get-basic.js
@@ -78,3 +78,8 @@ test('basic request', function (t) {
     t.deepEqual(data, usroot)
   })
 })
+
+test('cleanup', function (t) {
+  server.close()
+  t.end()
+})
diff --git a/test/get-error-403.js b/test/get-error-403.js
@@ -27,6 +27,7 @@ tap.test('get fails with 403', function (t) {
         'got error message'
       )
 
+      server.close()
       t.end()
     }
   )
diff --git a/test/lib/common.js b/test/lib/common.js
@@ -2,6 +2,14 @@ var server = require('./server.js')
 var RC = require('../../')
 var REGISTRY = 'http://localhost:' + server.port
 
+// cheesy hackaround for test deps (read: nock) that rely on setImmediate
+if (!global.setImmediate || !require('timers').setImmediate) {
+  require('timers').setImmediate = global.setImmediate = function () {
+    var args = [arguments[0], 0].concat([].slice.call(arguments, 1))
+    setTimeout.apply(this, args)
+  }
+}
+
 module.exports = {
   port: server.port,
   registry: REGISTRY,
diff --git a/test/lib/server.js b/test/lib/server.js
@@ -29,11 +29,6 @@ function handler (req, res) {
   var fn = server._expect[k].shift()
   if (!fn) throw Error('unexpected request: ' + req.method + ' ' + req.url)
 
-  var remain = (Object.keys(server._expect).reduce(function (s, k) {
-    return s + server._expect[k].length
-  }, 0))
-  if (remain === 0) server.close()
-  else this.log.info('fake-registry', 'TEST SERVER: %d reqs remain', remain)
   this.log.info('fake-registry', Object.keys(server._expect).map(function (k) {
     return [k, server._expect[k].length]
   }).reduce(function (acc, kv) {
diff --git a/test/ping.js b/test/ping.js
@@ -70,6 +70,7 @@ test('ping', function (t) {
       username: DEP_USER
     }
     t.same(found, wanted)
+    server.close()
     t.end()
   })
 })
diff --git a/test/publish-again-scoped.js b/test/publish-again-scoped.js
@@ -85,6 +85,7 @@ tap.test('publish again', function (t) {
   client.publish('http://localhost:1337/', params, function (er, data) {
     if (er) throw er
     t.deepEqual(data, { created: true })
+    server.close()
     t.end()
   })
 })
diff --git a/test/publish-again.js b/test/publish-again.js
@@ -83,6 +83,7 @@ tap.test('publish again', function (t) {
   client.publish('http://localhost:1337/', params, function (er, data) {
     if (er) throw er
     t.deepEqual(data, { created: true })
+    server.close()
     t.end()
   })
 })
diff --git a/test/publish-failed-no-message.js b/test/publish-failed-no-message.js
@@ -38,6 +38,7 @@ test('publish with a 500 response but no message', function (t) {
     t.ok(er, 'got expected error')
     t.notOk(data, 'no payload on failure')
 
+    server.close()
     t.end()
   })
 })
diff --git a/test/publish-mixcase-name.js b/test/publish-mixcase-name.js
@@ -86,6 +86,7 @@ tap.test('publish mixcase name', function (t) {
   client.publish('http://localhost:1337/', params, function (er, data) {
     if (er) throw er
     t.deepEqual(data, { created: true })
+    server.close()
     t.end()
   })
 })
diff --git a/test/publish-new-mixcase-name.js b/test/publish-new-mixcase-name.js
@@ -67,6 +67,7 @@ test('publish-new-mixcase-name', function (t) {
     // TODO: need a test that ensures useful error message
     // t.similar(data.error, /must be lower-case/)
 
+    server.close()
     t.end()
   })
 })
diff --git a/test/publish-scoped-auth-token.js b/test/publish-scoped-auth-token.js
@@ -51,6 +51,7 @@ tap.test('publish', function (t) {
   client.publish(common.registry, params, function (er, data) {
     if (er) throw er
     t.deepEqual(data, { created: true })
+    server.close()
     t.end()
   })
 })
diff --git a/test/publish-scoped.js b/test/publish-scoped.js
@@ -58,6 +58,7 @@ tap.test('publish', function (t) {
   client.publish(common.registry, params, function (er, data) {
     if (er) throw er
     t.deepEqual(data, { created: true })
+    server.close()
     t.end()
   })
 })
diff --git a/test/publish.js b/test/publish.js
@@ -198,6 +198,7 @@ test('publish', function (t) {
     if (er) throw er
 
     t.deepEqual(data, { created: true })
+    server.close()
     t.end()
   })
 })
diff --git a/test/redirects.js b/test/redirects.js
@@ -1,4 +1,4 @@
-var tap = require('tap')
+var test = require('tap').test
 
 var server = require('./lib/server.js')
 var common = require('./lib/common.js')
@@ -10,7 +10,7 @@ var pkg = {
   version: '1.2.3'
 }
 
-tap.test('basic request', function (t) {
+test('basic request', function (t) {
   // Expect one request for { follow : false }
   server.expect('/-/some-package/1.2.3', function (req, res) {
     res.writeHead(301, {
@@ -49,3 +49,8 @@ tap.test('basic request', function (t) {
     }
   )
 })
+
+test('cleanup', function (t) {
+  server.close()
+  t.end()
+})
diff --git a/test/request-gzip-content.js b/test/request-gzip-content.js
@@ -1,5 +1,5 @@
 var zlib = require('zlib')
-var tap = require('tap')
+var test = require('tap').test
 
 var server = require('./lib/server.js')
 var common = require('./lib/common.js')
@@ -20,7 +20,7 @@ var pkg = {
 }
 
 zlib.gzip(JSON.stringify(pkg), function (err, pkgGzip) {
-  tap.test('request gzip package content', function (t) {
+  test('request gzip package content', function (t) {
     t.ifError(err, 'example package compressed')
 
     server.expect('GET', '/some-package-gzip/1.2.3', function (req, res) {
@@ -37,7 +37,7 @@ zlib.gzip(JSON.stringify(pkg), function (err, pkgGzip) {
     })
   })
 
-  tap.test('request wrong gzip package content', function (t) {
+  test('request wrong gzip package content', function (t) {
     // will retry 3 times
     for (var i = 0; i < 3; i++) {
       server.expect('GET', '/some-package-gzip/1.2.3', function (req, res) {
@@ -53,4 +53,9 @@ zlib.gzip(JSON.stringify(pkg), function (err, pkgGzip) {
       t.end()
     })
   })
+
+  test('cleanup', function (t) {
+    server.close()
+    t.end()
+  })
 })
diff --git a/test/request.js b/test/request.js
@@ -1,4 +1,4 @@
-var Readable = require('stream').Readable
+var Readable = require('readable-stream').Readable
 var inherits = require('util').inherits
 
 var test = require('tap').test
@@ -276,3 +276,8 @@ test('run request through its paces', function (t) {
     t.ok(typeof er !== 'string', "Error shouldn't be returned as string.")
   })
 })
+
+test('cleanup', function (t) {
+  server.close()
+  t.end()
+})
diff --git a/test/retries.js b/test/retries.js
@@ -46,6 +46,7 @@ tap.test('create new user account', function (t) {
   client.get('http://localhost:1337/some-package/1.2.3', {}, function (er, data) {
     if (er) throw er
     t.deepEqual(data, pkg)
+    server.close()
     t.end()
   })
 })
diff --git a/test/star.js b/test/star.js
diff --git a/test/stars.js b/test/stars.js
diff --git a/test/tag.js b/test/tag.js
diff --git a/test/team.js b/test/team.js
diff --git a/test/unpublish-scoped.js b/test/unpublish-scoped.js
diff --git a/test/unpublish.js b/test/unpublish.js
diff --git a/test/whoami.js b/test/whoami.js

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ tap.test('create new user account', function (t) {`
`51`	`51`	`function (er, data) {`
`52`	`52`	`if (er) throw er`
`53`	`53`	`t.deepEqual(data, auth, 'received expected auth data')`
	`54`	`+ server.close()`
`54`	`55`	`t.end()`
`55`	`56`	`}`
`56`	`57`	`)`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ tap.test('update a user acct', function (t) {`
`61`	`61`	`function (er, data) {`
`62`	`62`	`if (er) throw er`
`63`	`63`	`t.deepEqual(data, auth, 'got expected auth data')`
	`64`	`+ server.close()`
`64`	`65`	`t.end()`
`65`	`66`	`}`
`66`	`67`	`)`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,7 @@ test('deprecate a package', function (t) {`
`150`	`150`	`t.ifError(er)`
`151`	`151`	`t.ok(data.deprecated, 'was deprecated')`
`152`	`152`
	`153`	`+ server.close()`
`153`	`154`	`t.end()`
`154`	`155`	`}`
`155`	`156`	`)`