Skip to content
Extraits de code Groupes Projets
Valider 0cc02fb5 rédigé par David Thompson's avatar David Thompson
Parcourir les fichiers

Use InviteEmail worker in InvitationsController create action.

parent 33f858b5
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -58,9 +58,10 @@ class InvitationsController < ApplicationController
session[:invalid_email_invites] = invalid_emails
unless valid_emails.empty?
inviter = EmailInviter.new(valid_emails.join(','), current_user,
params[:email_inviter])
inviter.send!
Workers::Mail::InviteEmail.perform_async(valid_emails.join(','),
current_user.id,
params[:email_inviter])
end
if emails.empty?
......
......@@ -26,7 +26,7 @@ describe InvitationsController do
end
it 'does not create an EmailInviter' do
EmailInviter.should_not_receive(:new)
Workers::Mail::InviteEmail.should_not_receive(:perform_async)
post :create, @invite
end
......@@ -47,10 +47,9 @@ describe InvitationsController do
@invite = {'email_inviter' => {'message' => "test", 'emails' => @emails}}
end
it 'creates an EmailInviter' do
it 'creates an InviteEmail worker' do
inviter = stub(:emails => [@emails], :send! => true)
EmailInviter.should_receive(:new).with(@invite['email_inviter']['emails'], @user, @invite['email_inviter']).
and_return(inviter)
Workers::Mail::InviteEmail.should_receive(:perform_async).with(@invite['email_inviter']['emails'], @user.id, @invite['email_inviter'])
post :create, @invite
end
......@@ -72,8 +71,8 @@ describe InvitationsController do
@invite = {'email_inviter' => {'message' => "test", 'emails' => @emails}}
end
it 'does not create an EmailInviter' do
EmailInviter.should_not_receive(:new)
it 'does not create an InviteEmail worker' do
Workers::Mail::InviteEmail.should_not_receive(:perform_async)
post :create, @invite
end
......@@ -98,10 +97,9 @@ describe InvitationsController do
@valid_emails + ',' + @invalid_emails}}
end
it 'creates an EmailInviter' do
it 'creates an InviteEmail worker' do
inviter = stub(:emails => [@emails], :send! => true)
EmailInviter.should_receive(:new).with(@valid_emails, @user, @invite['email_inviter']).
and_return(inviter)
Workers::Mail::InviteEmail.should_receive(:perform_async).with(@valid_emails, @user.id, @invite['email_inviter'])
post :create, @invite
end
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter