Skip to content
Browse files

Make performance tests work again

  • Loading branch information...
1 parent 3aad4d7 commit 92b229e1251d7d3578c3f73e8185972354e76436 @lifo lifo committed Jun 25, 2009
Showing with 1 addition and 16 deletions.
  1. +0 −15 actionpack/lib/action_controller/testing/performance.rb
  2. +1 −1 railties/lib/performance_test_help.rb
View
15 actionpack/lib/action_controller/testing/performance.rb
@@ -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
View
2 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

0 comments on commit 92b229e

Please sign in to comment.
Something went wrong with that request. Please try again.