Limited post content excluded from subject of comment email
This commit is contained in:
parent
bec2508545
commit
aa6b590b3c
3 changed files with 26 additions and 1 deletions
|
|
@ -6,7 +6,11 @@ module NotificationMailers
|
|||
@comment = Comment.find(comment_id)
|
||||
|
||||
@headers[:from] = "\"#{@comment.author_name} (diaspora*)\" <#{AppConfig.mail.sender_address}>"
|
||||
@headers[:subject] = "Re: #{@comment.comment_email_subject}"
|
||||
if @comment.public?
|
||||
@headers[:subject] = "Re: #{@comment.comment_email_subject}"
|
||||
else
|
||||
@headers[:subject] = I18n.t("notifier.comment_on_post.limited_subject")
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -742,6 +742,7 @@ en:
|
|||
sharing: "has started sharing with you!"
|
||||
view_profile: "View %{name}’s profile"
|
||||
comment_on_post:
|
||||
limited_subject: "There's a new comment on a post you commented"
|
||||
reply: "Reply or view %{name}’s post >"
|
||||
mentioned:
|
||||
subject: "%{name} has mentioned you on diaspora*"
|
||||
|
|
|
|||
|
|
@ -318,6 +318,26 @@ describe Notifier, :type => :mailer do
|
|||
end
|
||||
end
|
||||
|
||||
context "limited comments" do
|
||||
let(:commented_limited_post) {
|
||||
bob.post(:status_message, to: :all, public: false,
|
||||
text: "### Limited headline \r\n It's **really** sunny outside today")
|
||||
}
|
||||
let(:limited_comment) { eve.comment!(commented_limited_post, "Totally is") }
|
||||
|
||||
describe ".comment_on_limited_post" do
|
||||
let(:limited_comment_mail) { Notifier.comment_on_post(bob.id, person.id, limited_comment.id).deliver_now }
|
||||
|
||||
it "SUBJECT: does not show limited message" do
|
||||
expect(limited_comment_mail.subject).not_to include("Limited headline")
|
||||
end
|
||||
|
||||
it "BODY: does not show limited message" do
|
||||
expect(limited_comment_mail.body.encoded).not_to include("Limited headline")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'hashtags' do
|
||||
it 'escapes hashtags' do
|
||||
mails = Notifier.admin("#Welcome to bureaucracy!", [bob])
|
||||
|
|
|
|||
Loading…
Reference in a new issue