jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Move mail related settings to new mail route

Browse Source 
there is quite a bit of circular dep between settings, platform and
mail code. this will be removed in future commits.
This commit is contained in:
Girish Ramakrishnan
2018-01-20 18:56:17 -08:00
parent e724913b6c
commit a7de17a160
15 changed files with 655 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/test/settings-test.js
View File

@@ -105,7 +105,7 @@ describe('Settings', function () {
});
it('can set backup config', function (done) {
var scope2 = nock(config.apiServerOrigin())
nock(config.apiServerOrigin())
.post('/api/v1/boxes/' + config.fqdn() + '/awscredentials?token=TOKEN')
.reply(201, { credentials: { AccessKeyId: 'accessKeyId', SecretAccessKey: 'secretAccessKey', SessionToken: 'sessionToken' } });
@@ -124,36 +124,6 @@ describe('Settings', function () {
});
});
it('can set mail config', function (done) {
settings.setMailConfig({ enabled: true }, function (error) {
expect(error).to.be(null);
done();
});
});
it('can get mail config', function (done) {
settings.getMailConfig(function (error, mailConfig) {
expect(error).to.be(null);
expect(mailConfig.enabled).to.be(true);
done();
});
});
it('can set mail from validation', function (done) {
settings.setMailFromValidation(true, function (error) {
expect(error).to.be(null);
done();
});
});
it('can get mail from validation', function (done) {
settings.getMailFromValidation(function (error, enabled) {
expect(error).to.be(null);
expect(enabled).to.be(true);
done();
});
});
it('can enable mail digest', function (done) {
settings.setEmailDigest(true, function (error) {
expect(error).to.be(null);
@@ -169,47 +139,6 @@ describe('Settings', function () {
});
});
it('can get mail relay', function (done) {
settings.getMailRelay(function (error, address) {
expect(error).to.be(null);
expect(address).to.eql({ provider: 'cloudron-smtp' });
done();
});
});
it('can set mail relay', function (done) {
var relay = { provider: 'external-smtp', host: 'mx.foo.com', port: 25 };
+ settingsdb.set(settings.MAIL_RELAY_KEY, JSON.stringify(relay), function (error) { // skip the mail server verify()
expect(error).to.be(null);
settings.getMailRelay(function (error, address) {
expect(error).to.be(null);
expect(address).to.eql(relay);
done();
});
});
});
it('can get catch all address', function (done) {
settings.getCatchAllAddress(function (error, address) {
expect(error).to.be(null);
expect(address).to.eql([ ]);
done();
});
});
it('can set catch all address', function (done) {
settings.setCatchAllAddress([ "user1", "user2" ], function (error) {
expect(error).to.be(null);
settings.getCatchAllAddress(function (error, address) {
expect(error).to.be(null);
expect(address).to.eql([ "user1", "user2" ]);
done();
});
});
});
it('can get all values', function (done) {
settings.getAll(function (error, allSettings) {
expect(error).to.be(null);