aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-02-24 18:58:25 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-02-24 18:58:25 -0800
commit0761bb029886bb6920a404ecf409013f83a44f58 (patch)
tree57da10485fee9629b18b25ce1aa2461e52180f32
parente9d659224bb6610d726bd333a9425b4f8f5796ba (diff)
parent6df2db329889590d516fa12307a5dddda59068d1 (diff)
downloadrails-0761bb029886bb6920a404ecf409013f83a44f58.tar.gz
rails-0761bb029886bb6920a404ecf409013f83a44f58.tar.bz2
rails-0761bb029886bb6920a404ecf409013f83a44f58.zip
Merge pull request #9408 from mikeycgto/origin/3-2-stable
Update RUBY_VERSION check for performance testing to handle 2.0.0
-rw-r--r--activesupport/lib/active_support/testing/performance/ruby.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/performance/ruby.rb b/activesupport/lib/active_support/testing/performance/ruby.rb
index 96718d4bd3..50c4852d4c 100644
--- a/activesupport/lib/active_support/testing/performance/ruby.rb
+++ b/activesupport/lib/active_support/testing/performance/ruby.rb
@@ -142,7 +142,7 @@ module ActiveSupport
end
end
-if RUBY_VERSION.between?('1.9.2', '2.0')
+if RUBY_VERSION.between?('1.9.2', '2.0.0')
require 'active_support/testing/performance/ruby/yarv'
elsif RUBY_VERSION.between?('1.8.6', '1.9')
require 'active_support/testing/performance/ruby/mri'