merge appdb.js into apps.js

src/test/common.js

@@ -1,7 +1,6 @@
 'use strict';
 
-const appdb = require('../appdb.js'),
-    apps = require('../apps.js'),
+const apps = require('../apps.js'),
     async = require('async'),
     blobs = require('../blobs.js'),
     constants = require('../constants.js'),
@@ -55,6 +54,7 @@ const domain = {
     tlsConfig: { provider: 'fallback' },
     wellKnown: null
 };
+Object.freeze(domain);
 
 const auditSource = { ip: '1.2.3.4' };
 
@@ -109,6 +109,7 @@ const app = {
     alternateDomains: [],
     aliasDomains: []
 };
+Object.freeze(app);
 
 exports = module.exports = {
     createTree,
@@ -154,26 +155,22 @@ function createTree(root, obj) {
     createSubTree(obj, root);
 }
 
-function databaseSetup(done) {
+async function databaseSetup() {
     nock.cleanAll();
 
-    async.series([
-        database.initialize,
-        database._clear,
-        settings._setApiServerOrigin.bind(null, exports.mockApiServerOrigin),
-        settings.setDashboardLocation.bind(null, exports.dashboardDomain, exports.dashboardFqdn),
-        settings.initCache,
-        blobs.initSecrets,
-    ], done);
+    await database.initialize();
+    await database._clear();
+    await settings._setApiServerOrigin(exports.mockApiServerOrigin);
+    await settings.setDashboardLocation(exports.dashboardDomain, exports.dashboardFqdn);
+    await settings.initCache();
+    await blobs.initSecrets();
 }
 
-function domainSetup(done) {
+async function domainSetup() {
     nock.cleanAll();
 
-    async.series([
-        databaseSetup,
-        domains.add.bind(null, domain.domain, domain, auditSource),
-    ], done);
+    await databaseSetup();
+    await domains.add(domain.domain, domain, auditSource);
 }
 
 function setup(done) {
@@ -183,7 +180,7 @@ function setup(done) {
             const result = await users.createOwner(admin.email, admin.username, admin.password, admin.displayName, auditSource);
             admin.id = result;
         },
-        appdb.add.bind(null, app.id, app.appStoreId, app.manifest, app.location, app.domain, app.portBindings, app),
+        apps.add.bind(null, app.id, app.appStoreId, app.manifest, app.location, app.domain, app.portBindings, app),
         settings._set.bind(null, settings.CLOUDRON_TOKEN_KEY, exports.appstoreToken), // appstore token
         async function createUser() {
             const result = await users.add(user.email, user, auditSource);
@@ -194,14 +191,12 @@ function setup(done) {
     ], done);
 }
 
-function cleanup(done) {
+async function cleanup() {
     nock.cleanAll();
     mailer._mailQueue = [];
 
-    async.series([
-        database._clear,
-        database.uninitialize
-    ], done);
+    await database._clear();
+    await database.uninitialize();
 }
 
 function clearMailQueue() {