From ee8d77bc099029186e10cff279b41c768aa163cf Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sat, 17 Nov 2018 11:57:16 +0000 Subject: [PATCH 1/2] Fix order spec restart checkout test by adding a required line_item to the order being tested --- spec/models/spree/order_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb index 26e6c260e4..ecb966e9d2 100644 --- a/spec/models/spree/order_spec.rb +++ b/spec/models/spree/order_spec.rb @@ -821,7 +821,7 @@ describe Spree::Order do end describe '#restart_checkout!' do - let(:order) { build(:order) } + let(:order) { build(:order, line_items: [build(:line_item)]) } context 'when the order is complete' do before { order.completed_at = Time.zone.now } From b40c0e5b80d75c2350c7fffda44d02172c6f04e9 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sat, 17 Nov 2018 12:11:23 +0000 Subject: [PATCH 2/2] Fix order controller spec with enterprise fees by adapting to new order factory with 5 line items by default --- spec/controllers/spree/orders_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb index bd661e4149..43ab94211e 100644 --- a/spec/controllers/spree/orders_controller_spec.rb +++ b/spec/controllers/spree/orders_controller_spec.rb @@ -214,7 +214,7 @@ describe Spree::OrdersController, type: :controller do let(:enterprise_fee) { create(:enterprise_fee, calculator: build(:calculator_per_item) ) } let!(:exchange) { create(:exchange, incoming: true, sender: variant.product.supplier, receiver: order_cycle.coordinator, variants: [variant], enterprise_fees: [enterprise_fee]) } let!(:order) do - order = create(:completed_order_with_totals, user: user, distributor: distributor, order_cycle: order_cycle) + order = create(:completed_order_with_totals, line_items_count: 1, user: user, distributor: distributor, order_cycle: order_cycle) order.reload.line_items.first.update_attributes(variant_id: variant.id) while !order.completed? do break unless order.next! end order.update_distribution_charge!