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

app/models/invitation.rb

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

spec/controllers/admins_controller_spec.rb

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