From 23fefeb915051171991b8ad4cf0a8fc28d1228d6 Mon Sep 17 00:00:00 2001
From: Zack Schuster <email@zackschuster.com>
Date: Sat, 25 Apr 2020 13:17:35 -0700
Subject: [PATCH] test: use `.cb` for everything

---
 test/authplain.ts | 5 +++--
 test/authssl.ts   | 5 +++--
 test/message.ts   | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/test/authplain.ts b/test/authplain.ts
index b66c52f..322f5bc 100644
--- a/test/authplain.ts
+++ b/test/authplain.ts
@@ -38,7 +38,7 @@ const send = (
 	});
 };
 
-test.before(() => {
+test.beforeEach.cb((t) => {
 	server.listen(port, function () {
 		server.onAuth = function (auth, _session, callback) {
 			if (auth.username == 'pooh' && auth.password == 'honey') {
@@ -47,10 +47,11 @@ test.before(() => {
 				return callback(new Error('invalid user / pass'));
 			}
 		};
+		t.end();
 	});
 });
 
-test.after(() => server.close());
+test.afterEach.cb((t) => server.close(t.end));
 
 test.cb('authorize plain', (t) => {
 	const msg = {
diff --git a/test/authssl.ts b/test/authssl.ts
index cd5ae9c..f0d7a6b 100644
--- a/test/authssl.ts
+++ b/test/authssl.ts
@@ -36,7 +36,7 @@ const send = (
 	});
 };
 
-test.before(() => {
+test.before.cb((t) => {
 	process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // prevent CERT_HAS_EXPIRED errors
 
 	server.listen(port, function () {
@@ -47,10 +47,11 @@ test.before(() => {
 				return callback(new Error('invalid user / pass'));
 			}
 		};
+		t.end();
 	});
 });
 
-test.after(() => server.close());
+test.after.cb((t) => server.close(t.end));
 
 test.cb('authorize ssl', (t) => {
 	const msg = {
diff --git a/test/message.ts b/test/message.ts
index 0afb695..6ee2532 100644
--- a/test/message.ts
+++ b/test/message.ts
@@ -40,7 +40,7 @@ const send = (
 	});
 };
 
-test.before(() => {
+test.before.cb((t) => {
 	process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // prevent CERT_HAS_EXPIRED errors
 	server.listen(port, function () {
 		server.onAuth = function (auth, _session, callback) {
@@ -50,10 +50,11 @@ test.before(() => {
 				return callback(new Error('invalid user / pass'));
 			}
 		};
+		t.end();
 	});
 });
 
-test.after(() => server.close());
+test.after.cb((t) => server.close(t.end));
 
 test.cb('simple text message', (t) => {
 	const msg = {