Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-06 22:40:14 -05:00
Code Issues Activity

🔥 fromaddress support (#8753)

Browse source 
refs #8748

- please use `from`
- documentation was already updated
This commit is contained in:
Katharina Irrgang 2017-07-27 12:27:38 +04:00 committed by Kevin Ansfield
parent 0698be503a
commit 948c279f60
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/server/mail/GhostMailer.js
View file

@ -19,7 +19,7 @@ function GhostMailer() {
}
GhostMailer.prototype.from = function () {
var from = config.get('mail') && (config.get('mail').from || config.get('mail').fromaddress),
var from = config.get('mail') && config.get('mail').from,
defaultBlogTitle;
// If we don't have a from address at all

24
core/test/unit/mail/GhostMailer_spec.js
View file

@ -204,49 +204,39 @@ describe('Mail: Ghostmailer', function () {
mailer.from().should.equal('"Test\\"" <ghost@default.com>');
});
it('should use mail.from if both from and fromaddress are present', function () {
it('should use mail.from', function () {
// Standard domain
configUtils.set({mail: {from: '"bar" <from@default.com>', fromaddress: '"Qux" <fa@default.com>'}});
configUtils.set({mail: {from: '"bar" <from@default.com>'}});
mailer = new mail.GhostMailer();
mailer.from().should.equal('"bar" <from@default.com>');
});
it('should attach blog title if from or fromaddress are only email addresses', function () {
it('should attach blog title', function () {
sandbox.stub(settingsCache, 'get').returns('Test');
// from and fromaddress are both set
configUtils.set({mail: {from: 'from@default.com', fromaddress: 'fa@default.com'}});
configUtils.set({mail: {from: 'from@default.com'}});
mailer = new mail.GhostMailer();
mailer.from().should.equal('"Test" <from@default.com>');
// only from set
configUtils.set({mail: {from: 'from@default.com', fromaddress: null}});
configUtils.set({mail: {from: 'from@default.com'}});
mailer.from().should.equal('"Test" <from@default.com>');
// only fromaddress set
configUtils.set({mail: {from: null, fromaddress: 'fa@default.com'}});
mailer.from().should.equal('"Test" <fa@default.com>');
});
it('should ignore theme title if from address is Title <email@address.com> format', function () {
// from and fromaddress are both set
configUtils.set({mail: {from: '"R2D2" <from@default.com>', fromaddress: '"C3PO" <fa@default.com>'}});
configUtils.set({mail: {from: '"R2D2" <from@default.com>'}});
mailer = new mail.GhostMailer();
mailer.from().should.equal('"R2D2" <from@default.com>');
// only from set
configUtils.set({mail: {from: '"R2D2" <from@default.com>', fromaddress: null}});
configUtils.set({mail: {from: '"R2D2" <from@default.com>'}});
mailer.from().should.equal('"R2D2" <from@default.com>');
// only fromaddress set
configUtils.set({mail: {from: null, fromaddress: '"C3PO" <fa@default.com>'}});
mailer.from().should.equal('"C3PO" <fa@default.com>');
});
it('should use default title if not theme title is provided', function () {