Download as
Browse Code »

Commit 802fc44cfa10cf46bc02a7304a77013ac9add25e

Authored by Daniela Feitosa
1 parent 4226f0e2
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

ActionItem298: not adding a friend twice

Showing 2 changed files with 11 additions and 1 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @802fc44
@@ -30,7 +30,9 @@ class Person < Profile @@ -30,7 +30,9 @@ class Person < Profile
30 end 30 end
31 31
32 def add_friend(friend, group = nil) 32 def add_friend(friend, group = nil)
33 - self.friendships.build(:friend => friend, :group => group).save! 33 + unless self.is_a_friend?(friend)
  34 + self.friendships.build(:friend => friend, :group => group).save!
  35 + end
34 end 36 end
35 37
36 def already_request_friendship?(person) 38 def already_request_friendship?(person)
test/unit/person_test.rb
  Diff comments   View file @802fc44
@@ -555,4 +555,12 @@ class PersonTest < Test::Unit::TestCase @@ -555,4 +555,12 @@ class PersonTest < Test::Unit::TestCase
555 assert_equal 'http://website.with.http', p.organization_website 555 assert_equal 'http://website.with.http', p.organization_website
556 end 556 end
557 557
  558 + should 'not add a friend if already is a friend' do
  559 + p1 = create_user('testuser1').person
  560 + p2 = create_user('testuser2').person
  561 + assert p1.add_friend(p2)
  562 + assert Profile['testuser1'].is_a_friend?(p2)
  563 + assert !Profile['testuser1'].add_friend(p2)
  564 + end
  565 +
558 end 566 end