diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-01-07 16:37:32 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-01-07 16:37:32 -0800 |
commit | 859e1508bef6cecd0986c38bcba641725f06da82 (patch) | |
tree | 42cab88f6dfa44c38e5bfa25e6bc095dab03fd32 | |
parent | 074414883cd39c24a6197f7450723c6fc60132d0 (diff) | |
download | rails-859e1508bef6cecd0986c38bcba641725f06da82.tar.gz rails-859e1508bef6cecd0986c38bcba641725f06da82.tar.bz2 rails-859e1508bef6cecd0986c38bcba641725f06da82.zip |
Fix test broken by test process changes
-rw-r--r-- | railties/test/error_page_test.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/railties/test/error_page_test.rb b/railties/test/error_page_test.rb index 844f889aad..f819e468e8 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_process' +require 'action_controller/test_case' RAILS_ENV = "test" CURRENT_DIR = File.expand_path(File.dirname(__FILE__)) @@ -22,13 +22,10 @@ ActionController::Routing::Routes.draw do |map| map.connect ':controller/:action/:id' end -class ErrorPageControllerTest < Test::Unit::TestCase +class ErrorPageControllerTest < ActionController::TestCase def setup - @controller = ErrorPageController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - ActionController::Base.consider_all_requests_local = false + rescue_action_in_public! end def test_500_error_page_instructs_system_administrator_to_check_log_file @@ -38,6 +35,6 @@ class ErrorPageControllerTest < Test::Unit::TestCase end get :crash expected_log_file = "#{RAILS_ENV}.log" - assert_not_nil @response.body.index(expected_log_file) + assert_not_nil @response.body.index(expected_log_file), @response.body end end |