Commit 08e108d3 authored by Benjamin Neff's avatar Benjamin Neff Committed by Dennis Schubert

Fix comment notification subject for posts without text

Fixes #7854
parent 546ef080
......@@ -4,6 +4,7 @@
## Bug fixes
* Add compatibility with macOS to `script/configure_bundler` [#7830](https://github.com/diaspora/diaspora/pull/7830)
* Fix comment notifications for comments on posts without text [#7857](https://github.com/diaspora/diaspora/pull/7857)
## Features
* Add `web+diaspora://` link handler [#7826](https://github.com/diaspora/diaspora/pull/7826)
......
......@@ -62,7 +62,11 @@ class StatusMessage < Post
end
def comment_email_subject
message.title
if message.present?
message.title
elsif photos.present?
I18n.t("posts.show.photos_by", count: photos.size, author: author_name)
end
end
def first_photo_url(*args)
......
......@@ -170,6 +170,18 @@ describe StatusMessage, type: :model do
end
end
describe "#comment_email_subject" do
it "delegates to message.title if the post have a text" do
expect(status.comment_email_subject).to eq(status.message.title)
end
it "includes the photos count if there are photos without text" do
photo = FactoryGirl.build(:photo, public: true)
status = FactoryGirl.build(:status_message, author: photo.author, text: nil, photos: [photo], public: true)
expect(status.comment_email_subject).to eq(I18n.t("posts.show.photos_by", count: 1, author: status.author_name))
end
end
describe "tags" do
it_should_behave_like "it is taggable" do
let(:object) { build(:status_message) }
......
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