Download as
Browse Code »

Commit 4d031bf1beeb7149718fa8b64860089546c1bfcc

Authored by Daniela Feitosa
1 parent 73abf8b8
Exists in staging and in 15 other branches all_pending_tasks_api, api_roles, elasticsearch, elasticsearch_to_merge, environment-exposes-api, external_followers, federation_oauth_provider, follower_permition, master, master_profile_followers, oauth_external_login, private-scraps-rebase, production, profile_api_improvements, user_mention

recent_activities: displays only action trackers on block 

The profile activities returns action trackers and scraps, but the
scraps should not be displayed on recent activities block. Only the
action tracker records

Related to merge request !972
Showing 2 changed files with 18 additions and 1 deletions   Show diff stats
plugins/recent_activities/lib/recent_activities_plugin/activities_block.rb
  Diff comments   View file @4d031bf
... ... @@ -7,7 +7,8 @@ class RecentActivitiesPlugin::ActivitiesBlock < Block
7 7 end
8 8  
9 9 def activities
10   - list = self.limit.nil? ? owner.activities : owner.activities.limit(self.get_limit)
  10 + activities = owner.activities.where(activity_type: ActionTracker::Record.to_s)
  11 + list = self.limit.nil? ? activities : activities.limit(self.get_limit)
11 12 list.map(&:activity)
12 13 end
13 14  
... ...
plugins/recent_activities/test/unit/recent_activities_block_test.rb
  Diff comments   View file @4d031bf
... ... @@ -36,6 +36,22 @@ class RecentActivitiesBlockTest < ActiveSupport::TestCase
36 36  
37 37 assert_equal [a2].map(&:id), block.activities.map(&:id)
38 38 end
  39 +
  40 + should 'return only action tracker records as activities' do
  41 + profile = create_user('testuser').person
  42 + friend = create_user('friend').person
  43 + scrap = create(Scrap, defaults_for_scrap(sender: friend, receiver: profile))
  44 + a1 = fast_create(ActionTracker::Record, user_id: profile.id, created_at: Time.now, updated_at: Time.now)
  45 + a2 = fast_create(ActionTracker::Record, user_id: profile.id, created_at: Time.now, updated_at: Time.now)
  46 + ProfileActivity.create! profile_id: profile.id, activity: a1
  47 + ProfileActivity.create! profile_id: profile.id, activity: a2
  48 +
  49 + block = RecentActivitiesPlugin::ActivitiesBlock.new
  50 + block.stubs(:owner).returns(profile)
  51 +
  52 + assert_equal [a2, a1, scrap], block.owner.activities.map(&:activity)
  53 + assert_equal [a2, a1], block.activities
  54 + end
39 55 end
40 56  
41 57 require 'boxes_helper'
... ...