Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

This consider_all_requests_local doesn't make sense

This middleware is only for Public Exceptions.
This follows bd8c0b8
  • Loading branch information...
commit 0e06e8a69210e943abd6757d5713ab337e7df1df 1 parent 14ccb0d
Santiago Pastorino spastorino authored
5 actionpack/lib/action_dispatch/middleware/public_exceptions.rb
View
@@ -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 @@ def call(env)
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)
18 actionpack/test/controller/show_exceptions_test.rb
View
@@ -22,14 +22,6 @@ def show_detailed_exceptions?
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 @@ def test_render_fallback_exception
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
Please sign in to comment.
Something went wrong with that request. Please try again.