Commit 4e6a9aeb authored by Benjamin Neff's avatar Benjamin Neff

Fallback to title if the reshare root was deleted

closes #7284
parent e7d68319
...@@ -5,7 +5,7 @@ module NotifierHelper ...@@ -5,7 +5,7 @@ module NotifierHelper
# @return [String] The formatted post. # @return [String] The formatted post.
def post_message(post, opts={}) def post_message(post, opts={})
if post.respond_to? :message if post.respond_to? :message
post.message.plain_text_without_markdown post.message.try(:plain_text_without_markdown) || post_page_title(post)
else else
I18n.translate 'notifier.a_post_you_shared' I18n.translate 'notifier.a_post_you_shared'
end end
...@@ -14,6 +14,13 @@ describe NotifierHelper, :type => :helper do ...@@ -14,6 +14,13 @@ describe NotifierHelper, :type => :helper do
it 'strip markdown in the post' do it 'strip markdown in the post' do
expect(post_message(@markdown_post)).to eq(@striped_markdown_post) expect(post_message(@markdown_post)).to eq(@striped_markdown_post)
end end
it "falls back to the title, if the root post was deleted" do
reshare = FactoryGirl.create(:reshare)
.to eq(I18n.t("", author: reshare.author_name))
end end
describe '#comment_message' do describe '#comment_message' do
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment