diff --git a/app/jobs/welcome_enterprise_job.rb b/app/jobs/welcome_enterprise_job.rb deleted file mode 100644 index 1c36d5a916..0000000000 --- a/app/jobs/welcome_enterprise_job.rb +++ /dev/null @@ -1,8 +0,0 @@ -# frozen_string_literal: true - -class WelcomeEnterpriseJob < ActiveJob::Base - def perform(enterprise_id) - enterprise = Enterprise.find enterprise_id - EnterpriseMailer.welcome(enterprise).deliver_now - end -end diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb index 4c7aa40bd8..b3a5669f03 100644 --- a/app/models/enterprise.rb +++ b/app/models/enterprise.rb @@ -400,7 +400,7 @@ class Enterprise < ActiveRecord::Base end def send_welcome_email - WelcomeEnterpriseJob.perform_later(id) + EnterpriseMailer.welcome(self).deliver_later end def strip_url(url) diff --git a/spec/jobs/welcome_enterprise_job_spec.rb b/spec/jobs/welcome_enterprise_job_spec.rb deleted file mode 100644 index 4ccbe8eff4..0000000000 --- a/spec/jobs/welcome_enterprise_job_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe WelcomeEnterpriseJob do - let(:enterprise) { create(:enterprise) } - - it "sends a welcome email to the enterprise" do - mail = double(:mail) - expect(EnterpriseMailer).to receive(:welcome).with(enterprise).and_return(mail) - expect(mail).to receive(:deliver_now) - - WelcomeEnterpriseJob.perform_now(enterprise.id) - end -end diff --git a/spec/models/enterprise_spec.rb b/spec/models/enterprise_spec.rb index 9bf8944425..48643c23e9 100644 --- a/spec/models/enterprise_spec.rb +++ b/spec/models/enterprise_spec.rb @@ -11,7 +11,9 @@ describe Enterprise do it "sends a welcome email" do expect do create(:enterprise, owner: user) - end.to enqueue_job WelcomeEnterpriseJob + end.to enqueue_job ActionMailer::DeliveryJob + + expect(enqueued_jobs.last.to_s).to match "welcome" end end end