mailboxdb: merge into mail.js

src/test/common.js

@@ -10,8 +10,6 @@ const appdb = require('../appdb.js'),
     domains = require('../domains.js'),
     expect = require('expect.js'),
     fs = require('fs'),
-    mail = require('../mail.js'),
-    mailboxdb = require('../mailboxdb.js'),
     mailer = require('../mailer.js'),
     nock = require('nock'),
     path = require('path'),
@@ -133,11 +131,6 @@ exports = module.exports = {
     manifest,
     user,
     appstoreToken: 'atoken',
-
-    mailboxName: 'support',
-    mailbox: `support@${domain.domain}`,
-    mailAliasName: 'alsosupport',
-    mailAlias: `alsosupport@${domain.domain}`
 };
 
 function createTree(root, obj) {
@@ -197,8 +190,6 @@ function setup(done) {
             const result = await users.add(user.email, user, auditSource);
             user.id = result;
         },
-        (done) => mailboxdb.addMailbox(exports.mailboxName, domain.domain, { ownerId: user.id, ownerType: mail.OWNERTYPE_USER, active: true }, done),
-        (done) => mailboxdb.setAliasesForName(exports.mailboxName, domain.domain, [ { name: exports.mailAliasName, domain: domain.domain} ], done),
 
         tasks.stopAllTasks,
     ], done);