diff --git a/railties/html/500.html b/railties/html/500.html index 74142cb04a..ec3bbf02c4 100644 --- a/railties/html/500.html +++ b/railties/html/500.html @@ -25,9 +25,6 @@

We're sorry, but something went wrong.

We've been notified about this issue and we'll take a look at it shortly.

-

(If you're the administrator of this website, then please read - the log file "<%= "<%s>" % "%=h RAILS_ENV %" %>.log" - to find out what went wrong.)

diff --git a/railties/test/error_page_test.rb b/railties/test/error_page_test.rb deleted file mode 100644 index f819e468e8..0000000000 --- a/railties/test/error_page_test.rb +++ /dev/null @@ -1,40 +0,0 @@ -require 'abstract_unit' -require 'action_controller' -require 'action_controller/test_case' - -RAILS_ENV = "test" -CURRENT_DIR = File.expand_path(File.dirname(__FILE__)) -HTML_DIR = File.expand_path(File.join(CURRENT_DIR, "..", "html")) - -module Rails - def self.public_path - CURRENT_DIR - end -end - -class ErrorPageController < ActionController::Base - def crash - raise StandardError, "crash!" - end -end - -ActionController::Routing::Routes.draw do |map| - map.connect ':controller/:action/:id' -end - -class ErrorPageControllerTest < ActionController::TestCase - def setup - ActionController::Base.consider_all_requests_local = false - rescue_action_in_public! - end - - def test_500_error_page_instructs_system_administrator_to_check_log_file - template = ERB.new(File.read(File.join(HTML_DIR, "500.html"))) - File.open(File.join(CURRENT_DIR, "500.html"), "w") do |f| - f.write(template.result) - end - get :crash - expected_log_file = "#{RAILS_ENV}.log" - assert_not_nil @response.body.index(expected_log_file), @response.body - end -end