From b1cc7407eee344b3c57609537e8820f610bb6512 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Fri, 3 Jul 2015 14:24:24 -0300 Subject: [PATCH] remove subject from html templates --- lib/emailservice.js | 7 +++++-- test/integration/server.js | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/emailservice.js b/lib/emailservice.js index 7d5af8f..5ffe93d 100644 --- a/lib/emailservice.js +++ b/lib/emailservice.js @@ -109,8 +109,11 @@ EmailService.prototype.start = function(opts, cb) { }); }; -EmailService.prototype._compileTemplate = function(template) { +EmailService.prototype._compileTemplate = function(template, extension) { var lines = template.split('\n'); + if (extension == '.html') { + lines.unshift(''); + } return { subject: lines[0], body: _.rest(lines).join('\n'), @@ -135,7 +138,7 @@ EmailService.prototype._loadTemplate = function(emailType, recipient, extension, self._readTemplateFile(recipient.language, emailType.filename + extension, function(err, template) { if (err) return cb(err); - return cb(null, self._compileTemplate(template)); + return cb(null, self._compileTemplate(template, extension)); }); }; diff --git a/test/integration/server.js b/test/integration/server.js index 7c763d0..bbff4c1 100644 --- a/test/integration/server.js +++ b/test/integration/server.js @@ -353,7 +353,7 @@ describe('Wallet service', function() { var _readTemplateFile_old = emailService._readTemplateFile; emailService._readTemplateFile = function(language, filename, cb) { if (_.endsWith(filename, '.html')) { - return cb(null, 'Subject\n{{walletName}}'); + return cb(null, '{{walletName}}'); } else { _readTemplateFile_old.call(emailService, language, filename, cb); } @@ -375,7 +375,7 @@ describe('Wallet service', function() { one.text.should.contain(wallet.name); one.text.should.contain(wallet.copayers[0].name); should.exist(one.html); - one.html.should.contain(''); + one.html.indexOf('').should.equal(0); one.html.should.contain(wallet.name); server.storage.fetchUnsentEmails(function(err, unsent) { should.not.exist(err);