From 389f05f470561e237719c916ee0bcec12a1fa06c Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Fri, 4 Sep 2015 09:10:48 -0300 Subject: [PATCH] Fix scrap tests --- app/models/scrap.rb | 6 +++--- test/functional/profile_controller_test.rb | 2 +- test/unit/scrap_test.rb | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/scrap.rb b/app/models/scrap.rb index 9d016b2..b44cdf2 100644 --- a/app/models/scrap.rb +++ b/app/models/scrap.rb @@ -22,11 +22,11 @@ class Scrap < ActiveRecord::Base scope :not_replies, :conditions => {:scrap_id => nil} - 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 + 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 - track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender == s.receiver} + track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender == s.receiver}, :custom_user => :sender - 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} + 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 after_create :send_notification diff --git a/test/functional/profile_controller_test.rb b/test/functional/profile_controller_test.rb index 0044fe6..d5695b4 100644 --- a/test/functional/profile_controller_test.rb +++ b/test/functional/profile_controller_test.rb @@ -943,7 +943,7 @@ class ProfileControllerTest < ActionController::TestCase @controller.stubs(:current_user).returns(user) Person.any_instance.stubs(:follows?).returns(true) get :index, :profile => p1.identifier - assert_equal [s3,s2], assigns(:activities).map(&:activity) + assert_equal [s3,s2], assigns(:activities).map(&:activity).select {|a| a.kind_of?(Scrap)} end should 'the activities be the received scraps in community profile' do diff --git a/test/unit/scrap_test.rb b/test/unit/scrap_test.rb index f314144..0efa306 100644 --- a/test/unit/scrap_test.rb +++ b/test/unit/scrap_test.rb @@ -6,6 +6,7 @@ class ScrapTest < ActiveSupport::TestCase Person.destroy_all Scrap.destroy_all ActionTracker::Record.destroy_all + Delayed::Job.destroy_all end should "have the content" do -- libgit2 0.21.2