return promises in before/after each

.taprc

@@ -1,6 +1,2 @@
-esm: false
-jsx: false
-ts: false
-
 files:
   - 'test/**/*.test.js'

test/client.test.js

@@ -14,7 +14,8 @@ const LDAP_CONNECT_TIMEOUT = process.env.LDAP_CONNECT_TIMEOUT || 0
 const BIND_DN = 'cn=root'
 const BIND_PW = 'secret'
 
-tap.beforeEach((done, t) => {
+tap.beforeEach((t) => {
+  return new Promise(resolve => {
     t.context.socketPath = getSock()
     t.context.server = ldap.createServer()
 
@@ -320,14 +321,17 @@ tap.beforeEach((done, t) => {
         socketPath: t.context.socketPath
       })
       t.context.client = client
-    client.on('connect', () => done())
+      client.on('connect', () => resolve())
+    })
   })
 })
 
-tap.afterEach((done, t) => {
+tap.afterEach((t) => {
+  return new Promise(resolve => {
     t.context.client.unbind((err) => {
       t.error(err)
-    t.context.server.close(() => done())
+      t.context.server.close(() => resolve())
+    })
   })
 })
 

test/laundry.test.js

@@ -21,7 +21,8 @@ function search (t, options, callback) {
   })
 }
 
-tap.beforeEach((done, t) => {
+tap.beforeEach((t) => {
+  return new Promise((resolve, reject) => {
     const suffix = `dc=${uuid()}`
     const server = ldap.createServer()
 
@@ -57,19 +58,25 @@ tap.beforeEach((done, t) => {
       })
 
       t.context.client.on('connectError', (err) => {
-      t.context.server.close(() => done(err))
+        t.context.server.close(() => reject(err))
       })
       t.context.client.on('connect', (socket) => {
         t.context.socket = socket
-      done()
+        resolve()
+      })
     })
   })
 })
 
-tap.afterEach((done, t) => {
-  if (!t.context.client) return done()
+tap.afterEach((t) => {
+  return new Promise((resolve, reject) => {
+    if (!t.context.client) return resolve()
     t.context.client.unbind(() => {
-    t.context.server.close(done)
+      t.context.server.close((err) => {
+        if (err) return reject(err)
+        resolve()
+      })
+    })
   })
 })
 

test/server.test.js

@@ -8,11 +8,10 @@ const ldap = require('../lib')
 const SERVER_PORT = process.env.SERVER_PORT || 1389
 const SUFFIX = 'dc=test'
 
-tap.beforeEach(function (done, t) {
+tap.beforeEach(function (t) {
   // We do not need a `.afterEach` to clean up the sock files because that
   // is done when the server is destroyed.
   t.context.sock = getSock()
-  done()
 })
 
 tap.test('basic create', function (t) {