Merge pull request #6981 from fjordllc/bug/fix-admin-notification-ign…

…oring-settings

メール通知設定がOFFになっている場合は、相談部屋からのメール通知が飛ばないように修正

app/mailers/activity_mailer.rb

@@ -43,6 +43,8 @@ def came_comment(args = {})
     @message ||= args[:message]
     @receiver ||= args[:receiver]
 
+    return unless @receiver.mail_notification?
+
     @user = @receiver
     link = "/#{@comment.commentable_type.downcase.pluralize}/#{@comment.commentable.id}"
     @link_url = notification_redirector_url(

test/mailers/activity_mailer_test.rb

@@ -1099,4 +1099,19 @@ class ActivityMailerTest < ActionMailer::TestCase
     assert_equal '[FBC] 相談部屋でkomagataさんからコメントがありました。', email.subject
     assert_match(/コメント/, email.body.to_s)
   end
+
+  test 'came_comment for admin with mail_notification off' do
+    admin = users(:komagata)
+    admin.update(mail_notification: false)
+
+    comment = comments(:commentOfTalk)
+
+    ActivityMailer.came_comment(
+      comment: comment,
+      message: "相談部屋で#{comment.sender.login_name}さんからコメントがありました。",
+      receiver: comment.receiver
+    ).deliver_now
+
+    assert ActionMailer::Base.deliveries.empty?
+  end
 end