Download as
Browse Code »

Commit 74589b8f050fe5b8467ec361b7862c830459f858

Authored by Leandro Santos
1 parent 86c2f5ee
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 FriendsBlock unit test

Showing 2 changed files with 5 additions and 2 deletions   Show diff stats
app/models/friends_block.rb
  Diff comments   View file @74589b8
... ... @@ -14,7 +14,7 @@ class FriendsBlock < ProfileListBlock
14 14  
15 15 def footer
16 16 owner_id = owner.identifier
17   - lambda do
  17 + proc do
18 18 link_to s_('friends|View all'), :profile => owner_id, :controller => 'profile', :action => 'friends'
19 19 end
20 20 end
... ...
app/models/person.rb
  Diff comments   View file @74589b8
... ... @@ -102,7 +102,10 @@ class Person < Profile
102 102  
103 103 def add_friend(friend, group = nil)
104 104 unless self.is_a_friend?(friend)
105   - self.friendships.build(:friend => friend, :group => group).save!
  105 + friendship = self.friendships.build
  106 + friendship.friend = friend
  107 + friendship.group = group
  108 + friendship.save
106 109 end
107 110 end
108 111  
... ...