tests: make some tests cleaner, use promise

test/standalone/connection-aborted.test.js

@@ -25,8 +25,9 @@ test('connection aborted', (done) => {
         'from .parse() callback: Error event should follow aborted',
       );
 
-      server.close();
-      done();
+      server.close(() => {
+        done();
+      });
     });
   });
 

test/standalone/content-transfer-encoding.test.js

@@ -9,17 +9,21 @@ const UPLOAD_DIR = join(process.cwd(), 'test', 'tmp');
 // OS choosing port
 const PORT = 13530;
 test('content transfer encoding', (done) => {
-  const server = createServer((req, res) => {
-    const form = formidable();
-    form.uploadDir = UPLOAD_DIR;
+  const server = createServer(async (req, res) => {
+    const form = formidable({
+      uploadDir: UPLOAD_DIR
+    });
     form.on('end', () => {
       throw new Error('Unexpected "end" event');
     });
     form.on('error', (e) => {
       res.writeHead(500);
       res.end(e.message);
     });
-    form.parse(req);
+    try {
+      await form.parse(req);
+    } catch (formidableError) {
+    }
   });
 
   server.listen(PORT, () => {

test/standalone/issue-46.test.js

@@ -10,13 +10,13 @@ const body = "LS1hN2E2NWI5OS04YTYxLTRlMmMtYjE0OS1mNzNhM2IzNWY5MjMNCmNvbnRlbnQtZG
 const buffer = Buffer.from(body, 'base64url');
 
 test("issue 46", (done) => {
-  const server = createServer((req, res) => {
+  const server = createServer(async (req, res) => {
     // Parse form and write results to response.
     const form = formidable();
-    form.parse(req, (err, fields, files) => {
-      ok(fields.foo, 'should have fields.foo === barry');
-      strictEqual(fields.foo[0], 'barry');
-      server.close();
+    const [fields] = await form.parse(req);
+    ok(fields.foo, 'should have fields.foo === barry');
+    strictEqual(fields.foo[0], 'barry');
+    server.close(() => {
       done();
     });
   });
@@ -35,5 +35,6 @@ test("issue 46", (done) => {
 
     req.write(buffer);
     req.end();
+
   });
 });

test/standalone/keep-alive-error.test.js

@@ -28,8 +28,9 @@ test('keep alive error', (done) => {
       // for client two
       strictEqual(ok, 1, `should "ok" count === 1, has: ${ok}`);
 
-      server.close();
-      done();
+      server.close(() => {
+        done();
+      });
     } catch (formidableError) {
       strictEqual(errors, 1, `should "errors" === 1, has: ${errors}`);