Commit a9ab8422 authored by Dan Hansen's avatar Dan Hansen
Browse files

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

parents c1e679ff e6f11a39
......@@ -74,7 +74,6 @@ class Invitation < ActiveRecord::Base
opts[:from].save!
invitee.reload
end
puts (opts[:service] == 'email')
invitee.invite!(:email => (opts[:service] == 'email'))
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]
......
......@@ -55,7 +55,7 @@ describe AdminsController do
describe '#admin_inviter' 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'
response.should be_redirect
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment