From 997e22c2751c66f8bba31dcdf4d1054072156036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 2 Apr 2010 20:54:10 +0200 Subject: Add a test which ensures action_dispatch.show_exceptions is properly disabled. --- actionpack/lib/action_dispatch/railtie.rb | 2 +- actionpack/lib/action_dispatch/testing/integration.rb | 4 +--- railties/test/application/middleware_test.rb | 6 ++++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb index 7ea9182e9c..004c254e55 100644 --- a/actionpack/lib/action_dispatch/railtie.rb +++ b/actionpack/lib/action_dispatch/railtie.rb @@ -7,7 +7,7 @@ module ActionDispatch config.action_dispatch.x_sendfile_header = "" config.action_dispatch.ip_spoofing_check = true config.action_dispatch.show_exceptions = true - + # Prepare dispatcher callbacks and run 'prepare' callbacks initializer "action_dispatch.prepare_dispatcher" do |app| # TODO: This used to say unless defined?(Dispatcher). Find out why and fix. diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 621d63c5e2..031fa1dfb4 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -263,9 +263,7 @@ module ActionDispatch "HTTP_HOST" => host, "REMOTE_ADDR" => remote_addr, "CONTENT_TYPE" => "application/x-www-form-urlencoded", - "HTTP_ACCEPT" => accept, - - "action_dispatch.show_exceptions" => false + "HTTP_ACCEPT" => accept } (rack_environment || {}).each do |key, value| diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb index 9a359d20b1..7f72881d55 100644 --- a/railties/test/application/middleware_test.rb +++ b/railties/test/application/middleware_test.rb @@ -52,6 +52,12 @@ module ApplicationTests assert !middleware.include?("ActionDispatch::Static") end + test "removes show exceptions if action_dispatch.show_exceptions is disabled" do + add_to_config "config.action_dispatch.show_exceptions = false" + boot! + assert !middleware.include?("ActionDispatch::ShowExceptions") + end + test "use middleware" do use_frameworks [] add_to_config "config.middleware.use Rack::Config" -- cgit v1.2.3