Merge pull request #1461 from jordan-brough/remove-deprecated-code

Remove deprecated code
solidusio · Sep 22, 2016 · 0eeb120 · 0eeb120
2 parents 1b1259e + ca30c1c
commit 0eeb120
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,13 @@
     * Removed deprecated method `Spree::TaxRate.adjust` (not to be confused with
       Spree::TaxRate#adjust) in favor of `Spree::Tax::OrderAdjuster`.
 
+      https://github.com/solidusio/solidus/pull/1462
+
+    * Removed deprecated method `Promotion#expired?` in favor of
+      `Promotion#inactive?`
+
+      https://github.com/solidusio/solidus/pull/1461
+
 ## Solidus 2.0.0 (unreleased)
 
 *   Upgrade to rails 5.0

diff --git a/core/app/models/spree/promotion.rb b/core/app/models/spree/promotion.rb
@@ -82,15 +82,6 @@ def inactive?
       !active?
     end
 
-    def expired?
-      Spree::Deprecation.warn <<-WARN.squish, caller
-        #expired? is deprecated, and will be removed in Solidus 2.0.
-        Please use #inactive? instead.
-      WARN
-
-      inactive?
-    end
-
     def activate(order:, line_item: nil, user: nil, path: nil, promotion_code: nil)
       return unless self.class.order_activatable?(order)