nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP

Browse source
This commit is contained in:
zhitomirskiyi 2011-01-23 01:00:03 -08:00
parent 83a9e916e4
commit 2c1c2a4a8a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/routes.rb
View file

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

2
spec/models/invitation_spec.rb
View file

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