From acd4771012cc578b84309a145fcc4fa222324d9e Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Thu, 6 Mar 2014 15:11:29 -0500 Subject: [PATCH] dbmock changes --- mocks/databasemock.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/mocks/databasemock.js b/mocks/databasemock.js index abdf7fd97a..7a2a11ca60 100644 --- a/mocks/databasemock.js +++ b/mocks/databasemock.js @@ -57,6 +57,7 @@ var db = require('../src/database'), meta = require('../src/meta'); + before(function(done) { db.init(function(err) { @@ -65,21 +66,18 @@ if(err) { winston.error(err); throw new Error(err); - } else { - winston.info('test_database flushed'); - + } - meta.configs.init(function () { + winston.info('test_database flushed'); - var webserver = require('../src/webserver'), - sockets = require('../src/socket.io'); + meta.configs.init(function () { + var webserver = require('../src/webserver'), + sockets = require('../src/socket.io'); sockets.init(webserver.server); - - done(); - }); - } + done(); + }); }); }); });