Merge pull request #6262 from arunagw/ruby_prof_fix

Ruby prof fix

2 files changed, 2 insertions, 2 deletions

diff --git a/Gemfile b/Gemfile
index a11091f075..ffddb50766 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,7 +47,7 @@ instance_eval File.read '.Gemfile' if File.exists? '.Gemfile'
 
 platforms :mri do
   group :test do
-    gem 'ruby-prof', '0.10.8' if RUBY_VERSION < '1.9.3'
+    gem 'ruby-prof', '~> 0.11.2'
   end
 end
 
diff --git a/activesupport/lib/active_support/testing/performance/ruby.rb b/activesupport/lib/active_support/testing/performance/ruby.rb
index 7d6d047ef6..96718d4bd3 100644
--- a/activesupport/lib/active_support/testing/performance/ruby.rb
+++ b/activesupport/lib/active_support/testing/performance/ruby.rb
@@ -36,7 +36,7 @@ module ActiveSupport
           RubyProf.pause
           full_profile_options[:runs].to_i.times { run_test(@metric, :profile) }
           @data = RubyProf.stop
-          @total = @data.threads.values.sum(0) { |method_infos| method_infos.max.total_time }
+          @total = @data.threads.sum(0) { |thread| thread.methods.max.total_time }
         end
 
         def record