From c03afdf0e7e90c9b4ec8bd0d4fa62c04c413276d Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Tue, 11 Sep 2012 15:39:20 -0300
Subject: [PATCH] Ignore comment threading for spam

---
 app/views/content_viewer/_comment.rhtml | 2 +-
 test/functional/spam_controller_test.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/views/content_viewer/_comment.rhtml b/app/views/content_viewer/_comment.rhtml
index d89bbbd..8b1c996 100644
--- a/app/views/content_viewer/_comment.rhtml
+++ b/app/views/content_viewer/_comment.rhtml
@@ -82,7 +82,7 @@
 
   </div>
 
-  <% unless comment.replies.blank? %>
+  <% unless comment.replies.blank? || comment.spam? %>
   <ul class="comment-replies">
     <% comment.replies.each do |reply| %>
       <%= render :partial => 'comment', :locals => { :comment => reply } %>
diff --git a/test/functional/spam_controller_test.rb b/test/functional/spam_controller_test.rb
index 02745ff..0337dc1 100644
--- a/test/functional/spam_controller_test.rb
+++ b/test/functional/spam_controller_test.rb
@@ -31,5 +31,11 @@ class SpamControllerTest < ActionController::TestCase
     assert !Comment.exists?(@spam.id)
   end
 
+  should 'properly render spam that have replies' do
+    reply_spam = fast_create(Comment, :source_id => @article_id, :reply_of_id => @spam.id)
+
+    get :index, :profile => @profile.identifier
+    assert_response :success
+  end
 
 end
--
libgit2 0.21.2