diff --git a/core/server/mail/index.js b/core/server/mail/index.js
index b10a537487..048d678a59 100644
--- a/core/server/mail/index.js
+++ b/core/server/mail/index.js
@@ -62,19 +62,15 @@ GhostMailer.prototype.getDomain = function () {
// This assumes that api.settings.read('email') was already done on the API level
GhostMailer.prototype.send = function (message) {
var self = this,
- to,
- sendMail;
+ to;
- message = message || {};
+ // important to clone message as we modify it
+ message = _.clone(message) || {};
to = message.to || false;
- if (!this.transport) {
- return Promise.reject(new Error(i18n.t('errors.mail.noEmailTransportConfigured.error')));
- }
if (!(message && message.subject && message.html && message.to)) {
return Promise.reject(new Error(i18n.t('errors.mail.incompleteMessageData.error')));
}
- sendMail = Promise.promisify(self.transport.sendMail.bind(self.transport));
message = _.extend(message, {
from: self.from(),
@@ -84,7 +80,7 @@ GhostMailer.prototype.send = function (message) {
});
return new Promise(function (resolve, reject) {
- sendMail(message, function (error, response) {
+ self.transport.sendMail(message, function (error, response) {
if (error) {
return reject(new Error(error));
}
diff --git a/core/server/translations/en.json b/core/server/translations/en.json
index e5911bde29..a54bafdc4d 100644
--- a/core/server/translations/en.json
+++ b/core/server/translations/en.json
@@ -191,9 +191,6 @@
}
},
"mail": {
- "noEmailTransportConfigured": {
- "error": "Error: No email transport configured."
- },
"incompleteMessageData": {
"error": "Error: Incomplete message data."
},
diff --git a/core/test/integration/api/api_mail_spec.js b/core/test/integration/api/api_mail_spec.js
index e46bb28601..564688e300 100644
--- a/core/test/integration/api/api_mail_spec.js
+++ b/core/test/integration/api/api_mail_spec.js
@@ -4,21 +4,13 @@ var testUtils = require('../../utils'),
should = require('should'),
config = require('../../../server/config'),
mailer = require('../../../server/mail'),
- i18n = require('../../../../core/server/i18n'),
+ i18n = require('../../../../core/server/i18n'),
// Stuff we are testing
MailAPI = require('../../../server/api/mail'),
- mailDataNoDomain = {
- mail: [{
- message: {
- to: 'joe@doesntexistexample091283zalgo.com',
- subject: 'testemail',
- html: 'This
'
- },
- options: {}
- }]
- },
- mailDataNoServer = {
+
+ // test data
+ mailData = {
mail: [{
message: {
to: 'joe@example.com',
@@ -27,15 +19,6 @@ var testUtils = require('../../utils'),
},
options: {}
}]
- },
- mailDataIncomplete = {
- mail: [{
- message: {
- subject: 'testemail',
- html: 'This
'
- },
- options: {}
- }]
};
i18n.init();
@@ -46,106 +29,34 @@ describe('Mail API', function () {
should.exist(MailAPI);
- describe('Nothing configured', function () {
- it('return no email configured', function (done) {
- MailAPI.send(mailDataNoServer, testUtils.context.internal).then(function (response) {
- /*jshint unused:false */
- done();
- }).catch(function (error) {
- error.message.should.eql('Error: No email transport configured.');
- error.errorType.should.eql('EmailError');
- done();
- }).catch(done);
- });
+ it('returns a success', function (done) {
+ config.set({mail: {transport: 'stub'}});
- it('return no email configured even when sending incomplete data', function (done) {
- MailAPI.send(mailDataIncomplete, testUtils.context.internal).then(function (response) {
- /*jshint unused:false */
- done();
- }).catch(function (error) {
- error.message.should.eql('Error: No email transport configured.');
- error.errorType.should.eql('EmailError');
- done();
- }).catch(done);
- });
+ mailer.init().then(function () {
+ mailer.transport.transportType.should.eql('STUB');
+ return MailAPI.send(mailData, testUtils.context.internal);
+ }).then(function (response) {
+ should.exist(response.mail);
+ should.exist(response.mail[0].message);
+ should.exist(response.mail[0].status);
+
+ response.mail[0].message.subject.should.eql('testemail');
+ done();
+ }).catch(done);
});
- describe('Mail API Direct', function () {
- before(function (done) {
- config.set({mail: {}});
+ it('returns a boo boo', function (done) {
+ config.set({mail: {transport: 'stub', options: {error: 'Stub made a boo boo :('}}});
- mailer.init().then(function () {
- done();
- });
- });
-
- it('return correct failure message for domain doesn\'t exist', function (done) {
- mailer.transport.transportType.should.eql('DIRECT');
- return MailAPI.send(mailDataNoDomain, testUtils.context.internal).then(function () {
- done(new Error('Error message not shown.'));
- }, function (error) {
- error.message.should.startWith('Error: Failed to send email');
- error.errorType.should.eql('EmailError');
- done();
- }).catch(done);
- });
-
- // This test doesn't work properly - it times out locally
- it.skip('return correct failure message for no mail server at this address', function (done) {
- mailer.transport.transportType.should.eql('DIRECT');
- MailAPI.send(mailDataNoServer, testUtils.context.internal).then(function () {
- done(new Error('Error message not shown.'));
- }, function (error) {
- error.message.should.eql('Error: Failed to send email.');
- error.errorType.should.eql('EmailError');
- done();
- }).catch(done);
- });
-
- it('return correct failure message for incomplete data', function (done) {
- mailer.transport.transportType.should.eql('DIRECT');
-
- MailAPI.send(mailDataIncomplete, testUtils.context.internal).then(function () {
- done(new Error('Error message not shown.'));
- }, function (error) {
- error.message.should.eql('Error: Incomplete message data.');
- error.errorType.should.eql('EmailError');
- done();
- }).catch(done);
- });
- });
-
- describe.skip('Stub', function () {
- it('returns a success', function (done) {
- config.set({mail: {transport: 'stub'}});
-
- mailer.init().then(function () {
- mailer.transport.transportType.should.eql('STUB');
- return MailAPI.send(mailDataNoServer, testUtils.context.internal);
- }).then(function (response) {
- should.exist(response.mail);
- should.exist(response.mail[0].message);
- should.exist(response.mail[0].status);
- response.mail[0].status.should.eql({message: 'Message Queued'});
- response.mail[0].message.subject.should.eql('testemail');
- done();
- }).catch(done);
- });
-
- it('returns a boo boo', function (done) {
- config.set({mail: {transport: 'stub', error: 'Stub made a boo boo :('}});
-
- mailer.init().then(function () {
- mailer.transport.transportType.should.eql('STUB');
- return MailAPI.send(mailDataNoServer, testUtils.context.internal);
- }).then(function (response) {
- console.log('res', response.mail[0]);
- done(new Error('Stub did not error'));
- }, function (error) {
- error.message.should.startWith('Error: Failed to send email - no mail server found at');
- error.errorType.should.eql('EmailError');
- done();
- }).catch(done);
- });
+ mailer.init().then(function () {
+ mailer.transport.transportType.should.eql('STUB');
+ return MailAPI.send(mailData, testUtils.context.internal);
+ }).then(function () {
+ done(new Error('Stub did not error'));
+ }).catch(function (error) {
+ error.message.should.startWith('Error: Stub made a boo boo :(');
+ error.errorType.should.eql('EmailError');
+ done();
+ }).catch(done);
});
});
diff --git a/core/test/unit/mail_spec.js b/core/test/unit/mail_spec.js
index 5d73c83f54..511abf9b4d 100644
--- a/core/test/unit/mail_spec.js
+++ b/core/test/unit/mail_spec.js
@@ -1,4 +1,4 @@
-/*globals describe, afterEach, it*/
+/*globals describe, afterEach, beforeEach, it*/
/*jshint expr:true*/
var should = require('should'),
Promise = require('bluebird'),
@@ -8,20 +8,35 @@ var should = require('should'),
configUtils = require('../utils/configUtils'),
i18n = require('../../server/i18n'),
- SMTP;
-i18n.init();
-
-// Mock SMTP config
-SMTP = {
- transport: 'SMTP',
- options: {
- service: 'Gmail',
- auth: {
- user: 'nil',
- pass: '123'
+ // Mock SMTP config
+ SMTP = {
+ transport: 'SMTP',
+ options: {
+ service: 'Gmail',
+ auth: {
+ user: 'nil',
+ pass: '123'
+ }
}
- }
-};
+ },
+
+ // test data
+ mailDataNoDomain = {
+ to: 'joe@doesntexistexample091283zalgo.com',
+ subject: 'testemail',
+ html: 'This
'
+ },
+ mailDataNoServer = {
+ to: 'joe@example.com',
+ subject: 'testemail',
+ html: 'This
'
+ },
+ mailDataIncomplete = {
+ subject: 'testemail',
+ html: 'This
'
+ };
+
+i18n.init();
describe('Mail', function () {
afterEach(function () {
@@ -54,6 +69,34 @@ describe('Mail', function () {
}).catch(done);
});
+ it('sends valid message successfully ', function (done) {
+ configUtils.set({mail: {transport: 'stub'}});
+
+ mailer.init().then(function () {
+ mailer.transport.transportType.should.eql('STUB');
+ return mailer.send(mailDataNoServer);
+ }).then(function (response) {
+ should.exist(response.message);
+ should.exist(response.envelope);
+ response.envelope.to.should.containEql('joe@example.com');
+ done();
+ }).catch(done);
+ });
+
+ it('handles failure', function (done) {
+ configUtils.set({mail: {transport: 'stub', options: {error: 'Stub made a boo boo :('}}});
+
+ mailer.init().then(function () {
+ mailer.transport.transportType.should.eql('STUB');
+ return mailer.send(mailDataNoServer);
+ }).then(function () {
+ done(new Error('Stub did not error'));
+ }).catch(function (error) {
+ error.message.should.eql('Error: Stub made a boo boo :(');
+ done();
+ }).catch(done);
+ });
+
it('should fail to send messages when given insufficient data', function (done) {
Promise.settle([
mailer.send(),
@@ -70,60 +113,110 @@ describe('Mail', function () {
}).catch(done);
});
- it('should use from address as configured in config.js', function () {
- configUtils.set({
- mail: {
- from: '"Blog Title" '
- }
+ describe('Direct', function () {
+ beforeEach(function (done) {
+ configUtils.set({mail: {}});
+
+ mailer.init().then(function () {
+ done();
+ });
+ });
+
+ it('return correct failure message for domain doesn\'t exist', function (done) {
+ mailer.transport.transportType.should.eql('DIRECT');
+
+ mailer.send(mailDataNoDomain).then(function () {
+ done(new Error('Error message not shown.'));
+ }, function (error) {
+ error.message.should.startWith('Error: Failed to send email');
+ done();
+ }).catch(done);
+ });
+
+ it('return correct failure message for no mail server at this address', function (done) {
+ mailer.transport.transportType.should.eql('DIRECT');
+
+ mailer.send(mailDataNoServer).then(function () {
+ done(new Error('Error message not shown.'));
+ }, function (error) {
+ error.message.should.eql('Error: Failed to send email.');
+ done();
+ }).catch(done);
+ });
+
+ it('return correct failure message for incomplete data', function (done) {
+ mailer.transport.transportType.should.eql('DIRECT');
+
+ mailer.send(mailDataIncomplete).then(function () {
+ done(new Error('Error message not shown.'));
+ }, function (error) {
+ error.message.should.eql('Error: Incomplete message data.');
+ done();
+ }).catch(done);
});
- mailer.from().should.equal('"Blog Title" ');
});
- it('should fall back to [blog.title] as from address', function () {
- // Standard domain
- configUtils.set({url: 'http://default.com', mail: {from: null}, theme: {title: 'Test'}});
- mailer.from().should.equal('"Test" ');
+ describe('From address', function () {
+ it('should use the config', function () {
+ configUtils.set({
+ mail: {
+ from: '"Blog Title" '
+ }
+ });
+ mailer.from().should.equal('"Blog Title" ');
+ });
- // Trailing slash
- configUtils.set({url: 'http://default.com/', mail: {from: null}, theme: {title: 'Test'}});
- mailer.from().should.equal('"Test" ');
+ it('should fall back to [blog.title] ', function () {
+ // Standard domain
+ configUtils.set({url: 'http://default.com', mail: {from: null}, theme: {title: 'Test'}});
+ mailer.from().should.equal('"Test" ');
- // Strip Port
- configUtils.set({url: 'http://default.com:2368/', mail: {from: null}, theme: {title: 'Test'}});
- mailer.from().should.equal('"Test" ');
- });
+ // Trailing slash
+ configUtils.set({url: 'http://default.com/', mail: {from: null}, theme: {title: 'Test'}});
+ mailer.from().should.equal('"Test" ');
- it('should use mail.from if both from and fromaddress are present', function () {
- // Standard domain
- configUtils.set({mail: {from: '"bar" ', fromaddress: '"Qux" '}});
- mailer.from().should.equal('"bar" ');
- });
+ // Strip Port
+ configUtils.set({url: 'http://default.com:2368/', mail: {from: null}, theme: {title: 'Test'}});
+ mailer.from().should.equal('"Test" ');
+ });
- it('should attach blog title if from or fromaddress are only email addresses', function () {
- // from and fromaddress are both set
- configUtils.set({mail: {from: 'from@default.com', fromaddress: 'fa@default.com'}, theme: {title: 'Test'}});
- mailer.from().should.equal('"Test" ');
+ it('should use mail.from if both from and fromaddress are present', function () {
+ // Standard domain
+ configUtils.set({mail: {from: '"bar" ', fromaddress: '"Qux" '}});
+ mailer.from().should.equal('"bar" ');
+ });
- // only from set
- configUtils.set({mail: {from: 'from@default.com', fromaddress: null}, theme: {title: 'Test'}});
- mailer.from().should.equal('"Test" ');
+ it('should attach blog title if from or fromaddress are only email addresses', function () {
+ // from and fromaddress are both set
+ configUtils.set({mail: {from: 'from@default.com', fromaddress: 'fa@default.com'}, theme: {title: 'Test'}});
+ mailer.from().should.equal('"Test" ');
- // only fromaddress set
- configUtils.set({mail: {from: null, fromaddress: 'fa@default.com'}, theme: {title: 'Test'}});
- mailer.from().should.equal('"Test" ');
- });
+ // only from set
+ configUtils.set({mail: {from: 'from@default.com', fromaddress: null}, theme: {title: 'Test'}});
+ mailer.from().should.equal('"Test" ');
- it('should ignore theme title if from address is Title format', function () {
- // from and fromaddress are both set
- configUtils.set({mail: {from: '"R2D2" ', fromaddress: '"C3PO" '}, theme: {title: 'Test'}});
- mailer.from().should.equal('"R2D2" ');
+ // only fromaddress set
+ configUtils.set({mail: {from: null, fromaddress: 'fa@default.com'}, theme: {title: 'Test'}});
+ mailer.from().should.equal('"Test" ');
+ });
- // only from set
- configUtils.set({mail: {from: '"R2D2" ', fromaddress: null}, theme: {title: 'Test'}});
- mailer.from().should.equal('"R2D2" ');
+ it('should ignore theme title if from address is Title format', function () {
+ // from and fromaddress are both set
+ configUtils.set({mail: {from: '"R2D2" ', fromaddress: '"C3PO" '}, theme: {title: 'Test'}});
+ mailer.from().should.equal('"R2D2" ');
- // only fromaddress set
- configUtils.set({mail: {from: null, fromaddress: '"C3PO" '}, theme: {title: 'Test'}});
- mailer.from().should.equal('"C3PO" ');
+ // only from set
+ configUtils.set({mail: {from: '"R2D2" ', fromaddress: null}, theme: {title: 'Test'}});
+ mailer.from().should.equal('"R2D2" ');
+
+ // only fromaddress set
+ configUtils.set({mail: {from: null, fromaddress: '"C3PO" '}, theme: {title: 'Test'}});
+ mailer.from().should.equal('"C3PO" ');
+ });
+
+ it('should use default title if not theme title is provided', function () {
+ configUtils.set({url: 'http://default.com:2368/', mail: {from: null}, theme: {title: null}});
+ mailer.from().should.equal('"Ghost at default.com" ');
+ });
});
});