Merge pull request #34899 from rails/speed-up-step

Duration#coerce should always return a Scalar
2019-01-09 09:28:00 -08:00 · 2019-01-09 09:28:00 -08:00 · 28bb21bf5a
parent ea65d92f19 36de9eadaa
commit 28bb21bf5a
1 changed files with 4 additions and 1 deletions
--- a/activesupport/lib/active_support/duration.rb
+++ b/activesupport/lib/active_support/duration.rb
@ -214,8 +214,11 @@ module ActiveSupport
    end

    def coerce(other) #:nodoc:
-      if Scalar === other
+      case other
+      when Scalar
        [other, self]
+      when Duration
+        [Scalar.new(other.value), self]
      else
        [Scalar.new(other), self]
      end