From 5b68b2f7073846e1e9510cabae335841cfc9458d Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Thu, 22 Aug 2019 21:32:37 +0800 Subject: [PATCH] Fix ship method when advancing subscription order --- app/jobs/subscription_placement_job.rb | 2 +- spec/jobs/subscription_placement_job_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/jobs/subscription_placement_job.rb b/app/jobs/subscription_placement_job.rb index 51056da676..26c67997ba 100644 --- a/app/jobs/subscription_placement_job.rb +++ b/app/jobs/subscription_placement_job.rb @@ -59,7 +59,7 @@ class SubscriptionPlacementJob end def move_to_completion(order) - until order.completed? do order.next! end + AdvanceOrderService.new(order).call! end def unavailable_stock_lines_for(order) diff --git a/spec/jobs/subscription_placement_job_spec.rb b/spec/jobs/subscription_placement_job_spec.rb index 0e59caccf6..bd008682e3 100644 --- a/spec/jobs/subscription_placement_job_spec.rb +++ b/spec/jobs/subscription_placement_job_spec.rb @@ -155,7 +155,7 @@ describe SubscriptionPlacementJob do create(:subscription, shop: shop, shipping_method: shipping_method, with_items: true) end - pending "uses the same shipping method after advancing the order" do + it "uses the same shipping method after advancing the order" do job.send(:process, order) expect(order.state).to eq "complete" order.reload