merge domaindb.js into domains.js

src/test/common.js

@@ -116,19 +116,20 @@ const app = {
 exports = module.exports = {
     createTree,
     domainSetup,
+    databaseSetup,
     setup,
     cleanup,
     checkMails,
     clearMailQueue,
 
     mockApiServerOrigin: 'http://localhost:6060',
-    dashboardDomain: 'test.example.com',
-    dashboardFqdn: 'my.test.example.com',
+    dashboardDomain: domain.domain,
+    dashboardFqdn: `my.${domain.domain}`,
 
     app,
     admin,
     auditSource,
-    domain,
+    domain, // the domain object
     manifest,
     user,
     appstoreToken: 'atoken',
@@ -161,7 +162,7 @@ function createTree(root, obj) {
     createSubTree(obj, root);
 }
 
-function domainSetup(done) {
+function databaseSetup(done) {
     nock.cleanAll();
 
     async.series([
@@ -171,6 +172,14 @@ function domainSetup(done) {
         settings.setDashboardLocation.bind(null, exports.dashboardDomain, exports.dashboardFqdn),
         settings.initCache,
         blobs.initSecrets,
+    ], done);
+}
+
+function domainSetup(done) {
+    nock.cleanAll();
+
+    async.series([
+        databaseSetup,
         domains.add.bind(null, domain.domain, domain, auditSource),
     ], done);
 }