Merge pull request #2018 from jhawthorn/deprecate_add_shipping_rate

Deprecate Shipment#add_shipping_method
solidusio · Jun 14, 2017 · f0cabac · f0cabac
2 parents b5ffbe8 + 49dea52
commit f0cabac
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/core/app/models/spree/shipment.rb b/core/app/models/spree/shipment.rb
@@ -95,6 +95,7 @@ def can_transition_from_canceled_to_ready?
     def add_shipping_method(shipping_method, selected = false)
       shipping_rates.create(shipping_method: shipping_method, selected: selected, cost: cost)
     end
+    deprecate :add_shipping_method, deprecator: Spree::Deprecation
 
     def after_cancel
       manifest.each { |item| manifest_restock(item) }

diff --git a/core/lib/spree/testing_support/factories/shipment_factory.rb b/core/lib/spree/testing_support/factories/shipment_factory.rb
@@ -16,7 +16,11 @@
 
     after(:create) do |shipment, evaluator|
       shipping_method = evaluator.shipping_method || create(:shipping_method, cost: evaluator.cost)
-      shipment.add_shipping_method(shipping_method, true)
+      shipment.shipping_rates.create!(
+        shipping_method: shipping_method,
+        cost: evaluator.cost,
+        selected: true
+      )
 
       shipment.order.line_items.each do |line_item|
         line_item.quantity.times do

diff --git a/core/spec/models/spree/shipment_spec.rb b/core/spec/models/spree/shipment_spec.rb
@@ -797,7 +797,7 @@
 
   describe '#selected_shipping_rate_id=' do
     let!(:air_shipping_method) { create(:shipping_method, name: "Air") }
-    let(:new_rate) { shipment.add_shipping_method(air_shipping_method) }
+    let(:new_rate) { shipment.shipping_rates.create!(shipping_method: air_shipping_method) }
 
     context 'when the id exists' do
       it 'sets the new shipping rate as selected' do