From f7726e552aa96314d4bb0fab9b93d3de6d166c2e Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Fri, 14 May 2021 19:39:23 +0100 Subject: [PATCH] Adapt code coming from master to the new order api with update_order! --- .../admin/bulk_line_items_controller_spec.rb | 6 +++--- .../api/v0/shipments_controller_spec.rb | 2 +- spec/models/spree/payment_spec.rb | 14 +------------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/spec/controllers/admin/bulk_line_items_controller_spec.rb b/spec/controllers/admin/bulk_line_items_controller_spec.rb index e071f0dffc..966722bdc7 100644 --- a/spec/controllers/admin/bulk_line_items_controller_spec.rb +++ b/spec/controllers/admin/bulk_line_items_controller_spec.rb @@ -335,7 +335,7 @@ describe Admin::BulkLineItemsController, type: :controller do order.finalize! order.recreate_all_fees! order.create_tax_charge! - order.update! + order.update_order! order.payments << create(:payment, payment_method: payment_method, amount: order.total, state: "completed") allow(controller).to receive(:spree_current_user) { distributor.owner } @@ -354,7 +354,7 @@ 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!).at_least(:once).and_call_original + 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_put :update, params @@ -378,7 +378,7 @@ 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!).at_least(:once).and_call_original + 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 diff --git a/spec/controllers/api/v0/shipments_controller_spec.rb b/spec/controllers/api/v0/shipments_controller_spec.rb index 9720b8df57..dd1be3c0fc 100644 --- a/spec/controllers/api/v0/shipments_controller_spec.rb +++ b/spec/controllers/api/v0/shipments_controller_spec.rb @@ -204,7 +204,7 @@ describe Api::V0::ShipmentsController, type: :controller do before do order.shipments.first.shipping_methods = [shipping_method1, shipping_method2] order.select_shipping_method(shipping_method1.id) - order.update! + order.update_order! order.update_columns( payment_total: 60, payment_state: "paid" diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb index 376d8adbde..e45cad131c 100644 --- a/spec/models/spree/payment_spec.rb +++ b/spec/models/spree/payment_spec.rb @@ -531,7 +531,6 @@ describe Spree::Payment do end context "#save" do -<<<<<<< HEAD context "completed payments" do it "updates order payment total" do payment = create(:payment, amount: 100, order: order, state: "completed") @@ -572,19 +571,8 @@ describe Spree::Payment do expect(order_updater).to receive(:update_shipment_state) create(:payment, amount: 100, order: order) end -======= - it "should call order#update_order!" do - gateway.name = 'Gateway' - gateway.distributors << create(:distributor_enterprise) - gateway.save! - - order = create(:order) - payment = Spree::Payment.create(amount: 100, order: order, payment_method: gateway) - expect(order).to receive(:update_order!) - payment.save ->>>>>>> 95ea3f27b... Rename order.update! to order.update_order! and adjustment.update! to adjustment.update_adjustment! end - + context "when profiles are supported" do before do gateway.stub payment_profiles_supported?: true