Merge commit 'refs/merge-requests/95' of git://gitorious.org/noosfero/noosfero i…

…nto merge-requests/95 Since this patch is very old, I needed to fix the correction in the model a little. Also replaced the "profile2" variable name used to "author". Conflicts: app/models/comment.rb test/unit/comment_notifier_test.rb

Merge commit 'refs/merge-requests/95' of git://gitorious.org/noosfero/noosfero i…
…nto merge-requests/95 Since this patch is very old, I needed to fix the correction in the model a little. Also replaced the "profile2" variable name used to "author". Conflicts: app/models/comment.rb test/unit/comment_notifier_test.rb
Rodrigo Souto
2 parents 3dd7c8f0 0ce6572c
Showing 2 changed files with 27 additions and 11 deletions Show diff stats
app/models/comment.rb
test/unit/comment_notifier_test.rb
@@ -74,6 +74,10 @@ class Comment &lt; ActiveRecord::Base
     self.find(:all, :order => 'created_at desc, id desc', :limit => limit)
   end
+  def notification_emails
+    self.article.profile.notification_emails - [self.author_email || self.email]
+  end
+
   after_save :notify_article
   after_destroy :notify_article
   def notify_article
@@ -114,7 +118,7 @@ class Comment &lt; ActiveRecord::Base
   def notify_by_mail
     if source.kind_of?(Article) && article.notify_comments?
-      if !article.profile.notification_emails.empty?
+      if !notification_emails.empty?
         Comment::Notifier.deliver_mail(self)
       end
       emails = article.followers - [author_email]
@@ -174,7 +178,7 @@ class Comment &lt; ActiveRecord::Base
   class Notifier < ActionMailer::Base
     def mail(comment)
       profile = comment.article.profile
-      recipients profile.notification_emails
+      recipients comment.notification_emails
       from "#{profile.environment.name} <#{profile.environment.contact_email}>"
       subject _("[%s] you got a new comment!") % [profile.environment.name]
       body :recipient => profile.nickname || profile.name,
@@ -8,26 +8,27 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
     ActionMailer::Base.delivery_method = :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
-    @profile = create_user('user_comment_test').person
+    @profile = create_user('content_owner').person
+    @author = create_user('author').person
     @article = fast_create(Article, :name => 'Article test', :profile_id => @profile.id, :notify_comments => true)
   end
   should 'deliver mail after make an article comment' do
     assert_difference ActionMailer::Base.deliveries, :size do
-      create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article )
+      create_comment_and_notify(:author => @author, :title => 'test comment', :body => 'you suck!', :source => @article )
     end
   end
   should 'deliver mail to owner of article' do
-    create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article )
+    create_comment_and_notify(:author => @author, :title => 'test comment', :body => 'you suck!', :source => @article )
     sent = ActionMailer::Base.deliveries.first
     assert_equal [@profile.email], sent.to
   end
   should 'display author name in delivered mail' do
-    create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article)
+    create_comment_and_notify(:author => @author, :title => 'test comment', :body => 'you suck!', :source => @article)
     sent = ActionMailer::Base.deliveries.first
-    assert_match /user_comment_test/, sent.body
+    assert_match /#{@author.name}/, sent.body
   end
   should 'display unauthenticated author name and email in delivered mail' do
@@ -40,18 +41,18 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
   should 'not deliver mail if notify comments is false' do
     @article.update_attribute(:notify_comments, false)
     assert_no_difference ActionMailer::Base.deliveries, :size do
-      create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article)
+      create_comment_and_notify(:author => @author, :title => 'test comment', :body => 'you suck!', :source => @article)
     end
   end
   should 'include comment title in the e-mail' do
-    create_comment_and_notify(:author => @profile, :title => 'comment title', :body => 'comment body', :source => @article)
+    create_comment_and_notify(:author => @author, :title => 'comment title', :body => 'comment body', :source => @article)
     sent = ActionMailer::Base.deliveries.first
     assert_match /comment title/, sent.body
   end
   should 'include comment text in the e-mail' do
-    create_comment_and_notify(:author => @profile, :title => 'comment title', :body => 'comment body', :source => @article)
+    create_comment_and_notify(:author => @author, :title => 'comment title', :body => 'comment body', :source => @article)
     sent = ActionMailer::Base.deliveries.first
     assert_match /comment body/, sent.body
   end
@@ -61,7 +62,7 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
     assert_equal [], community.notification_emails
     article = fast_create(Article, :name => 'Article test', :profile_id => community.id, :notify_comments => true)
     assert_no_difference ActionMailer::Base.deliveries, :size do
-      create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'there is no addresses to send notification', :source => article)
+      create_comment_and_notify(:author => @author, :title => 'test comment', :body => 'there is no addresses to send notification', :source => article)
     end
   end
@@ -80,6 +81,17 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
     assert_not_includes ActionMailer::Base.deliveries.map(&:bcc).flatten, follower.email
   end
+  should 'not deliver mail to comments author' do
+    community = fast_create(Community)
+    community.add_admin @profile
+    community.add_admin @author
+
+    article = fast_create(Article, :name => 'Article test', :profile_id => community.id, :notify_comments => true)
+    create_comment_and_notify(:source => @article, :author => @author, :title => 'comment title', :body => 'comment body')
+    sent = ActionMailer::Base.deliveries.first
+    assert_not_includes sent.to, @author.email
+  end
+
   private
   def create_comment_and_notify(args)