diff options
| author | José Valim <jose.valim@gmail.com> | 2010-04-02 20:54:10 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-04-02 20:54:10 +0200 |
| commit | 997e22c2751c66f8bba31dcdf4d1054072156036 (patch) | |
| tree | b25eb730b629b1ac4b1b6cc24dacabd9c5f913f2 /actionpack/lib | |
| parent | d898a4ba425a201827f07a5bb11c8c6bf85159b8 (diff) | |
| download | rails-997e22c2751c66f8bba31dcdf4d1054072156036.tar.gz rails-997e22c2751c66f8bba31dcdf4d1054072156036.tar.bz2 rails-997e22c2751c66f8bba31dcdf4d1054072156036.zip | |
Add a test which ensures action_dispatch.show_exceptions is properly disabled.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/railtie.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 4 |
2 files changed, 2 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| |