diff options
author | Andrew White <andrew.white@unboxed.co> | 2016-11-03 14:15:29 +0000 |
---|---|---|
committer | Andrew White <andrew.white@unboxed.co> | 2016-11-03 14:15:29 +0000 |
commit | 7cef8061ab98261887001f8c6fba3f52a85dbaa8 (patch) | |
tree | fa5cedd9411eb24af3094cdc70bc7bedb1f0f6b8 /activesupport/lib | |
parent | bbe5e07f7a01d4c12767750e6280ce8f56d89070 (diff) | |
download | rails-7cef8061ab98261887001f8c6fba3f52a85dbaa8.tar.gz rails-7cef8061ab98261887001f8c6fba3f52a85dbaa8.tar.bz2 rails-7cef8061ab98261887001f8c6fba3f52a85dbaa8.zip |
Adjust tests for differences between Ruby 1.8 and 1.9
Ruby 1.9 added Hash#select! and return a hash from Hash#select
whereas Ruby 1.8 returned an array.
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/hash_with_indifferent_access.rb | 6 | ||||
-rw-r--r-- | activesupport/lib/active_support/ordered_hash.rb | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb index f89704d906..c02bd60fde 100644 --- a/activesupport/lib/active_support/hash_with_indifferent_access.rb +++ b/activesupport/lib/active_support/hash_with_indifferent_access.rb @@ -153,11 +153,7 @@ module ActiveSupport def symbolize_keys; to_hash.symbolize_keys end def to_options!; self end - if RUBY_VERSION > '2.1.0' - # On Ruby 2.1.1 and later the behavior of .select and reject changed to - # return a new Hash instance so we need to override them to return an - # instance of the correct class. - + if RUBY_VERSION > '1.9' def select(*args, &block) dup.tap { |hash| hash.select!(*args, &block) } end diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb index e81bd013b6..0f9caca892 100644 --- a/activesupport/lib/active_support/ordered_hash.rb +++ b/activesupport/lib/active_support/ordered_hash.rb @@ -52,11 +52,7 @@ module ActiveSupport true end - if RUBY_VERSION > '2.1.0' - # On Ruby 2.1.1 and later the behavior of .select and reject changed to - # return a new Hash instance so we need to override them to return an - # instance of the correct class. - + if RUBY_VERSION > '1.9' def select(*args, &block) dup.tap { |hash| hash.select!(*args, &block) } end |