Download as
Browse Code »

Commit c34cadf1e2fc1133fa6cdec7f88bc0da1f87b1bd

Authored by Daniela Feitosa
1 parent ebdbd8ac
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fixed failing tests

Showing 1 changed file with 9 additions and 5 deletions   Show diff stats
test/unit/comment_test.rb
  Diff comments   View file @c34cadf
... ... @@ -301,17 +301,19 @@ class CommentTest < ActiveSupport::TestCase
301 301 assert result[1].replies.empty?
302 302 end
303 303  
304   - should "return activities comments when some comment on thread is spam" do
  304 + should "return activities comments when some comment on thread is spam and not display its replies" do
305 305 person = fast_create(Person)
306 306 a = TextileArticle.create!(:profile => person, :name => 'My article', :body => 'Article body')
307 307 c0 = Comment.create(:source => a, :body => 'Root comment', :author => person)
308 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
  309 + c2 = Comment.create(:source => a, :body => 'c2', :author => person)
  310 + spam = Comment.create(:spam => true, :reply_of_id => c2.id, :source => a, :body => 'spam', :author => person)
  311 + spam_reply = Comment.create(:reply_of_id => spam.id, :source => a, :body => 'spam reply', :author => person)
  312 + result = a.activity.comments
312 313 assert_equal c0, result[0]
313   - assert_equal [c1], result[0].replies
  314 + assert_equal [c1], result[0].replies.without_spam
314 315 assert_equal c2, result[1]
  316 + assert_equal [], result[1].replies.without_spam
315 317 end
316 318  
317 319 should 'provide author url for authenticated user' do
... ... @@ -418,6 +420,7 @@ class CommentTest < ActiveSupport::TestCase
418 420 end
419 421  
420 422 should 'be able to select non-spam comments' do
  423 + Comment.destroy_all
421 424 c1 = fast_create(Comment)
422 425 c2 = fast_create(Comment, :spam => false)
423 426 c3 = fast_create(Comment, :spam => true)
... ... @@ -689,6 +692,7 @@ class CommentTest < ActiveSupport::TestCase
689 692 end
690 693  
691 694 should 'be able to select non-reply comments' do
  695 + Comment.destroy_all
692 696 c1 = fast_create(Comment)
693 697 c2 = fast_create(Comment, :reply_of_id => c1.id)
694 698 c3 = fast_create(Comment, :reply_of_id => c2.id)
... ...