From bbdbfc1374657e49d169c550fc231ef3d2b9de28 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Thu, 8 Nov 2018 21:46:51 +0000 Subject: [PATCH 1/2] Fix opi/orders_controller_spec by providing line items with shipment and thus make the order workflow work --- spec/controllers/api/orders_controller_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/controllers/api/orders_controller_spec.rb b/spec/controllers/api/orders_controller_spec.rb index 9bcdbeb7ad..f73e720638 100644 --- a/spec/controllers/api/orders_controller_spec.rb +++ b/spec/controllers/api/orders_controller_spec.rb @@ -25,19 +25,19 @@ module Api distributor: distributor, billing_address: create(:address) ) end let!(:line_item1) do - create(:line_item, order: order1, + create(:line_item_with_shipment, order: order1, product: create(:product, supplier: supplier)) end let!(:line_item2) do - create(:line_item, order: order2, + create(:line_item_with_shipment, order: order2, product: create(:product, supplier: supplier)) end let!(:line_item3) do - create(:line_item, order: order2, + create(:line_item_with_shipment, order: order2, product: create(:product, supplier: supplier)) end let!(:line_item4) do - create(:line_item, order: order3, + create(:line_item_with_shipment, order: order3, product: create(:product, supplier: supplier)) end let!(:regular_user) { create(:user) } From ef5d679f90cffa6b9a01755468ac830e9b9712aa Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 12 Nov 2018 16:25:08 +0000 Subject: [PATCH 2/2] Fix api/orders_controller_spec by fixing expectations on order attributes: remove old attributes shipments_path and show_path --- spec/controllers/api/orders_controller_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/controllers/api/orders_controller_spec.rb b/spec/controllers/api/orders_controller_spec.rb index f73e720638..879fd40177 100644 --- a/spec/controllers/api/orders_controller_spec.rb +++ b/spec/controllers/api/orders_controller_spec.rb @@ -149,8 +149,8 @@ module Api def order_attributes [ :id, :number, :full_name, :email, :phone, :completed_at, :display_total, - :show_path, :edit_path, :state, :payment_state, :shipment_state, - :payments_path, :shipments_path, :ship_path, :ready_to_ship, :created_at, + :edit_path, :state, :payment_state, :shipment_state, + :payments_path, :ship_path, :ready_to_ship, :created_at, :distributor_name, :special_instructions, :payment_capture_path ] end