From 3dacd06b6b77e3b3d469c026cfb6e1b2372ce35a Mon Sep 17 00:00:00 2001
From: Rob Harrington <oeoeaio@gmail.com>
Date: Thu, 28 Jun 2018 18:56:13 +1000
Subject: [PATCH] Reload order before sending emails to ensure state is up to
 date

---
 app/jobs/subscription_confirm_job.rb       | 2 ++
 spec/jobs/subscription_confirm_job_spec.rb | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/jobs/subscription_confirm_job.rb b/app/jobs/subscription_confirm_job.rb
index d9c284d7f8..f0c8e8d07f 100644
--- a/app/jobs/subscription_confirm_job.rb
+++ b/app/jobs/subscription_confirm_job.rb
@@ -46,11 +46,13 @@ class SubscriptionConfirmJob
   end
 
   def send_confirm_email
+    @order.update!
     record_success(@order)
     SubscriptionMailer.confirmation_email(@order).deliver
   end
 
   def send_failed_payment_email
+    @order.update!
     record_and_log_error(:failed_payment, @order)
     SubscriptionMailer.failed_payment_email(@order).deliver
   end
diff --git a/spec/jobs/subscription_confirm_job_spec.rb b/spec/jobs/subscription_confirm_job_spec.rb
index f1b64b1343..7556a30478 100644
--- a/spec/jobs/subscription_confirm_job_spec.rb
+++ b/spec/jobs/subscription_confirm_job_spec.rb
@@ -174,7 +174,7 @@ describe SubscriptionConfirmJob do
   end
 
   describe "#send_confirm_email" do
-    let(:order) { double(:order) }
+    let(:order) { instance_double(Spree::Order) }
     let(:mail_mock) { double(:mailer_mock, deliver: true) }
 
     before do
@@ -183,6 +183,7 @@ describe SubscriptionConfirmJob do
     end
 
     it "records a success and sends the email" do
+      expect(order).to receive(:update!)
       expect(job).to receive(:record_success).with(order).once
       job.send(:send_confirm_email)
       expect(SubscriptionMailer).to have_received(:confirmation_email).with(order)
@@ -191,7 +192,7 @@ describe SubscriptionConfirmJob do
   end
 
   describe "#send_failed_payment_email" do
-    let(:order) { double(:order) }
+    let(:order) { instance_double(Spree::Order) }
     let(:mail_mock) { double(:mailer_mock, deliver: true) }
 
     before do
@@ -200,6 +201,7 @@ describe SubscriptionConfirmJob do
     end
 
     it "records and logs an error and sends the email" do
+      expect(order).to receive(:update!)
       expect(job).to receive(:record_and_log_error).with(:failed_payment, order).once
       job.send(:send_failed_payment_email)
       expect(SubscriptionMailer).to have_received(:failed_payment_email).with(order)