Merge pull request #6374 from mamhoff/add-autosave-to-shipment-shipping-rates

Autosave changed shipping rates

Author: tvdeyen

core/app/models/spree/shipment.rb

@@ -11,7 +11,7 @@ class Shipment < Spree::Base
 
     has_many :adjustments, as: :adjustable, inverse_of: :adjustable, dependent: :delete_all, autosave: true
     has_many :inventory_units, dependent: :destroy, inverse_of: :shipment
-    has_many :shipping_rates, -> { order(:cost) }, dependent: :destroy, inverse_of: :shipment
+    has_many :shipping_rates, -> { order(:cost) }, dependent: :destroy, inverse_of: :shipment, autosave: true
     has_many :shipping_methods, through: :shipping_rates
     has_many :state_changes, as: :stateful
     has_many :cartons, -> { distinct }, through: :inventory_units

core/app/models/spree/shipping_rate.rb

@@ -5,14 +5,15 @@ module Spree
   # method has been selected to deliver the shipment.
   #
   class ShippingRate < Spree::Base
-    belongs_to :shipment, class_name: 'Spree::Shipment', touch: true, optional: true
+    belongs_to :shipment, class_name: 'Spree::Shipment', touch: true, optional: true, inverse_of: :shipping_rates
     belongs_to :shipping_method, -> { with_discarded }, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates, optional: true
 
     has_many :taxes,
              class_name: "Spree::ShippingRateTax",
              foreign_key: "shipping_rate_id",
              inverse_of: :shipping_rate,
-             dependent: :destroy
+             dependent: :destroy,
+             autosave: true
 
     delegate :order, :currency, to: :shipment
     delegate :name, :tax_category, :tax_category_id, to: :shipping_method

core/spec/models/spree/shipment_spec.rb

@@ -1007,4 +1007,15 @@
       expect(state_change.name).to eq('shipment')
     end
   end
+
+  describe "autosave behavior" do
+    let(:shipment) { create(:shipment) }
+
+    it "allows marking shipping rates for destruction" do
+      shipment.shipping_rates.load
+      shipment.shipping_rates.first.mark_for_destruction
+
+      expect { shipment.save! }.to change(Spree::ShippingRate, :count)
+    end
+  end
 end

core/spec/models/spree/shipping_rate_tax_spec.rb

@@ -75,5 +75,19 @@ module Spree
         end
       end
     end
+
+    describe "autosaving when order is saved" do
+      let(:tax_rate) { create(:tax_rate) }
+      let(:shipping_rate) { create(:shipping_rate) }
+      let(:shipment) { shipping_rate.shipment }
+
+      it "works" do
+        shipping_rate.taxes.new(
+          amount: -2,
+          tax_rate: tax_rate
+        )
+        expect { shipment.save! }.to change { Spree::ShippingRateTax.count }
+      end
+    end
   end
 end

promotions/spec/models/solidus_promotions/shipping_rate_discount_spec.rb

@@ -12,4 +12,20 @@
   it { is_expected.to respond_to(:amount) }
   it { is_expected.to respond_to(:display_amount) }
   it { is_expected.to respond_to(:label) }
+
+  describe "autosaving when order is saved" do
+    let(:promotion) { create(:solidus_promotion, :with_free_shipping) }
+    let(:benefit) { promotion.benefits.first }
+    let(:shipping_rate) { create(:shipping_rate) }
+    let(:shipment) { shipping_rate.shipment }
+
+    it "works" do
+      shipping_rate.discounts.new(
+        amount: -2,
+        benefit: benefit,
+        label: "Free Shipping"
+      )
+      expect { shipment.save! }.to change { SolidusPromotions::ShippingRateDiscount.count }
+    end
+  end
 end