meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-25 18:01:14 +00:00
Code Issues Releases Wiki Activity

pass PatchesTest on Rails 4.0.5 (#16194)

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@13171 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2014-05-25 15:56:13 +00:00
parent bbaccc347b
commit fe181c1f55
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit/initializers/patches_test.rb
View File

@ -51,7 +51,7 @@ class PatchesTest < ActiveSupport::TestCase
def test_indifferent_select
hash = ActiveSupport::HashWithIndifferentAccess.new(@symbols).select { |_ ,v| v == 1 }
assert_equal({ 'a' => 1 }, hash)
assert_instance_of (RUBY_VERSION < "2.1" ?
assert_instance_of ((Rails::VERSION::MAJOR < 4 && RUBY_VERSION < "2.1") ?
Hash : ActiveSupport::HashWithIndifferentAccess),
hash
end
@ -82,7 +82,7 @@ class PatchesTest < ActiveSupport::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 (RUBY_VERSION < "2.1" ?
assert_instance_of ((Rails::VERSION::MAJOR < 4 && RUBY_VERSION < "2.1") ?
Hash : ActiveSupport::OrderedHash),
new_ordered_hash
end