Download as
Browse Code »

Commit f60a0173f1a5fdd67d445b718bc009de58704b42

Authored by Lucas Melo
Committed by Rodrigo Souto
1 parent 73479a2c
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

action_tracker: show only non spam comments 

AI2784

Conflicts:
	vendor/plugins/action_tracker_has_comments/init.rb
Showing 2 changed files with 12 additions and 1 deletions   Show diff stats
test/functional/profile_controller_test.rb
  Diff comments   View file @f60a017
@@ -1344,6 +1344,17 @@ class ProfileControllerTest < ActionController::TestCase @@ -1344,6 +1344,17 @@ class ProfileControllerTest < ActionController::TestCase
1344 assert_tag :tag => 'span', :content => '(removed user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-removed'} 1344 assert_tag :tag => 'span', :content => '(removed user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-removed'}
1345 end 1345 end
1346 1346
  1347 + should 'not display spam comments in wall' do
  1348 + UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
  1349 + article = TinyMceArticle.create!(:profile => profile, :name => 'An article about spam\'s nutritional attributes')
  1350 + comment = Comment.create!(:author => profile, :title => 'Test Comment', :body => 'This article makes me hungry', :source_id => article.id, :source_type => 'Article')
  1351 + comment.spam!
  1352 + login_as(profile.identifier)
  1353 + get :index, :profile => profile.identifier
  1354 +
  1355 + assert !/This article makes me hungry/.match(@response.body), 'Spam comment was shown!'
  1356 + end
  1357 +
1347 should 'display comment in wall from non logged users' do 1358 should 'display comment in wall from non logged users' do
1348 UserStampSweeper.any_instance.stubs(:current_user).returns(profile) 1359 UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
1349 article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software') 1360 article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
vendor/plugins/action_tracker_has_comments/init.rb
  Diff comments   View file @f60a017
@@ -7,7 +7,7 @@ Rails.configuration.to_prepare do @@ -7,7 +7,7 @@ Rails.configuration.to_prepare do
7 7
8 def conditions_for_comments 8 def conditions_for_comments
9 type, id = (self.target_type == 'Article' ? ['Article', self.target_id] : [self.class.to_s, self.id]) 9 type, id = (self.target_type == 'Article' ? ['Article', self.target_id] : [self.class.to_s, self.id])
10 - "source_type = '#{type}' AND source_id = '#{id}'" 10 + "source_type = '#{type}' AND source_id = '#{id}' AND spam IS NOT TRUE"
11 end 11 end
12 12
13 def comments_as_thread 13 def comments_as_thread