From ac37db7e00788e90f3d17b0f0381ebec9319276e Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Tue, 23 Feb 2021 13:34:11 +0000
Subject: [PATCH] Update test setup in OrderCycleManagement report

---
 .../order_cycle_management_report_spec.rb     | 33 +++++--------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/spec/lib/open_food_network/order_cycle_management_report_spec.rb b/spec/lib/open_food_network/order_cycle_management_report_spec.rb
index 7e31c66e3c..7e6afa240b 100644
--- a/spec/lib/open_food_network/order_cycle_management_report_spec.rb
+++ b/spec/lib/open_food_network/order_cycle_management_report_spec.rb
@@ -164,11 +164,9 @@ module OpenFoodNetwork
 
           let!(:order) do
             create(
-              :order,
+              :completed_order_with_totals,
               distributor: distributor,
-              completed_at: 1.day.ago,
-              state: 'complete',
-              total: 10.0
+              completed_at: 1.day.ago
             )
           end
 
@@ -180,50 +178,37 @@ module OpenFoodNetwork
               '',
               order.email,
               order.billing_address.phone,
+              order.shipment.shipping_method.name,
               nil,
               nil,
-              nil,
-              -10.0
+              -order.total
             ]])
           end
         end
 
         context 'when the report type is not payment_methods' do
           let(:params) { {} }
-
-          let(:shipping_method) { create(:shipping_method) }
-          let(:shipment) { create(:shipment_with, :shipping_method, shipping_method: shipping_method) }
-
           let!(:order) do
             create(
-              :order,
+              :completed_order_with_totals,
               distributor: distributor,
-              completed_at: 1.day.ago,
-              shipments: [shipment]
+              completed_at: 1.day.ago
             )
           end
 
-          before do
-            line_item = create(:line_item, order: order, price: 10.0, quantity: 1)
-
-            order.state = 'complete'
-            order.ship_address = order.address_from_distributor
-            order.save!
-          end
-
           it 'returns rows with delivery information' do
             expect(subject.table_items).to eq([[
               order.ship_address.firstname,
               order.ship_address.lastname,
               order.distributor.name,
-              nil,
+              "",
               "#{order.ship_address.address1} #{order.ship_address.address2} #{order.ship_address.city}",
               order.ship_address.zipcode,
               order.ship_address.phone,
-              shipping_method.name,
+              order.shipment.shipping_method.name,
               nil,
               nil,
-              -10.0,
+              -order.total,
               false,
               order.special_instructions
             ]])