aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-12-18 14:27:28 +1030
committerGitHub <noreply@github.com>2016-12-18 14:27:28 +1030
commit3b055d2ca4d0836b2b32795dd2e0cfe5866c0ab0 (patch)
treee0deec9bda5782c6d5196bcd291e1477ffd3787f /activesupport
parent5b37c9c4a6d823ea210e46ad5f57b1a437243e7d (diff)
parent598f10c00084f20e277b82ed83a8ef8bd85a1a78 (diff)
downloadrails-3b055d2ca4d0836b2b32795dd2e0cfe5866c0ab0.tar.gz
rails-3b055d2ca4d0836b2b32795dd2e0cfe5866c0ab0.tar.bz2
rails-3b055d2ca4d0836b2b32795dd2e0cfe5866c0ab0.zip
Merge pull request #27366 from utilum/avoid_fixnum_warning
Fix Fixnum deprecated warning in Ruby 2.4+
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/test/core_ext/duration_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb
index 26a9ea4aee..6f7f16da5b 100644
--- a/activesupport/test/core_ext/duration_test.rb
+++ b/activesupport/test/core_ext/duration_test.rb
@@ -21,7 +21,7 @@ class DurationTest < ActiveSupport::TestCase
end
def test_instance_of
- assert 1.minute.instance_of?(Fixnum)
+ assert 1.minute.instance_of?(1.class)
assert 2.days.instance_of?(ActiveSupport::Duration)
assert !3.second.instance_of?(Numeric)
end