diff options
author | Henare Degan <henare.degan@gmail.com> | 2015-04-27 15:06:20 +1000 |
---|---|---|
committer | Henare Degan <henare.degan@gmail.com> | 2015-04-27 15:21:05 +1000 |
commit | ac8c04e133425745f4e5b6614ff6156255e785d5 (patch) | |
tree | 68c2d2ed0d164f9bf49b70bf0e58ed07cc63944d | |
parent | bd5db116be308bdb0eeeb203ad596e2a4571ce74 (diff) |
Don't put HTML entities in comment on alert email subject lines
-rw-r--r-- | app/mailers/request_mailer.rb | 2 | ||||
-rw-r--r-- | spec/mailers/request_mailer_spec.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/mailers/request_mailer.rb b/app/mailers/request_mailer.rb index a2793bd0b..780d6a023 100644 --- a/app/mailers/request_mailer.rb +++ b/app/mailers/request_mailer.rb @@ -197,7 +197,7 @@ class RequestMailer < ApplicationMailer mail(:from => contact_from_name_and_email, :to => info_request.user.name_and_email, - :subject => (_("Somebody added a note to your FOI request - ") + info_request.title).html_safe) + :subject => _("Somebody added a note to your FOI request - ") + info_request.title.html_safe) end def comment_on_alert_plural(info_request, count, earliest_unalerted_comment) @count, @info_request = count, info_request diff --git a/spec/mailers/request_mailer_spec.rb b/spec/mailers/request_mailer_spec.rb index 5450b223e..506a67953 100644 --- a/spec/mailers/request_mailer_spec.rb +++ b/spec/mailers/request_mailer_spec.rb @@ -464,3 +464,10 @@ describe RequestMailer, "not_clarified_alert" do expect(mail.subject).to eq "Clarify your FOI request - Here's a request" end end + +describe RequestMailer, "comment_on_alert" do + it 'should not create HTML entities in the subject line' do + mail = RequestMailer.comment_on_alert(FactoryGirl.create(:info_request, :title => "Here's a request"), FactoryGirl.create(:comment)) + expect(mail.subject).to eq "Somebody added a note to your FOI request - Here's a request" + end +end |