Skip to content
Browse files

Fix test broken by test process changes

  • Loading branch information...
1 parent 0744148 commit 859e1508bef6cecd0986c38bcba641725f06da82 @jeremy jeremy committed Jan 7, 2009
Showing with 4 additions and 7 deletions.
  1. +4 −7 railties/test/error_page_test.rb
View
11 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 @@ def crash
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 @@ def test_500_error_page_instructs_system_administrator_to_check_log_file
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

0 comments on commit 859e150

Please sign in to comment.
Something went wrong with that request. Please try again.