Merge pull request #3135 from elia/patch-1

Align some deprecation messages in Order model
solidusio · May 13, 2019 · 1a4444a · 1a4444a
2 parents 871d82a + 9aa2799
commit 1a4444a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
@@ -366,11 +366,11 @@ def line_item_options_match(line_item, options)
 
     # Creates new tax charges if there are any applicable rates. If prices already
     # include taxes then price adjustments are created instead.
-    # @deprecated This now happens during #update!
+    # @deprecated This now happens during #recalculate
     def create_tax_charge!
-      Spree::Config.tax_adjuster_class.new(self).adjust!
+      recalculate
     end
-    deprecate create_tax_charge!: :update!, deprecator: Spree::Deprecation
+    deprecate create_tax_charge!: :recalculate, deprecator: Spree::Deprecation
 
     def reimbursement_total
       reimbursements.sum(:total)
@@ -577,11 +577,11 @@ def shipping_eq_billing_address?
       bill_address == ship_address
     end
 
+    # @deprecated This now happens during #recalculate
     def set_shipments_cost
-      shipments.each(&:update_amounts)
       recalculate
     end
-    deprecate set_shipments_cost: :update!, deprecator: Spree::Deprecation
+    deprecate set_shipments_cost: :recalculate, deprecator: Spree::Deprecation
 
     def is_risky?
       payments.risky.count > 0

diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rb
@@ -181,7 +181,6 @@
     before { allow(order).to receive_messages shipments: [shipment] }
 
     it "update and persist totals" do
-      expect(shipment).to receive :update_amounts
       expect(order.updater).to receive :update
 
       Spree::Deprecation.silence do