From 4d031bf1beeb7149718fa8b64860089546c1bfcc Mon Sep 17 00:00:00 2001 From: Daniela Soares Feitosa Date: Wed, 6 Jul 2016 10:55:27 -0300 Subject: [PATCH] recent_activities: displays only action trackers on block --- plugins/recent_activities/lib/recent_activities_plugin/activities_block.rb | 3 ++- plugins/recent_activities/test/unit/recent_activities_block_test.rb | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/plugins/recent_activities/lib/recent_activities_plugin/activities_block.rb b/plugins/recent_activities/lib/recent_activities_plugin/activities_block.rb index c2d6649..36ab6da 100644 --- a/plugins/recent_activities/lib/recent_activities_plugin/activities_block.rb +++ b/plugins/recent_activities/lib/recent_activities_plugin/activities_block.rb @@ -7,7 +7,8 @@ class RecentActivitiesPlugin::ActivitiesBlock < Block end def activities - list = self.limit.nil? ? owner.activities : owner.activities.limit(self.get_limit) + activities = owner.activities.where(activity_type: ActionTracker::Record.to_s) + list = self.limit.nil? ? activities : activities.limit(self.get_limit) list.map(&:activity) end diff --git a/plugins/recent_activities/test/unit/recent_activities_block_test.rb b/plugins/recent_activities/test/unit/recent_activities_block_test.rb index cbee012..b88dc4f 100644 --- a/plugins/recent_activities/test/unit/recent_activities_block_test.rb +++ b/plugins/recent_activities/test/unit/recent_activities_block_test.rb @@ -36,6 +36,22 @@ class RecentActivitiesBlockTest < ActiveSupport::TestCase assert_equal [a2].map(&:id), block.activities.map(&:id) end + + should 'return only action tracker records as activities' do + profile = create_user('testuser').person + friend = create_user('friend').person + scrap = create(Scrap, defaults_for_scrap(sender: friend, receiver: profile)) + a1 = fast_create(ActionTracker::Record, user_id: profile.id, created_at: Time.now, updated_at: Time.now) + a2 = fast_create(ActionTracker::Record, user_id: profile.id, created_at: Time.now, updated_at: Time.now) + ProfileActivity.create! profile_id: profile.id, activity: a1 + ProfileActivity.create! profile_id: profile.id, activity: a2 + + block = RecentActivitiesPlugin::ActivitiesBlock.new + block.stubs(:owner).returns(profile) + + assert_equal [a2, a1, scrap], block.owner.activities.map(&:activity) + assert_equal [a2, a1], block.activities + end end require 'boxes_helper' -- libgit2 0.21.2