diff options
| -rw-r--r-- | railties/lib/performance_test_help.rb | 2 | ||||
| -rw-r--r-- | railties/lib/test_help.rb | 2 | ||||
| -rw-r--r-- | railties/test/rails_info_controller_test.rb | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/railties/lib/performance_test_help.rb b/railties/lib/performance_test_help.rb index 2aaa21e85f..4ac38981d0 100644 --- a/railties/lib/performance_test_help.rb +++ b/railties/lib/performance_test_help.rb @@ -1,5 +1,3 @@ -require 'action_controller/testing/performance_test' - ActionController::Base.perform_caching = true ActiveSupport::Dependencies.mechanism = :require Rails.logger.level = ActiveSupport::BufferedLogger::INFO diff --git a/railties/lib/test_help.rb b/railties/lib/test_help.rb index 9c3aa3ad07..8bd4475c7b 100644 --- a/railties/lib/test_help.rb +++ b/railties/lib/test_help.rb @@ -8,9 +8,7 @@ gem "rack-test", "~> 0.5.0" require 'test/unit' require 'active_support/core_ext/kernel/requires' -require 'action_controller/testing/test_case' require 'action_view/test_case' -require 'action_controller/testing/integration' require 'action_mailer/test_case' if defined?(ActionMailer) if defined?(ActiveRecord) diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb index 6a60908859..99cf9168e1 100644 --- a/railties/test/rails_info_controller_test.rb +++ b/railties/test/rails_info_controller_test.rb @@ -1,6 +1,5 @@ require 'abstract_unit' require 'action_controller' -require 'action_controller/testing/process' require 'rails/info' require 'rails/info_controller' |