diff --git a/lib/diaspora/user/connecting.rb b/lib/diaspora/user/connecting.rb index f7e741866..444380f97 100644 --- a/lib/diaspora/user/connecting.rb +++ b/lib/diaspora/user/connecting.rb @@ -27,6 +27,7 @@ module Diaspora def accept_contact_request(request, aspect) pending_request_ids.delete(request.id.to_id) activate_contact(request.from, aspect) + request.destroy request.reverse_for(self) end diff --git a/spec/models/user/connecting_spec.rb b/spec/models/user/connecting_spec.rb index 2567b379d..ceca53475 100644 --- a/spec/models/user/connecting_spec.rb +++ b/spec/models/user/connecting_spec.rb @@ -59,12 +59,16 @@ describe Diaspora::UserModules::Connecting do user.reload end - it "should delete an accepted contact request" do + it "should delete an accepted contact request from pending_requests" do proc { user.accept_contact_request(@received_request, aspect) }.should change(user.reload.pending_requests, :count ).by(-1) end - + it "should delete an accepted contact request" do + proc { + user.accept_contact_request(@received_request, aspect) + }.should change(Request, :count ).by(-1) + end it 'should be able to ignore a pending contact request' do proc { user.ignore_contact_request(@received_request.id) }.should change( user.reload.pending_requests, :count ).by(-1)