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

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
Dan Hansen 2011-02-25 18:56:21 -06:00
commit a9ab842242
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/invitation.rb
View file

@ -74,7 +74,6 @@ class Invitation < ActiveRecord::Base
opts[:from].save! opts[:from].save!
invitee.reload invitee.reload
end end
puts (opts[:service] == 'email')
invitee.invite!(:email => (opts[:service] == 'email')) invitee.invite!(:email => (opts[:service] == 'email'))
log_string = "event=invitation_sent to=#{opts[:identifier]} service=#{opts[:service]} " log_string = "event=invitation_sent to=#{opts[:identifier]} service=#{opts[:service]} "
log_string << "inviter=#{opts[:from].diaspora_handle} inviter_uid=#{opts[:from].id} inviter_created_at_unix=#{opts[:from].created_at.to_i}" if opts[:from] log_string << "inviter=#{opts[:from].diaspora_handle} inviter_uid=#{opts[:from].id} inviter_created_at_unix=#{opts[:from].created_at.to_i}" if opts[:from]

2
spec/controllers/admins_controller_spec.rb
View file

@ -55,7 +55,7 @@ describe AdminsController do
describe '#admin_inviter' do describe '#admin_inviter' do
it 'invites a user' do it 'invites a user' do
Invitation.should_receive(:create_invitee).with(:identifier => 'bob@moms.com') Invitation.should_receive(:create_invitee).with(:service => 'email', :identifier => 'bob@moms.com')
get :admin_inviter, :identifier => 'bob@moms.com' get :admin_inviter, :identifier => 'bob@moms.com'
response.should be_redirect response.should be_redirect
end end