Download as
Browse Code »

Commit f2e976883615dddbde74e493c400eb17a8f79e34

Authored by Rodrigo Souto
1 parent 66c0650c
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

Avoid randomness on tests

Showing 2 changed files with 3 additions and 5 deletions   Show diff stats
test/unit/profile_test.rb
  Diff comments   View file @f2e9768
@@ -363,7 +363,7 @@ class ProfileTest < ActiveSupport::TestCase @@ -363,7 +363,7 @@ class ProfileTest < ActiveSupport::TestCase
363 t2 = c.tasks.build; t2.save!; t2.finish 363 t2 = c.tasks.build; t2.save!; t2.finish
364 t3 = c.tasks.build; t3.save!; t3.finish 364 t3 = c.tasks.build; t3.save!; t3.finish
365 365
366 - assert_equal [t2, t3], c.tasks.finished 366 + assert_equivalent [t2, t3], c.tasks.finished
367 end 367 end
368 368
369 should 'responds to categories' do 369 should 'responds to categories' do
test/unit/uploaded_file_test.rb
  Diff comments   View file @f2e9768
@@ -324,13 +324,11 @@ class UploadedFileTest < ActiveSupport::TestCase @@ -324,13 +324,11 @@ class UploadedFileTest < ActiveSupport::TestCase
324 should 'group trackers activity of image\'s upload' do 324 should 'group trackers activity of image\'s upload' do
325 ActionTracker::Record.delete_all 325 ActionTracker::Record.delete_all
326 gallery = fast_create(Gallery, :profile_id => profile.id) 326 gallery = fast_create(Gallery, :profile_id => profile.id)
327 - count = ActionTracker::Record.find_all_by_verb('upload_image').count  
328 image1 = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => gallery, :profile => profile) 327 image1 = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => gallery, :profile => profile)
329 - count += 1  
330 - assert_equal count, ActionTracker::Record.find_all_by_verb('upload_image').count 328 + assert_equal 1, ActionTracker::Record.find_all_by_verb('upload_image').count
331 329
332 image2 = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/other-pic.jpg', 'image/jpg'), :parent => gallery, :profile => profile) 330 image2 = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/other-pic.jpg', 'image/jpg'), :parent => gallery, :profile => profile)
333 - assert_equal count, ActionTracker::Record.find_all_by_verb('upload_image').count 331 + assert_equal 1, ActionTracker::Record.find_all_by_verb('upload_image').count
334 end 332 end
335 333
336 { 334 {