Fix #3523: Feedback notification dmails should include the text of the feedback.
This commit is contained in:
@@ -91,7 +91,7 @@ class UserFeedback < ApplicationRecord
|
|||||||
|
|
||||||
def create_dmail
|
def create_dmail
|
||||||
unless disable_dmail_notification
|
unless disable_dmail_notification
|
||||||
body = %{#{creator_name} created a "#{category} record":/user_feedbacks?search[user_id]=#{user_id} for your account. #{body}}
|
body = %{@#{creator_name} created a "#{category} record":/user_feedbacks?search[user_id]=#{user_id} for your account:\n\n#{self.body}}
|
||||||
Dmail.create_automated(:to_id => user_id, :title => "Your user record has been updated", :body => body)
|
Dmail.create_automated(:to_id => user_id, :title => "Your user record has been updated", :body => body)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -16,9 +16,16 @@ class UserFeedbackTest < ActiveSupport::TestCase
|
|||||||
gold = FactoryGirl.create(:gold_user)
|
gold = FactoryGirl.create(:gold_user)
|
||||||
member = FactoryGirl.create(:user)
|
member = FactoryGirl.create(:user)
|
||||||
|
|
||||||
|
dmail = <<~EOS.chomp
|
||||||
|
@#{gold.name} created a "positive record":/user_feedbacks?search[user_id]=#{user.id} for your account:
|
||||||
|
|
||||||
|
good job!
|
||||||
|
EOS
|
||||||
|
|
||||||
CurrentUser.user = gold
|
CurrentUser.user = gold
|
||||||
assert_difference("Dmail.count", 1) do
|
assert_difference("Dmail.count", 1) do
|
||||||
FactoryGirl.create(:user_feedback, :user => user)
|
FactoryGirl.create(:user_feedback, :user => user, :body => "good job!")
|
||||||
|
assert_equal(dmail, user.dmails.last.body)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user