correct callback

test/index.test.js

@@ -15,11 +15,11 @@ describe('load', (context) => {
   })
 
   context.afterEach((c) => {
-    cleanup(storage.root)
+    cleanup(storage)
   })
 
   context('default', (assert, next) => {
-    var config = Config(storage.path)
+    var config = Config(storage)
     assert.ok(config.identities.list() instanceof Array, 'identities list defaults to empty Array')
     assert.ok(config.groups.list() instanceof Array, 'groups list defaults to empty Array')
     next()
@@ -34,11 +34,11 @@ describe('add', (context) => {
   })
 
   context.afterEach((c) => {
-    cleanup(storage.root)
+    cleanup(storage)
   })
 
   context('byKey', (assert, next) => {
-    var config = Config(storage.path)
+    var config = Config(storage)
     var group = crypto.unpack(crypto.accessKey())
     var identity = crypto.keyPair()
 
@@ -47,7 +47,7 @@ describe('add', (context) => {
 
     config.save()
 
-    var reload = yaml.safeLoad(fs.readFileSync(path.join(storage.path, 'config.yml')))
+    var reload = yaml.safeLoad(fs.readFileSync(path.join(storage, 'config.yml')))
     var rawGroup = reload.groups.byKey[group.publicKey.toString('hex')]
     var rawIdentity = reload.identities.byKey[identity.publicKey.toString('hex')]
 
@@ -57,7 +57,7 @@ describe('add', (context) => {
   })
 
   context('byName', (assert, next) => {
-    var config = Config(storage.path)
+    var config = Config(storage)
     var group = Object.assign({ name: 'group-a' }, crypto.unpack(crypto.accessKey()))
     var identity = Object.assign({ name: 'Alice' }, crypto.keyPair())
 
@@ -66,7 +66,7 @@ describe('add', (context) => {
 
     config.save()
 
-    var reload = yaml.safeLoad(fs.readFileSync(path.join(storage.path, 'config.yml')))
+    var reload = yaml.safeLoad(fs.readFileSync(path.join(storage, 'config.yml')))
     var rawGroup = reload.groups.byKey[group.publicKey.toString('hex')]
     var rawIdentity = reload.identities.byKey[identity.publicKey.toString('hex')]
 
@@ -75,7 +75,7 @@ describe('add', (context) => {
     assert.ok(rawIdentity.name, 'saves identity with a name')
     assert.same(config.identities.get(identity.name), rawIdentity, 'saves identities to storage')
 
-    var reload = Config(storage.path)
+    var reload = Config(storage)
 
     assert.same(reload._groups, config._groups, 'load groups from storage')
     assert.same(reload._identities, config._identities, 'load identities from storage')
@@ -91,11 +91,11 @@ describe('get', (context) => {
   })
 
   context.afterEach((c) => {
-    cleanup(storage.root)
+    cleanup(storage)
   })
 
   context('works with buffers or strings', (assert, next) => {
-    var config = Config(storage.path)
+    var config = Config(storage)
     var group = crypto.unpack(crypto.accessKey())
     var identity = crypto.keyPair()
 
@@ -121,11 +121,11 @@ describe('remove', (context) => {
   })
 
   context.afterEach((c) => {
-    cleanup(storage.root)
+    cleanup(storage)
   })
 
   context('removes relevant entry using buffers', (assert, next) => {
-    var config = Config(storage.path)
+    var config = Config(storage)
     var group = crypto.unpack(crypto.accessKey())
     var identity = crypto.keyPair()
 
@@ -144,7 +144,7 @@ describe('remove', (context) => {
   })
 
   context('removes relevant entry using buffers', (assert, next) => {
-    var config = Config(storage.path)
+    var config = Config(storage)
     var group = crypto.unpack(crypto.accessKey())
     var identity = crypto.keyPair()
 
@@ -163,7 +163,7 @@ describe('remove', (context) => {
   })
 
   context('removes relevant entry using names', (assert, next) => {
-    var config = Config(storage.path)
+    var config = Config(storage)
     var group = Object.assign({ name: 'group-a' }, crypto.unpack(crypto.accessKey()))
     var identity = Object.assign({ name: 'Alice' }, crypto.keyPair())
 

test/util.js

@@ -1,21 +1,41 @@
 const tmpdir = require('tmp').dirSync
 const mkdirp = require('mkdirp')
 const rimraf = require('rimraf')
-const debug = require('debug')('cobox-config')
 
-function cleanup (dir) {
-  rimraf(dir, (err) => {
-    debug(`[CLEANUP] ${ err ? 'failed' : 'success'}`)
-    if (err) throw (err)
-  })
+function cleanup (dirs, cb) {
+  if (!cb) cb = noop
+  if (!Array.isArray(dirs)) dirs = [dirs]
+  var pending = 1
+
+  function next (n) {
+    var dir = dirs[n]
+    if (!dir) return done()
+    ++pending
+    process.nextTick(next, n + 1)
+
+    rimraf(dir, (err) => {
+      if (err) return done(err)
+      done()
+    })
+  }
+
+  function done (err) {
+    if (err) {
+      pending = Infinity
+      return cb(err)
+    }
+    if (!--pending) return cb()
+  }
+
+  next(0)
 }
 
 function tmp () {
-  var root = `./tmp/`
-  var path = `.${tmpdir().name}`
+  var path = tmpdir().name
   mkdirp.sync(path)
-  debug(`[TEMP] ${path}`)
-  return { path, root }
+  return path
 }
 
+function noop () {}
+
 module.exports = { cleanup, tmp }