Download as
Browse Code »

Commit 389f05f470561e237719c916ee0bcec12a1fa06c

Authored by Victor Costa
1 parent 04576c7e
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

Fix scrap tests 

Tests in scrap_test were failing in some random executions.
It was caused by the way that action_tracker gets the current user when
there is no custom_user setted in track_actions calls.

The current logged in used is obtained with ActionTracker::Record.current_user but it's not setted from unit tests.
The solution is to set the custom_user as the scrap sender, since that it will always be the same user that is logged in when a scrap is created.
Showing 3 changed files with 5 additions and 4 deletions   Show diff stats
app/models/scrap.rb
  Diff comments   View file @389f05f
... ... @@ -22,11 +22,11 @@ class Scrap < ActiveRecord::Base
22 22  
23 23 scope :not_replies, :conditions => {:scrap_id => nil}
24 24  
25   - track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target
  25 + track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target, :custom_user => :sender
26 26  
27   - track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender == s.receiver}
  27 + track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender == s.receiver}, :custom_user => :sender
28 28  
29   - track_actions :reply_scrap_on_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender != s.receiver && s.sender == s.top_root.receiver}
  29 + track_actions :reply_scrap_on_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender != s.receiver && s.sender == s.top_root.receiver}, :custom_user => :sender
30 30  
31 31 after_create :send_notification
32 32  
... ...
test/functional/profile_controller_test.rb
  Diff comments   View file @389f05f
... ... @@ -943,7 +943,7 @@ class ProfileControllerTest < ActionController::TestCase
943 943 @controller.stubs(:current_user).returns(user)
944 944 Person.any_instance.stubs(:follows?).returns(true)
945 945 get :index, :profile => p1.identifier
946   - assert_equal [s3,s2], assigns(:activities).map(&:activity)
  946 + assert_equal [s3,s2], assigns(:activities).map(&:activity).select {|a| a.kind_of?(Scrap)}
947 947 end
948 948  
949 949 should 'the activities be the received scraps in community profile' do
... ...
test/unit/scrap_test.rb
  Diff comments   View file @389f05f
... ... @@ -6,6 +6,7 @@ class ScrapTest < ActiveSupport::TestCase
6 6 Person.destroy_all
7 7 Scrap.destroy_all
8 8 ActionTracker::Record.destroy_all
  9 + Delayed::Job.destroy_all
9 10 end
10 11  
11 12 should "have the content" do
... ...