remove mailbox routes and move it to users

src/test/mailboxes-test.js

@@ -1,136 +0,0 @@
-/* global it:false */
-/* global describe:false */
-/* global before:false */
-/* global after:false */
-
-'use strict';
-
-var database = require('../database.js'),
-    expect = require('expect.js'),
-    mailboxes = require('../mailboxes.js'),
-    MailboxError = mailboxes.MailboxError,
-    hat = require('hat');
-
-function setup(done) {
-    // ensure data/config/mount paths
-    database.initialize(function (error) {
-        expect(error).to.be(null);
-
-        database._clear(done);
-    });
-}
-
-function cleanup(done) {
-    database._clear(done);
-}
-
-var MAILBOX_NAME = 'test';
-
-describe('Mailboxes', function () {
-    before(setup);
-    after(cleanup);
-
-    it('cannot create mailbox - too small', function (done) {
-        mailboxes.add('a', function (error) {
-            expect(error.reason).to.be(MailboxError.BAD_FIELD);
-            done();
-        });
-    });
-
-    it('cannot create mailbox - too big', function (done) {
-        mailboxes.add(new Array(129).join('a'), function (error) {
-            expect(error.reason).to.be(MailboxError.BAD_FIELD);
-            done();
-        });
-    });
-
-    it('cannot create mailbox - bad name', function (done) {
-        mailboxes.add('bad:name', function (error) {
-            expect(error.reason).to.be(MailboxError.BAD_FIELD);
-            done();
-        });
-    });
-
-    it('cannot create mailbox - reserved', function (done) {
-        mailboxes.add('no-reply', function (error) {
-            expect(error.reason).to.be(MailboxError.BAD_FIELD);
-            done();
-        });
-    });
-
-    it('can create valid mailbox', function (done) {
-        mailboxes.add(MAILBOX_NAME, function (error) {
-            expect(error).to.be(null);
-            done();
-        });
-    });
-
-    it('cannot add existing mailbox', function (done) {
-        mailboxes.add(MAILBOX_NAME, function (error) {
-            expect(error.reason).to.be(MailboxError.ALREADY_EXISTS);
-            done();
-        });
-    });
-
-    it('cannot get invalid mailbox', function (done) {
-        mailboxes.get('sometrandom', function (error) {
-            expect(error.reason).to.be(MailboxError.NOT_FOUND);
-            done();
-        });
-    });
-
-    it('can get valid mailbox', function (done) {
-        mailboxes.get(MAILBOX_NAME, function (error, group) {
-            expect(error).to.be(null);
-            expect(group.name).to.equal(MAILBOX_NAME);
-            done();
-        });
-    });
-
-    it('can set aliases', function (done) {
-        mailboxes.setAliases(MAILBOX_NAME, [ 'alias1', 'alias2' ], function (error) {
-            expect(error).to.be(null);
-            done();
-        });
-    });
-
-    it('can set subset alias', function (done) {
-        mailboxes.setAliases(MAILBOX_NAME, [ 'alias1' ], function (error) {
-            expect(error).to.be(null);
-            done();
-        });
-    });
-
-    it('can get aliases', function (done) {
-        mailboxes.getAliases(MAILBOX_NAME, function (error, aliases) {
-            expect(error).to.be(null);
-            expect(aliases[0]).to.be('alias1');
-            done();
-        });
-    });
-
-    it('can get aliases from mailbox', function (done) {
-        mailboxes.get(MAILBOX_NAME, function (error, group) {
-            expect(error).to.be(null);
-            expect(group.name).to.equal(MAILBOX_NAME);
-            expect(group.aliases.length).to.be(1);
-            expect(group.aliases[0]).to.be('alias1');
-            done();
-        });
-    });
-
-    it('cannot set self-referential alias', function (done) {
-        mailboxes.setAliases(MAILBOX_NAME, [ MAILBOX_NAME ], function (error) {
-            expect(error.reason).to.be(MailboxError.ALREADY_EXISTS);
-            done();
-        });
-    });
-
-    it('cannot delete invalid mailbox', function (done) {
-        mailboxes.del('random', function (error) {
-            expect(error.reason).to.be(MailboxError.NOT_FOUND);
-            done();
-        });
-    });
-});
-

src/test/user-test.js

@@ -12,6 +12,7 @@ var async = require('async'),
     fs = require('fs'),
     groupdb = require('../groupdb.js'),
     groups = require('../groups.js'),
+    mailboxdb = require('../mailboxdb.js'),
     mailer = require('../mailer.js'),
     user = require('../user.js'),
     userdb = require('../userdb.js'),
@@ -33,6 +34,7 @@ function cleanupUsers(done) {
     async.series([
         groupdb._clear,
         userdb._clear,
+        mailboxdb._clear,
         mailer._clearMailQueue
     ], done);
 }