aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-02-02 14:01:29 -0800
committerYehuda Katz <wycats@gmail.com>2009-02-02 14:01:29 -0800
commitd4a817c066ec66ab6f44958a3e10619f952b77e8 (patch)
tree26cdd17d44659e833c7c720d21a6e20418ab1ebb /railties/test
parentff68430077bc534c03dfe9b2fd7faad3b720a433 (diff)
downloadrails-d4a817c066ec66ab6f44958a3e10619f952b77e8.tar.gz
rails-d4a817c066ec66ab6f44958a3e10619f952b77e8.tar.bz2
rails-d4a817c066ec66ab6f44958a3e10619f952b77e8.zip
Make tests pass
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/error_page_test.rb2
-rw-r--r--railties/test/rails_info_controller_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/error_page_test.rb b/railties/test/error_page_test.rb
index f819e468e8..c0e8fe1ee0 100644
--- a/railties/test/error_page_test.rb
+++ b/railties/test/error_page_test.rb
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'action_controller'
-require 'action_controller/test_case'
+require 'action_controller/testing/test_case'
RAILS_ENV = "test"
CURRENT_DIR = File.expand_path(File.dirname(__FILE__))
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index e274e1aa6e..b63cd00ba5 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'action_controller'
-require 'action_controller/test_process'
+require 'action_controller/testing/process'
module Rails; end
require 'rails/info'