Fix: comments list when there is spam on thread

(ActionItem2918)

Fix: comments list when there is spam on thread
(ActionItem2918)
Daniela Feitosa
1 parent 9a383b33
Showing 2 changed files with 20 additions and 1 deletions Show diff stats
test/unit/comment_test.rb
vendor/plugins/action_tracker_has_comments/init.rb
@@ -301,6 +301,19 @@ class CommentTest &lt; ActiveSupport::TestCase
     assert result[1].replies.empty?
   end
+  should "return activities comments when some comment on thread is spam" do
+    person = fast_create(Person)
+    a = TextileArticle.create!(:profile => person, :name => 'My article', :body => 'Article body')
+    c0 = Comment.create(:source => a, :body => 'Root comment', :author => person)
+    c1 = Comment.create(:reply_of_id => c0.id, :source => a, :body => 'c1', :author => person)
+    spam = Comment.create(:spam => true, :reply_of_id => c0.id, :source => a, :body => 'spam', :author => person)
+    c2 = Comment.create(:reply_of_id => spam.id, :source => a, :body => 'c2', :author => person)
+    result = a.activity.comments_as_thread
+    assert_equal c0, result[0]
+    assert_equal [c1], result[0].replies
+    assert_equal c2, result[1]
+  end
+
   should 'provide author url for authenticated user' do
     author = Person.new
     author.expects(:url).returns('http://blabla.net/author')
@@ -16,7 +16,13 @@ Rails.configuration.to_prepare do
       self.comments.each do |c|
         c.replies = []
         result[c.id] ||= c
-        c.reply_of_id.nil? ? root << c : result[c.reply_of_id].replies << c
+        if c.reply_of_id.nil?
+          root << c
+        elsif result[c.reply_of_id]
+          result[c.reply_of_id].replies << c
+        else # Comment is a reply but the reply is not being displayed - is spam, for example
+          root << c
+        end
       end
       root
     end
	@@ -301,6 +301,19 @@ class CommentTest < ActiveSupport::TestCase		@@ -301,6 +301,19 @@ class CommentTest < ActiveSupport::TestCase
301	assert result[1].replies.empty?	301	assert result[1].replies.empty?
302	end	302	end
303		303
		304	+ should "return activities comments when some comment on thread is spam" do
		305	+ person = fast_create(Person)
		306	+ a = TextileArticle.create!(:profile => person, :name => 'My article', :body => 'Article body')
		307	+ c0 = Comment.create(:source => a, :body => 'Root comment', :author => person)
		308	+ c1 = Comment.create(:reply_of_id => c0.id, :source => a, :body => 'c1', :author => person)
		309	+ spam = Comment.create(:spam => true, :reply_of_id => c0.id, :source => a, :body => 'spam', :author => person)
		310	+ c2 = Comment.create(:reply_of_id => spam.id, :source => a, :body => 'c2', :author => person)
		311	+ result = a.activity.comments_as_thread
		312	+ assert_equal c0, result[0]
		313	+ assert_equal [c1], result[0].replies
		314	+ assert_equal c2, result[1]
		315	+ end
		316	+
304	should 'provide author url for authenticated user' do	317	should 'provide author url for authenticated user' do
305	author = Person.new	318	author = Person.new
306	author.expects(:url).returns('http://blabla.net/author')	319	author.expects(:url).returns('http://blabla.net/author')