diff options
| -rw-r--r-- | actionpack/lib/action_controller/testing/performance.rb | 15 | ||||
| -rw-r--r-- | railties/lib/performance_test_help.rb | 2 |
2 files changed, 1 insertions, 16 deletions
diff --git a/actionpack/lib/action_controller/testing/performance.rb b/actionpack/lib/action_controller/testing/performance.rb deleted file mode 100644 index d88180087d..0000000000 --- a/actionpack/lib/action_controller/testing/performance.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'active_support/testing/performance' -require 'active_support/testing/default' - -module ActionController - # An integration test that runs a code profiler on your test methods. - # Profiling output for combinations of each test method, measurement, and - # output format are written to your tmp/performance directory. - # - # By default, process_time is measured and both flat and graph_html output - # formats are written, so you'll have two output files per test method. - class PerformanceTest < ActionController::IntegrationTest - include ActiveSupport::Testing::Performance - include ActiveSupport::Testing::Default - end -end diff --git a/railties/lib/performance_test_help.rb b/railties/lib/performance_test_help.rb index 5148b4ab77..2aaa21e85f 100644 --- a/railties/lib/performance_test_help.rb +++ b/railties/lib/performance_test_help.rb @@ -1,4 +1,4 @@ -require 'action_controller/performance_test' +require 'action_controller/testing/performance_test' ActionController::Base.perform_caching = true ActiveSupport::Dependencies.mechanism = :require |