Merge pull request #26962 from rails/fix-3-2-stable-on-ruby-2-3

Fix Rails 3-2-stable on Ruby 2.3.1

1 files changed, 10 insertions, 0 deletions

diff --git a/activesupport/test/ordered_hash_test.rb b/activesupport/test/ordered_hash_test.rb
index a7fd9402c8..31eeb7f565 100644
--- a/activesupport/test/ordered_hash_test.rb
+++ b/activesupport/test/ordered_hash_test.rb
@@ -125,6 +125,15 @@ class OrderedHashTest < Test::Unit::TestCase
 
   def test_select
     assert_equal @keys, @ordered_hash.select { true }.map(&:first)
+    new_ordered_hash = @ordered_hash.select { true }
+    assert_equal @keys, new_ordered_hash.map(&:first)
+
+    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
@@ -147,6 +156,7 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal copy, @ordered_hash
     assert !new_ordered_hash.keys.include?('pink')
     assert @ordered_hash.keys.include?('pink')
+    assert_instance_of ActiveSupport::OrderedHash, new_ordered_hash
   end
 
   def test_clear