From 57b54637e39d23d6be61d11e1034d56ab1ae4e86 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 15 Feb 2021 11:22:52 +0000
Subject: [PATCH] Ensure order factory selects shipping rates correctly

---
 spec/factories/order_factory.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/factories/order_factory.rb b/spec/factories/order_factory.rb
index 685f08af71..378251bda6 100644
--- a/spec/factories/order_factory.rb
+++ b/spec/factories/order_factory.rb
@@ -92,9 +92,10 @@ FactoryBot.define do
                          payment_method: evaluator.payment_method)
         order.recreate_all_fees!
         order.ship_address = evaluator.ship_address
-        while !order.completed? do break unless a = order.next! end
+        while !order.delivery? do break unless a = order.next! end
         order.select_shipping_method(evaluator.shipping_method.id)
-        order.save
+
+        while !order.completed? do break unless a = order.next! end
       end
     end
   end