From 23910dbab418f9a8ea53ea2ad2baef679e6b6d19 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Tue, 11 May 2021 11:28:55 +0100 Subject: [PATCH] Use OrderContents in BulkLineItemsController We should move towards *all* operations on an order's line items being done exclusively through this service. --- app/controllers/admin/bulk_line_items_controller.rb | 2 +- spec/controllers/admin/bulk_line_items_controller_spec.rb | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/controllers/admin/bulk_line_items_controller.rb b/app/controllers/admin/bulk_line_items_controller.rb index b9e95c6e49..526c521f99 100644 --- a/app/controllers/admin/bulk_line_items_controller.rb +++ b/app/controllers/admin/bulk_line_items_controller.rb @@ -49,7 +49,7 @@ module Admin load_line_item authorize! :update, order - @line_item.destroy + order.contents.remove(@line_item.variant, @line_item.quantity) render body: nil, status: :no_content # No Content, does not trigger ng resource auto-update end diff --git a/spec/controllers/admin/bulk_line_items_controller_spec.rb b/spec/controllers/admin/bulk_line_items_controller_spec.rb index 2351175485..f376650554 100644 --- a/spec/controllers/admin/bulk_line_items_controller_spec.rb +++ b/spec/controllers/admin/bulk_line_items_controller_spec.rb @@ -378,9 +378,6 @@ describe Admin::BulkLineItemsController, type: :controller do expect(order.included_tax_total).to eq 1.22 expect(order.payment_state).to eq "paid" - expect(order).to receive(:update_order!).at_least(:once).and_call_original - expect(order).to receive(:create_tax_charge!).at_least(:once).and_call_original - spree_delete :destroy, params order.reload