diff options
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/public_exceptions.rb | 5 | ||||
-rw-r--r-- | actionpack/test/controller/show_exceptions_test.rb | 18 |
2 files changed, 2 insertions, 21 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/public_exceptions.rb b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb index bf9149ebf2..11eb418668 100644 --- a/actionpack/lib/action_dispatch/middleware/public_exceptions.rb +++ b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb @@ -3,9 +3,8 @@ module ActionDispatch class PublicExceptions attr_accessor :public_path - def initialize(public_path, consider_all_requests_local = false) + def initialize(public_path) @public_path = public_path - @consider_all_requests_local = consider_all_requests_local end def call(env) @@ -24,7 +23,7 @@ module ActionDispatch def render(status, body, options) format = options[:format] - if !@consider_all_requests_local && format && body.respond_to?(format) + if format && body.respond_to?(format) render_format(status, body.public_send(format), options) else render_html(status) diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb index ce7b6b0dc6..351b9c4cfa 100644 --- a/actionpack/test/controller/show_exceptions_test.rb +++ b/actionpack/test/controller/show_exceptions_test.rb @@ -22,14 +22,6 @@ module ShowExceptions end end - class ShowLocalExceptionsController < ActionController::Base - use ActionDispatch::ShowExceptions, ActionDispatch::PublicExceptions.new("#{FIXTURE_LOAD_PATH}/public", true) - - def boom - raise 'boom!' - end - end - class ShowExceptionsTest < ActionDispatch::IntegrationTest test 'show error page from a remote ip' do @app = ShowExceptionsController.action(:boom) @@ -101,14 +93,4 @@ module ShowExceptions assert_equal 'text/html', response.content_type.to_s end end - - class ShowExceptionsFormatsTest < ActionDispatch::IntegrationTest - def test_render_formatted_exception_in_development - @app = ShowLocalExceptionsController.action(:boom) - get "/", {}, 'HTTP_ACCEPT' => 'application/xml' - - assert_response :internal_server_error - assert_equal 'text/html', response.content_type.to_s - end - end end |