Fixup various tests for multidomain

2017-11-11 03:06:57 +01:00
parent d4b6768464
commit 1ccc3b84b8
10 changed files with 100 additions and 33 deletions
--- a/src/test/apps-test.js
+++ b/src/test/apps-test.js
@@ -127,11 +127,12 @@ describe('Apps', function () {
    };

    before(function (done) {
+        config.setFqdn(DOMAIN_0.domain);

        async.series([
            database.initialize,
            database._clear,
-            domaindb.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.config),
+            // DOMAIN_0 already added for test through domaindb.addDefaultDomain()
            domaindb.add.bind(null, DOMAIN_1.domain, DOMAIN_1.zoneName, DOMAIN_1.config),
            userdb.add.bind(null, ADMIN_0.id, ADMIN_0),
            userdb.add.bind(null, USER_0.id, USER_0),