From bb06058fed2ab51b9d1493ab24ebbcb4b239f322 Mon Sep 17 00:00:00 2001 From: Edwin Mak Date: Mon, 21 Sep 2020 11:40:05 -0500 Subject: [PATCH] Reverts PR 1835 (#1865) --- app/controllers/distributions_controller.rb | 2 +- app/jobs/partner_mailer_job.rb | 4 +--- app/services/distribution_create_service.rb | 2 +- spec/jobs/partner_mailer_job_spec.rb | 4 ++-- spec/requests/distributions_requests_spec.rb | 21 ++++++++----------- .../distribution_create_service_spec.rb | 7 +++---- spec/system/distribution_system_spec.rb | 5 +++-- 7 files changed, 20 insertions(+), 25 deletions(-) diff --git a/app/controllers/distributions_controller.rb b/app/controllers/distributions_controller.rb index 2684f8712f..918546de12 100644 --- a/app/controllers/distributions_controller.rb +++ b/app/controllers/distributions_controller.rb @@ -154,7 +154,7 @@ def insufficient_error_message(details) end def send_notification(org, dist, subject: 'Your Distribution') - PartnerMailerJob.perform_async(org, dist, subject) if Flipper.enabled?(:email_active) + PartnerMailerJob.perform_now(org, dist, subject) if Flipper.enabled?(:email_active) end def schedule_reminder_email(distribution) diff --git a/app/jobs/partner_mailer_job.rb b/app/jobs/partner_mailer_job.rb index 41617dd775..6aa52b724c 100644 --- a/app/jobs/partner_mailer_job.rb +++ b/app/jobs/partner_mailer_job.rb @@ -1,7 +1,5 @@ # This job notifies a Partner that they have a pending distribution -class PartnerMailerJob - include Sidekiq::Worker - +class PartnerMailerJob < ApplicationJob def perform(org_id, dist_id, subject) current_organization = Organization.find(org_id) distribution = Distribution.find(dist_id) diff --git a/app/services/distribution_create_service.rb b/app/services/distribution_create_service.rb index c86f587446..5ee287d5f8 100644 --- a/app/services/distribution_create_service.rb +++ b/app/services/distribution_create_service.rb @@ -20,6 +20,6 @@ def call private def send_notification - PartnerMailerJob.perform_async(distribution_organization.id, distribution.id, 'Your Distribution') if Flipper.enabled?(:email_active) + PartnerMailerJob.perform_now(distribution_organization.id, distribution.id, 'Your Distribution') if Flipper.enabled?(:email_active) end end diff --git a/spec/jobs/partner_mailer_job_spec.rb b/spec/jobs/partner_mailer_job_spec.rb index fb32763764..2fc605770c 100644 --- a/spec/jobs/partner_mailer_job_spec.rb +++ b/spec/jobs/partner_mailer_job_spec.rb @@ -9,13 +9,13 @@ it "does not send mail for past distributions" do expect do - PartnerMailerJob.new.perform(organization.id, past_distribution.id, mailer_subject) + PartnerMailerJob.perform_now(organization.id, past_distribution.id, mailer_subject) end.not_to change { ActionMailer::Base.deliveries.count } end it "sends mail for future distributions immediately" do expect do - PartnerMailerJob.new.perform(organization.id, future_distribution.id, mailer_subject) + PartnerMailerJob.perform_now(organization.id, future_distribution.id, mailer_subject) end.to change { ActionMailer::Base.deliveries.count }.by(1) end end diff --git a/spec/requests/distributions_requests_spec.rb b/spec/requests/distributions_requests_spec.rb index 32062ca2d0..5c0f0c5b25 100644 --- a/spec/requests/distributions_requests_spec.rb +++ b/spec/requests/distributions_requests_spec.rb @@ -62,12 +62,13 @@ expect(partner).to be_valid expect(Flipper).to receive(:enabled?).with(:email_active).and_return(true) - post distributions_path(params) + expect do + post distributions_path(params) - expect(response).to have_http_status(:redirect) - last_distribution = Distribution.last - expect(response).to redirect_to(distribution_path(last_distribution)) - expect(PartnerMailerJob).to have_enqueued_sidekiq_job(last_distribution.organization.id, last_distribution.id, /Your Distribution/) + expect(response).to have_http_status(:redirect) + last_distribution = Distribution.last + expect(response).to redirect_to(distribution_path(last_distribution)) + end.to change { ActionMailer::Base.deliveries.count }.by(1) end it "renders #new again on failure, with notice" do @@ -231,18 +232,14 @@ before { allow(Flipper).to receive(:enabled?).with(:email_active).and_return(true) } it "does not send an e-mail" do - Sidekiq::Testing.inline! do - subject - expect(PartnerMailerJob).not_to have_enqueued_sidekiq_job(distribution.organization.id, distribution.id, "Your Distribution") - end + expect { subject }.not_to change { ActionMailer::Base.deliveries.count } end context "sending" do let(:issued_at) { distribution.issued_at + 1.day } - it "does send the email" do - subject - expect(PartnerMailerJob).to have_enqueued_sidekiq_job(distribution.organization.id, distribution.id, /Your Distribution Date Has Changed/) + it "does send an e-mail" do + expect { subject }.to change { ActionMailer::Base.deliveries.count }.by(1) end end diff --git a/spec/services/distribution_create_service_spec.rb b/spec/services/distribution_create_service_spec.rb index 582b62575a..ae0d6c01e2 100644 --- a/spec/services/distribution_create_service_spec.rb +++ b/spec/services/distribution_create_service_spec.rb @@ -22,9 +22,8 @@ @partner.update!(send_reminders: true) allow(Flipper).to receive(:enabled?).with(:email_active).and_return(true) - result = subject.new(distribution_params).call - - expect(PartnerMailerJob).to have_enqueued_sidekiq_job(@organization.id, result.distribution.id, "Your Distribution") + expect(PartnerMailerJob).to receive(:perform_now).once + subject.new(distribution_params).call end end @@ -33,7 +32,7 @@ @partner.update!(send_reminders: false) allow(Flipper).to receive(:enabled?).with(:email_active).and_return(true) - expect(PartnerMailerJob).not_to receive(:perform_async) + expect(PartnerMailerJob).not_to receive(:perform_now) subject.new(distribution_params).call end end diff --git a/spec/system/distribution_system_spec.rb b/spec/system/distribution_system_spec.rb index 8afaf3c9e9..66a80bbfcc 100644 --- a/spec/system/distribution_system_spec.rb +++ b/spec/system/distribution_system_spec.rb @@ -19,9 +19,10 @@ choose "Pick up" fill_in "Comment", with: "Take my wipes... please" - expect(PartnerMailerJob).to receive(:perform_async) - click_button "Save", match: :first + expect do + click_button "Save", match: :first + end.to change { ActionMailer::Base.deliveries.count }.by(1) expect(page).to have_content "Distributions" expect(page.find(".alert-info")).to have_content "reated"