From 9bda8031d059a1d574351636a02cdc8fb31a087e Mon Sep 17 00:00:00 2001
From: coderaiser <coderaiser@cloudcmd.io>
Date: Fri, 20 Apr 2018 15:02:21 +0300
Subject: [PATCH] test(console) before -> connect

---
 test/server/console.js | 85 ++++++++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/test/server/console.js b/test/server/console.js
index baef0184..925c4ad1 100644
--- a/test/server/console.js
+++ b/test/server/console.js
@@ -6,55 +6,60 @@ const test = require('tape');
 const io = require('socket.io-client');
 
 const configPath = path.join(__dirname, '../..', 'server', 'config');
-const before = require('../before');
+const {connect} = require('../before');
 const configFn = require(configPath);
 
-test('cloudcmd: console: enabled by default', (t) => {
+test('cloudcmd: console: enabled by default',async (t) => {
     const config = {
         auth: false
     };
     
-    before({config}, (port, after) => {
-        const socket = io(`http://localhost:${port}/console`);
-        socket.emit('auth', configFn('username'), configFn('password'));
-        
-        socket.once('data', (data) => {
-            socket.close();
-            t.equal(data, 'client #1 console connected\n', 'should emit data event');
-            after();
-            t.end();
-        });
-    });
-});
-
-test('cloudcmd: console: enabled', (t) => {
-    const config = {console: true};
+    const {port, done} = await connect({config});
     
-    before({config}, (port, after) => {
-        const socket = io(`http://localhost:${port}/console`);
-        socket.emit('auth', configFn('username'), configFn('password'));
-        
-        socket.once('data', (data) => {
-            socket.close();
-            t.equal(data, 'client #1 console connected\n', 'should emit data event');
-            after();
-            t.end();
-        });
-    });
-});
-
-test('cloudcmd: console: disabled', (t) => {
-    const config = {console: false};
+    const socket = io(`http://localhost:${port}/console`);
+    socket.emit('auth', configFn('username'), configFn('password'));
     
-    before({config}, (port, after) => {
-        const socket = io(`http://localhost:${port}/console`);
+    socket.once('data', (data) => {
+        socket.close();
+        done();
         
-        socket.on('error', (error) => {
-            t.equal(error, 'Invalid namespace', 'should emit error');
-            socket.close();
-            after();
-            t.end();
-        });
+        t.equal(data, 'client #1 console connected\n', 'should emit data event');
+        t.end();
+    });
+});
+
+test('cloudcmd: console: enabled', async (t) => {
+    const config = {
+        console: true,
+    };
+    
+    const {port, done} = await connect({config});
+    const socket = io(`http://localhost:${port}/console`);
+    
+    socket.emit('auth', configFn('username'), configFn('password'));
+    socket.once('data', (data) => {
+        done();
+        socket.close();
+        
+        t.equal(data, 'client #1 console connected\n', 'should emit data event');
+        t.end();
+    });
+});
+
+test('cloudcmd: console: disabled', async (t) => {
+    const config = {
+        console: false,
+    };
+    
+    const {port, done} = await connect({config});
+    const socket = io(`http://localhost:${port}/console`);
+    
+    socket.on('error', (error) => {
+        socket.close();
+        done();
+        
+        t.equal(error, 'Invalid namespace', 'should emit error');
+        t.end();
     });
 });