aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/ordered_hash_test.rb
diff options
context:
space:
mode:
authorAndrew White <andrew.white@unboxed.co>2016-11-03 14:15:29 +0000
committerAndrew White <andrew.white@unboxed.co>2016-11-03 14:15:29 +0000
commit7cef8061ab98261887001f8c6fba3f52a85dbaa8 (patch)
treefa5cedd9411eb24af3094cdc70bc7bedb1f0f6b8 /activesupport/test/ordered_hash_test.rb
parentbbe5e07f7a01d4c12767750e6280ce8f56d89070 (diff)
downloadrails-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/test/ordered_hash_test.rb')
-rw-r--r--activesupport/test/ordered_hash_test.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/activesupport/test/ordered_hash_test.rb b/activesupport/test/ordered_hash_test.rb
index bbaccf2594..31eeb7f565 100644
--- a/activesupport/test/ordered_hash_test.rb
+++ b/activesupport/test/ordered_hash_test.rb
@@ -127,7 +127,13 @@ class OrderedHashTest < Test::Unit::TestCase
assert_equal @keys, @ordered_hash.select { true }.map(&:first)
new_ordered_hash = @ordered_hash.select { true }
assert_equal @keys, new_ordered_hash.map(&:first)
- assert_instance_of ActiveSupport::OrderedHash, new_ordered_hash
+
+ if RUBY_VERSION > '1.9'
+ assert_instance_of ActiveSupport::OrderedHash, new_ordered_hash
+ else
+ # Ruby 1.8.7 returns an Array from Hash#select
+ assert_instance_of Array, new_ordered_hash
+ end
end
def test_delete_if