From c66b611b998538035450e29dd791e600c1dfcdc8 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sun, 16 Sep 2018 23:27:13 +0100 Subject: [PATCH] Fixed setting shipping_method in the order through order.shipments in proxy_order_spec, lib/open_food_network/customers_report_spec and features/admin/shipping_methods_spec --- spec/features/admin/shipping_methods_spec.rb | 4 +++- spec/lib/open_food_network/customers_report_spec.rb | 2 +- spec/models/proxy_order_spec.rb | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/spec/features/admin/shipping_methods_spec.rb b/spec/features/admin/shipping_methods_spec.rb index 4a06ea139a..1395b2bee8 100644 --- a/spec/features/admin/shipping_methods_spec.rb +++ b/spec/features/admin/shipping_methods_spec.rb @@ -51,7 +51,9 @@ feature 'shipping methods' do scenario "deleting a shipping method referenced by an order" do o = create(:order) - o.shipping_method = @sm + shipment = create(:shipment) + shipment.add_shipping_method(@sm, true) + o.shipments << shipment o.save! visit_delete spree.admin_shipping_method_path(@sm) diff --git a/spec/lib/open_food_network/customers_report_spec.rb b/spec/lib/open_food_network/customers_report_spec.rb index c17d54368d..86b17cc2a6 100644 --- a/spec/lib/open_food_network/customers_report_spec.rb +++ b/spec/lib/open_food_network/customers_report_spec.rb @@ -45,7 +45,7 @@ module OpenFoodNetwork a = create(:address) d = create(:distributor_enterprise) o = create(:order, distributor: d, bill_address: a) - o.shipping_method = create(:shipping_method) + o.shipments << create(:shipment) subject.stub(:orders).and_return [o] subject.table.should == [[ diff --git a/spec/models/proxy_order_spec.rb b/spec/models/proxy_order_spec.rb index b84089c015..fe9c945297 100644 --- a/spec/models/proxy_order_spec.rb +++ b/spec/models/proxy_order_spec.rb @@ -77,7 +77,8 @@ describe ProxyOrder, type: :model do describe "resume" do let!(:payment_method) { create(:payment_method) } - let(:order) { create(:order_with_totals, shipping_method: create(:shipping_method)) } + let!(:shipment) { create(:shipment) } + let(:order) { create(:order_with_totals, shipments: [shipment]) } let(:proxy_order) { create(:proxy_order, order: order, canceled_at: Time.zone.now) } let(:order_cycle) { proxy_order.order_cycle }