From e6f11a39b5517c9492616d6396b7bdd7136e14dd Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Fri, 25 Feb 2011 15:28:04 -0800
Subject: [PATCH] remove puts, fix admins controller test
---
app/models/invitation.rb | 1 -
spec/controllers/admins_controller_spec.rb | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/app/models/invitation.rb b/app/models/invitation.rb
index 8fb780d100..886731f3e6 100644
--- a/app/models/invitation.rb
+++ b/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]
diff --git a/spec/controllers/admins_controller_spec.rb b/spec/controllers/admins_controller_spec.rb
index c09eb03f1b..1ae61d5b60 100644
--- a/spec/controllers/admins_controller_spec.rb
+++ b/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
--
GitLab