Skip to content
Extraits de code Groupes Projets
Valider a1f3ab30 rédigé par danielvincent's avatar danielvincent
Parcourir les fichiers

mark requests as read when a user responds to the request

parent c17425b7
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -20,6 +20,10 @@ module Diaspora ...@@ -20,6 +20,10 @@ module Diaspora
end end
def accept_contact_request(request, aspect) def accept_contact_request(request, aspect)
if notification = Notification.first(:target_id=>request.id)
notification.update_attributes(:unread=>false)
end
activate_contact(request.from, aspect) activate_contact(request.from, aspect)
request.destroy request.destroy
request.reverse_for(self) request.reverse_for(self)
......
...@@ -105,6 +105,16 @@ describe Diaspora::UserModules::Connecting do ...@@ -105,6 +105,16 @@ describe Diaspora::UserModules::Connecting do
user.accept_contact_request(@received_request, aspect) user.accept_contact_request(@received_request, aspect)
}.should change(Request, :count ).by(-1) }.should change(Request, :count ).by(-1)
end end
it "should mark the corresponding notification as 'read'" do
notification = Notification.create(:target_id => @received_request.id,
:kind => 'new_request',
:unread => true)
Notification.first(:target_id=>@received_request.id).unread.should be_true
user.accept_contact_request(@received_request, aspect)
Notification.first(:target_id=>@received_request.id).unread.should be_false
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) proc { user.ignore_contact_request(@received_request.id)
}.should change(Request, :count ).by(-1) }.should change(Request, :count ).by(-1)
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter