aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/test_help.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-04-14 10:53:46 -0500
committerJeremy Kemper <jeremy@bitsweat.net>2009-04-14 10:53:46 -0500
commit1120aaceae95b95ef491ca226154500051b5fe38 (patch)
tree27e2bb546049cf8a54346e982086ca2ac9edd7d0 /railties/lib/test_help.rb
parentd9afc51391e9a22759080399f973ab361d6d51af (diff)
downloadrails-1120aaceae95b95ef491ca226154500051b5fe38.tar.gz
rails-1120aaceae95b95ef491ca226154500051b5fe38.tar.bz2
rails-1120aaceae95b95ef491ca226154500051b5fe38.zip
Fix requires so tests run
Diffstat (limited to 'railties/lib/test_help.rb')
-rw-r--r--railties/lib/test_help.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/test_help.rb b/railties/lib/test_help.rb
index ee24ea3a45..94e089a624 100644
--- a/railties/lib/test_help.rb
+++ b/railties/lib/test_help.rb
@@ -3,9 +3,9 @@
silence_warnings { RAILS_ENV = "test" }
require 'test/unit'
-require 'action_controller/test_case'
+require 'action_controller/testing/test_case'
require 'action_view/test_case'
-require 'action_controller/integration'
+require 'action_controller/testing/integration'
require 'action_mailer/test_case' if defined?(ActionMailer)
if defined?(ActiveRecord)