Merge pull request #3070 from luisramos0/2-0-order-spec-restart

[Spree Upgrade] Fix order spec restart checkout test and orders controller enterprise with fees test

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!

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 }