From 4a925d192f035b725d140a116994e32d03a2632c Mon Sep 17 00:00:00 2001 From: zhitomirskiyi Date: Wed, 26 Jan 2011 22:06:17 -0800 Subject: [PATCH] refactored the api --- spec/controllers/invitations_controller_spec.rb | 4 ++-- spec/models/jobs/resend_invitation_spec.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/controllers/invitations_controller_spec.rb b/spec/controllers/invitations_controller_spec.rb index 51fad80ba..c80351ab1 100644 --- a/spec/controllers/invitations_controller_spec.rb +++ b/spec/controllers/invitations_controller_spec.rb @@ -126,7 +126,7 @@ describe InvitationsController do @controller.stub!(:current_user).and_return(@user) request.env["HTTP_REFERER"]= 'http://test.host/cats/foo' - @invited_user = @user.invite_user("a@a.com", @aspect.id) + @invited_user = @user.invite_user(@aspect.id, 'email', "a@a.com", "") end it 'calls resend invitation if one exists' do @@ -139,7 +139,7 @@ describe InvitationsController do it 'does not send an invitation for a different user' do @user2 = bob @aspect2 = @user2.aspects.create(:name => "cats") - @user2.invite_user("b@b.com", @aspect2.id) + @user2.invite_user(@aspect2.id, 'email', "b@b.com", "") invitation2 = @user2.reload.invitations_from_me.first Resque.should_not_receive(:enqueue) put :resend, :id => invitation2.id diff --git a/spec/models/jobs/resend_invitation_spec.rb b/spec/models/jobs/resend_invitation_spec.rb index 49879c3a1..b07186ba2 100644 --- a/spec/models/jobs/resend_invitation_spec.rb +++ b/spec/models/jobs/resend_invitation_spec.rb @@ -9,13 +9,13 @@ describe Job::ResendInvitation do it 'should call .resend on the object' do user = alice aspect = user.aspects.create(:name => "cats") - user.invite_user("b@b.com", aspect.id) + user.invite_user(aspect.id, 'email', "a@a.com", "") invitation = user.reload.invitations_from_me.first #Notification.should_receive(:notify).with(instance_of(User), instance_of(StatusMessage), instance_of(Person)) - Invitation.stub(:where).with(:id => invitation.id ).and_return(invitation) + Invitation.stub(:where).with(:id => invitation.id ).and_return([invitation]) invitation.should_receive(:resend) - Job::ResendInvitation.perform_delegate(invitation) + Job::ResendInvitation.perform_delegate(invitation.id) end end end