Download as
Browse Code »

Commit 4e17520d8373f43c6cd4ff14f0320ffe1970aba3

Authored by Arthur Esposte
1 parent 76c22144
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 friend removal bug 

(ActionItem3215)

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
Showing 5 changed files with 59 additions and 3 deletions   Show diff stats
app/controllers/my_profile/friends_controller.rb
  Diff comments   View file @4e17520
@@ -11,7 +11,7 @@ class FriendsController &lt; MyProfileController @@ -11,7 +11,7 @@ class FriendsController &lt; MyProfileController
11 def remove 11 def remove
12 @friend = profile.friends.find(params[:id]) 12 @friend = profile.friends.find(params[:id])
13 if request.post? && params[:confirmation] 13 if request.post? && params[:confirmation]
14 - profile.remove_friend(@friend) 14 + Friendship.remove_friendship(profile, @friend)
15 redirect_to :action => 'index' 15 redirect_to :action => 'index'
16 end 16 end
17 end 17 end
app/models/friendship.rb
  Diff comments   View file @4e17520
@@ -15,4 +15,9 @@ class Friendship &lt; ActiveRecord::Base @@ -15,4 +15,9 @@ class Friendship &lt; ActiveRecord::Base
15 Friendship.update_cache_counter(:friends_count, friendship.person, -1) 15 Friendship.update_cache_counter(:friends_count, friendship.person, -1)
16 Friendship.update_cache_counter(:friends_count, friendship.friend, -1) 16 Friendship.update_cache_counter(:friends_count, friendship.friend, -1)
17 end 17 end
  18 +
  19 + def self.remove_friendship(person1, person2)
  20 + person1.remove_friend(person2)
  21 + person2.remove_friend(person1)
  22 + end
18 end 23 end
test/functional/friends_controller_test.rb
  Diff comments   View file @4e17520
@@ -36,12 +36,12 @@ class FriendsControllerTest &lt; ActionController::TestCase @@ -36,12 +36,12 @@ class FriendsControllerTest &lt; ActionController::TestCase
36 36
37 should 'actually remove friend' do 37 should 'actually remove friend' do
38 profile.add_friend(friend) 38 profile.add_friend(friend)
  39 + friend.add_friend(profile)
39 40
40 - assert_difference 'Friendship.count', -1 do 41 + assert_difference 'Friendship.count', -2 do
41 post :remove, :id => friend.id, :confirmation => '1' 42 post :remove, :id => friend.id, :confirmation => '1'
42 assert_redirected_to :action => 'index' 43 assert_redirected_to :action => 'index'
43 end 44 end
44 - assert_equal friend, Profile.find(friend.id)  
45 end 45 end
46 46
47 should 'display find people button' do 47 should 'display find people button' do
test/integration/manage_friendships_test.rb 0 → 100644
  Diff comments   View file @4e17520
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
  1 +require "#{File.dirname(__FILE__)}/../test_helper"
  2 +
  3 +class ManageFriendshipsTest < ActionController::IntegrationTest
  4 +
  5 + def setup
  6 + FriendsController.any_instance.stubs(:get_layout).returns('application')
  7 + ProfileController.any_instance.stubs(:get_layout).returns('application')
  8 +
  9 + Friendship.delete_all
  10 + Person.delete_all
  11 + @person = create_user("albert", :password => 'test',
  12 + :password_confirmation => 'test').person
  13 + @person.user.activate
  14 +
  15 + @friend = fast_create(Person, :identifier => "isaac")
  16 +
  17 + login(@person.identifier, 'test')
  18 + end
  19 +
  20 + should 'remove friendships' do
  21 + @person.add_friend(@friend)
  22 + @friend.add_friend(@person)
  23 +
  24 + get "/myprofile/#{@person.identifier}/friends/remove/#{@friend.id}"
  25 + assert_response :success
  26 +
  27 + post "/myprofile/#{@person.identifier}/friends/remove/#{@friend.id}",
  28 + :confirmation => '1'
  29 + assert_response :redirect
  30 +
  31 + follow_redirect!
  32 +
  33 + assert assigns(:friends).empty?
  34 + assert !@person.is_a_friend?(@friend)
  35 + assert !@friend.is_a_friend?(@person)
  36 + end
  37 +end
test/unit/friendship_test.rb
  Diff comments   View file @4e17520
@@ -58,4 +58,18 @@ class FriendshipTest &lt; ActiveSupport::TestCase @@ -58,4 +58,18 @@ class FriendshipTest &lt; ActiveSupport::TestCase
58 assert_equal ['a'], ta.get_friend_name 58 assert_equal ['a'], ta.get_friend_name
59 end 59 end
60 60
  61 + should 'remove friendships when a friend removal occurs' do
  62 + p1 = create_user('testuser1').person
  63 + p2 = create_user('testuser2').person
  64 + p1.add_friend(p2, 'friends')
  65 + p2.add_friend(p1, 'friends')
  66 +
  67 + assert_difference 'Friendship.count', -2 do
  68 + Friendship.remove_friendship(p1, p2)
  69 + end
  70 +
  71 + assert_not_includes p1.friends(true), p2
  72 + assert_not_includes p2.friends(true), p1
  73 + end
  74 +
61 end 75 end