diff --git a/src/mailer.js b/src/mailer.js index 59cfbc0b4..b86a05b78 100644 --- a/src/mailer.js +++ b/src/mailer.js @@ -60,6 +60,19 @@ function splatchError(error) { return util.inspect(result, { depth: null, showHidden: true }); } +function getAdminEmails(callback) { + users.getAllAdmins(function (error, admins) { + if (error) return callback(error); + + if (admins.length === 0) return callback(new Error('No admins on this cloudron')); // box not activated yet + + var adminEmails = [ ]; + admins.forEach(function (admin) { adminEmails.push(admin.email); }); + + callback(null, adminEmails); + }); +} + // This will collect the most common details required for notification emails function getMailConfig(callback) { assert.strictEqual(typeof callback, 'function'); @@ -157,20 +170,6 @@ function render(templateFile, params) { return content; } -function getAdminEmails(callback) { - users.getAllAdmins(function (error, admins) { - if (error) return callback(error); - - if (admins.length === 0) return callback(new Error('No admins on this cloudron')); // box not activated yet - - var adminEmails = [ ]; - adminEmails.push(admins[0].fallbackEmail); - admins.forEach(function (admin) { adminEmails.push(admin.email); }); - - callback(null, adminEmails); - }); -} - function mailUserEventToAdmins(user, event) { assert.strictEqual(typeof user, 'object'); assert.strictEqual(typeof event, 'string'); diff --git a/src/test/digest-test.js b/src/test/digest-test.js index d6ac87e9d..97c01cd28 100644 --- a/src/test/digest-test.js +++ b/src/test/digest-test.js @@ -123,7 +123,7 @@ describe('digest', function () { digest.maybeSend(function (error) { if (error) return done(error); - checkMails(1, `${USER_0.fallbackEmail}, ${USER_0.email}`, done); + checkMails(1, `${USER_0.email}`, done); }); }); @@ -133,7 +133,7 @@ describe('digest', function () { digest.maybeSend(function (error) { if (error) return done(error); - checkMails(1, `${USER_0.fallbackEmail}, ${USER_0.email}`, done); + checkMails(1, `${USER_0.email}`, done); }); }); @@ -146,7 +146,7 @@ describe('digest', function () { digest.maybeSend(function (error) { if (error) return done(error); - checkMails(1, `${USER_0.fallbackEmail}, ${USER_0.email}`, done); + checkMails(1, `${USER_0.email}`, done); }); }); });