Download as
Browse Code »

Commit c03afdf0e7e90c9b4ec8bd0d4fa62c04c413276d

Authored by Antonio Terceiro
1 parent 8aad796b
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Ignore comment threading for spam 

ActionItem2306
Showing 2 changed files with 7 additions and 1 deletions   Show diff stats
app/views/content_viewer/_comment.rhtml
  Diff comments   View file @c03afdf
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 82
83 </div> 83 </div>
84 84
85 - <% unless comment.replies.blank? %> 85 + <% unless comment.replies.blank? || comment.spam? %>
86 <ul class="comment-replies"> 86 <ul class="comment-replies">
87 <% comment.replies.each do |reply| %> 87 <% comment.replies.each do |reply| %>
88 <%= render :partial => 'comment', :locals => { :comment => reply } %> 88 <%= render :partial => 'comment', :locals => { :comment => reply } %>
test/functional/spam_controller_test.rb
  Diff comments   View file @c03afdf
@@ -31,5 +31,11 @@ class SpamControllerTest &lt; ActionController::TestCase @@ -31,5 +31,11 @@ class SpamControllerTest &lt; ActionController::TestCase
31 assert !Comment.exists?(@spam.id) 31 assert !Comment.exists?(@spam.id)
32 end 32 end
33 33
  34 + should 'properly render spam that have replies' do
  35 + reply_spam = fast_create(Comment, :source_id => @article_id, :reply_of_id => @spam.id)
  36 +
  37 + get :index, :profile => @profile.identifier
  38 + assert_response :success
  39 + end
34 40
35 end 41 end