Skip to content
Extraits de code Groupes Projets
Valider 2c1c2a4a rédigé par zhitomirskiyi's avatar zhitomirskiyi
Parcourir les fichiers

WIP

parent 83a9e916
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -31,7 +31,7 @@ Diaspora::Application.routes.draw do ...@@ -31,7 +31,7 @@ Diaspora::Application.routes.draw do
match 'photos/make_profile_photo' => 'photos#make_profile_photo' match 'photos/make_profile_photo' => 'photos#make_profile_photo'
resources :photos, :except => [:index] resources :photos, :except => [:index]
match 'invitations/resend/:id' => 'invitations#resend'
devise_for :users, :controllers => {:registrations => "registrations", devise_for :users, :controllers => {:registrations => "registrations",
:password => "devise/passwords", :password => "devise/passwords",
:invitations => "invitations"} do :invitations => "invitations"} do
......
...@@ -301,7 +301,7 @@ describe Invitation do ...@@ -301,7 +301,7 @@ describe Invitation do
describe '.resend' do describe '.resend' do
before do before do
aspect aspect
user.invite_user("a@a.com", aspect.id) user.invite_user(aspect.id, 'email', "a@a.com", "")
@invitation = user.reload.invitations_from_me.first @invitation = user.reload.invitations_from_me.first
end end
......
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