Merge pull request solidusio#2992 from nebulab/fix-deprecations-rails…

…-5-2-2 Fix deprecations to make Solidus work with Rails 5.2.2
nebulab · Dec 7, 2018 · 69e6932 · 69e6932
2 parents 76a3b2d + 50346d6
commit 69e6932
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
@@ -552,6 +552,7 @@ def apply_shipping_promotions
       Spree::PromotionHandler::Shipping.new(self).activate
       recalculate
     end
+    alias_method :apply_free_shipping_promotions, :apply_shipping_promotions
     deprecate apply_free_shipping_promotions: :apply_shipping_promotions, deprecator: Spree::Deprecation
 
     # Clean shipments and make order back to address state

diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
@@ -28,7 +28,7 @@ class Store < Spree::Base
     scope :by_url, lambda { |url| where("url like ?", "%#{url}%") }
 
     class << self
-      deprecate :by_url, "Spree::Store.by_url is DEPRECATED", deprecator: Spree::Deprecation
+      deprecate by_url: "Spree::Store.by_url is DEPRECATED", deprecator: Spree::Deprecation
     end
 
     def available_locales

diff --git a/core/solidus_core.gemspec b/core/solidus_core.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     actionmailer actionpack actionview activejob activemodel activerecord
     activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, ['>= 5.1', '< 5.2.2']
+    s.add_dependency rails_dep, ['>= 5.1', '< 5.3.x']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'