From cde465edad733d3da66b41ac528873be423c07f0 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Thu, 7 Feb 2019 16:05:18 +0100 Subject: [PATCH 1/3] Fix orders controller spec --- 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 75f26c67b6..952e3ad66b 100644 --- a/spec/controllers/spree/orders_controller_spec.rb +++ b/spec/controllers/spree/orders_controller_spec.rb @@ -224,7 +224,7 @@ describe Spree::OrdersController, type: :controller do } } } - expect(order.adjustments.map(&:state)).to eq(['closed', 'closed', 'closed']) + expect(order.adjustments.map(&:state)).to eq(['closed', 'open', 'closed']) end end From f998748634abc8218ce489c07bd08cb70511c765 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Fri, 8 Feb 2019 18:15:25 +0100 Subject: [PATCH 2/3] Clarify why we end up with 3 adjustments And the second one is open. --- spec/controllers/spree/orders_controller_spec.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb index 952e3ad66b..716dd15eb5 100644 --- a/spec/controllers/spree/orders_controller_spec.rb +++ b/spec/controllers/spree/orders_controller_spec.rb @@ -224,6 +224,15 @@ describe Spree::OrdersController, type: :controller do } } } + # Before issuing the update the secod adjustment, which is associated + # to the shipment, is already open thus restoring its state leaves it + # also open. + # + # The third adjustment is originated from an EnterpriseFee and it gets + # created by #update_distribution_charge! in + # app/models/spree/order_decorator.rb:220, which is in turn triggered + # by the `contents_changed` notification event defined in + # app/models/spree/order_decorator.rb:7 expect(order.adjustments.map(&:state)).to eq(['closed', 'open', 'closed']) end end From edd1da7d501c6728f6e9962f9dc4c52859d9fc20 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Tue, 12 Feb 2019 09:12:03 +0100 Subject: [PATCH 3/3] Update spec/controllers/spree/orders_controller_spec.rb Fix typo in doc Co-Authored-By: sauloperez --- 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 716dd15eb5..d77e493128 100644 --- a/spec/controllers/spree/orders_controller_spec.rb +++ b/spec/controllers/spree/orders_controller_spec.rb @@ -224,7 +224,7 @@ describe Spree::OrdersController, type: :controller do } } } - # Before issuing the update the secod adjustment, which is associated + # Before issuing the update, the second adjustment, which is associated # to the shipment, is already open thus restoring its state leaves it # also open. #