Delete an accepted friend request

This commit is contained in:
Raphael 2010-11-16 16:46:57 -08:00
parent e2e3b2511d
commit 2d347ec36d
2 changed files with 7 additions and 2 deletions

View file

@ -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

View file

@ -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)