Delete an accepted friend request
This commit is contained in:
parent
e2e3b2511d
commit
2d347ec36d
2 changed files with 7 additions and 2 deletions
|
|
@ -27,6 +27,7 @@ module Diaspora
|
||||||
def accept_contact_request(request, aspect)
|
def accept_contact_request(request, aspect)
|
||||||
pending_request_ids.delete(request.id.to_id)
|
pending_request_ids.delete(request.id.to_id)
|
||||||
activate_contact(request.from, aspect)
|
activate_contact(request.from, aspect)
|
||||||
|
request.destroy
|
||||||
request.reverse_for(self)
|
request.reverse_for(self)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -59,12 +59,16 @@ describe Diaspora::UserModules::Connecting do
|
||||||
user.reload
|
user.reload
|
||||||
end
|
end
|
||||||
|
|
||||||
it "should delete an accepted contact request" do
|
it "should delete an accepted contact request from pending_requests" do
|
||||||
proc {
|
proc {
|
||||||
user.accept_contact_request(@received_request, aspect)
|
user.accept_contact_request(@received_request, aspect)
|
||||||
}.should change(user.reload.pending_requests, :count ).by(-1)
|
}.should change(user.reload.pending_requests, :count ).by(-1)
|
||||||
end
|
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
|
it 'should be able to ignore a pending contact request' do
|
||||||
proc { user.ignore_contact_request(@received_request.id) }.should change(
|
proc { user.ignore_contact_request(@received_request.id) }.should change(
|
||||||
user.reload.pending_requests, :count ).by(-1)
|
user.reload.pending_requests, :count ).by(-1)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue