diff options
| author | José Valim <jose.valim@gmail.com> | 2009-06-26 11:58:02 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-06-26 11:58:02 +0200 |
| commit | 915f108d6a47b9c29e11ebe0b140ef017eb015b0 (patch) | |
| tree | ae0c42330a9fbdc8395f8a5bae4605ef455c18c1 /railties/lib/performance_test_help.rb | |
| parent | aee63a12f2cfd110725c74686ae1eed58e18fda7 (diff) | |
| parent | b5dfdc714fab7d2836e0a979ca88b4a17db9ec06 (diff) | |
| download | rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.tar.gz rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.tar.bz2 rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib/performance_test_help.rb')
| -rw-r--r-- | railties/lib/performance_test_help.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |