diff --git a/app/controllers/admin/manager_invitations_controller.rb b/app/controllers/admin/manager_invitations_controller.rb index 0972f7013a..3d9e93323d 100644 --- a/app/controllers/admin/manager_invitations_controller.rb +++ b/app/controllers/admin/manager_invitations_controller.rb @@ -35,7 +35,7 @@ module Admin new_user.save! @enterprise.users << new_user - ManagerInvitationJob.perform_later(@enterprise.id, new_user.id) + EnterpriseMailer.manager_invitation(@enterprise, new_user).deliver_later new_user end diff --git a/app/jobs/manager_invitation_job.rb b/app/jobs/manager_invitation_job.rb deleted file mode 100644 index d7f4b905bc..0000000000 --- a/app/jobs/manager_invitation_job.rb +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -class ManagerInvitationJob < ActiveJob::Base - def perform(enterprise_id, user_id) - enterprise = Enterprise.find enterprise_id - user = Spree::User.find user_id - EnterpriseMailer.manager_invitation(enterprise, user).deliver_now - end -end diff --git a/spec/controllers/admin/manager_invitations_controller_spec.rb b/spec/controllers/admin/manager_invitations_controller_spec.rb index fb5d08fe00..daffc3d98e 100644 --- a/spec/controllers/admin/manager_invitations_controller_spec.rb +++ b/spec/controllers/admin/manager_invitations_controller_spec.rb @@ -28,16 +28,17 @@ module Admin end context "signing up a new user" do - let(:manager_invitation) { instance_double(ManagerInvitationJob) } + let(:mail_mock) { double(:mailer, deliver_later: true) } before do - setup_email + allow(EnterpriseMailer).to receive(:manager_invitation). + with(enterprise, kind_of(Spree::User)) { mail_mock } + allow(controller).to receive_messages spree_current_user: admin end it 'enqueues an invitation email' do - expect(ManagerInvitationJob) - .to receive(:perform_later).with(enterprise.id, kind_of(Integer)) + expect(mail_mock).to receive(:deliver_later) spree_post :create, email: 'un.registered@email.com', enterprise_id: enterprise.id end