mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
move "check for ruby-prof" from AD/testing/performance_test to AS/testing/performance, where it is actually required
This commit is contained in:
parent
23be2c6134
commit
a6e22229b9
2 changed files with 384 additions and 386 deletions
|
@ -1,6 +1,5 @@
|
|||
require 'active_support/testing/performance'
|
||||
|
||||
begin
|
||||
module ActionDispatch
|
||||
# An integration test that runs a code profiler on your test methods.
|
||||
# Profiling output for combinations of each test method, measurement, and
|
||||
|
@ -12,6 +11,3 @@ begin
|
|||
include ActiveSupport::Testing::Performance
|
||||
end
|
||||
end
|
||||
rescue NameError
|
||||
$stderr.puts "Specify ruby-prof as application's dependency in Gemfile to run benchmarks."
|
||||
end
|
||||
|
|
|
@ -1,11 +1,15 @@
|
|||
begin
|
||||
require 'ruby-prof'
|
||||
|
||||
require 'fileutils'
|
||||
require 'rails/version'
|
||||
require 'active_support/core_ext/class/delegating_attributes'
|
||||
require 'active_support/core_ext/string/inflections'
|
||||
|
||||
begin
|
||||
require 'ruby-prof'
|
||||
rescue LoadError
|
||||
$stderr.puts "Specify ruby-prof as application's dependency in Gemfile to run benchmarks."
|
||||
exit
|
||||
end
|
||||
|
||||
module ActiveSupport
|
||||
module Testing
|
||||
module Performance
|
||||
|
@ -421,5 +425,3 @@ begin
|
|||
end
|
||||
end
|
||||
end
|
||||
rescue LoadError
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue