Download as
Browse Code »

Commit bb6b09d4f6b634ca27e0eb837b431556f643b425

Authored by AntonioTerceiro
1 parent f4a1a6b0
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

ActionItem43: supporting non-class finders 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1347 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 17 additions and 2 deletions   Show diff stats
app/models/profile_list_block.rb
  Diff comments   View file @bb6b09d
... ... @@ -24,7 +24,13 @@ class ProfileListBlock < Block
24 24  
25 25 def profiles
26 26 # FIXME pick random people instead
27   - profile_finder.find(:all, :limit => self.limit, :order => 'created_at desc')
  27 + finder = profile_finder
  28 + options = { :limit => self.limit, :order => 'created_at desc' }
  29 + if finder.is_a?(Class)
  30 + finder.find(:all, options)
  31 + else
  32 + finder.find(options)
  33 + end
28 34 end
29 35  
30 36 def random(top)
... ...
test/unit/profile_list_block_test.rb
  Diff comments   View file @bb6b09d
... ... @@ -47,7 +47,15 @@ class ProfileListBlockTest < Test::Unit::TestCase
47 47 should 'ask profile finder for profiles' do
48 48 block = ProfileListBlock.new
49 49 block.expects(:profile_finder).returns(Profile).once
50   - Profile.expects(:find).returns([])
  50 + Profile.expects(:find).with(:all, is_a(Hash)).returns([])
  51 + block.profiles
  52 + end
  53 +
  54 + should 'support non-class finders' do
  55 + block = ProfileListBlock.new
  56 + profile = create_user('mytestuser').person
  57 + block.expects(:profile_finder).returns(profile.members).once
  58 + profile.members.expects(:find).with(is_a(Hash)).once
51 59 block.profiles
52 60 end
53 61  
... ... @@ -58,4 +66,5 @@ class ProfileListBlockTest < Test::Unit::TestCase
58 66 ProfileListBlock.new.random(77)
59 67 end
60 68  
  69 +
61 70 end
... ...