Download as
Browse Code »

Commit dc6be7cfe4acb2ba5483d0e868004b9527ed5a5e

Authored by Joenio Costa
Committed by Daniela Feitosa
1 parent 9731f6e8
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Test if has emails to be notified before delivering mails 

(ActionItem1811)
Showing 2 changed files with 11 additions and 5 deletions   Show diff stats
app/models/comment.rb
  Diff comments   View file @dc6be7c
@@ -68,7 +68,7 @@ class Comment < ActiveRecord::Base @@ -68,7 +68,7 @@ class Comment < ActiveRecord::Base
68 end 68 end
69 69
70 after_create do |comment| 70 after_create do |comment|
71 - if comment.article.notify_comments? 71 + if comment.article.notify_comments? && !comment.article.profile.notification_emails.empty?
72 Comment::Notifier.deliver_mail(comment) 72 Comment::Notifier.deliver_mail(comment)
73 end 73 end
74 end 74 end
@@ -76,10 +76,7 @@ class Comment < ActiveRecord::Base @@ -76,10 +76,7 @@ class Comment < ActiveRecord::Base
76 class Notifier < ActionMailer::Base 76 class Notifier < ActionMailer::Base
77 def mail(comment) 77 def mail(comment)
78 profile = comment.article.profile 78 profile = comment.article.profile
79 - email = profile.notification_emails  
80 - return unless email  
81 - recipients email  
82 - 79 + recipients profile.notification_emails
83 from "#{profile.environment.name} <#{profile.environment.contact_email}>" 80 from "#{profile.environment.name} <#{profile.environment.contact_email}>"
84 subject _("[%s] you got a new comment!") % [profile.environment.name] 81 subject _("[%s] you got a new comment!") % [profile.environment.name]
85 body :recipient => profile.nickname || profile.name, 82 body :recipient => profile.nickname || profile.name,
test/unit/comment_notifier_test.rb
  Diff comments   View file @dc6be7c
@@ -56,6 +56,15 @@ class CommentNotifierTest &lt; Test::Unit::TestCase @@ -56,6 +56,15 @@ class CommentNotifierTest &lt; Test::Unit::TestCase
56 assert_match /comment body/, sent.body 56 assert_match /comment body/, sent.body
57 end 57 end
58 58
  59 + should 'not deliver mail if has no notification emails' do
  60 + community = fast_create(Community)
  61 + assert_equal [], community.notification_emails
  62 + article = fast_create(Article, :name => 'Article test', :profile_id => community.id, :notify_comments => true)
  63 + assert_no_difference ActionMailer::Base.deliveries, :size do
  64 + article.comments << Comment.new(:author => @profile, :title => 'test comment', :body => 'there is no addresses to send notification')
  65 + end
  66 + end
  67 +
59 private 68 private
60 69
61 def read_fixture(action) 70 def read_fixture(action)