merge appdb.js into apps.js

src/routes/test/common.js

@@ -12,7 +12,8 @@ const async = require('async'),
     settings = require('../../settings.js'),
     support = require('../../support.js'),
     superagent = require('superagent'),
-    tokens = require('../../tokens.js');
+    tokens = require('../../tokens.js'),
+    util = require('util');
 
 exports = module.exports = {
     setup,
@@ -49,7 +50,7 @@ exports = module.exports = {
 function setupServer(done) {
     async.series([
         server.start.bind(null),
-        database._clear.bind(null),
+        database._clear,
         settings._setApiServerOrigin.bind(null, exports.mockApiServerOrigin),
     ], done);
 }
@@ -109,12 +110,9 @@ function setup(done) {
     ], done);
 }
 
-function cleanup(done) {
-    database._clear(function (error) {
-        expect(!error).to.be.ok();
-
-        server.stop(done);
-    });
+async function cleanup() {
+    await database._clear();
+    await util.promisify(server.stop)();
 }
 
 function clearMailQueue() {