diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-04-03 10:56:15 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-04-03 10:56:15 -0700 |
| commit | 11161e6c96fb6686a33e05ead106b96089ff9790 (patch) | |
| tree | 35d5618f1a866ce8ba11efd8e6851d2fd7bbf5fc /actionpack/lib/action_dispatch/testing/integration.rb | |
| parent | 4996d1a445acd965d0064500ad00d692a742f669 (diff) | |
| parent | 467d251c3dcbd3e4dd1e785a21d63535b795a64c (diff) | |
| download | rails-11161e6c96fb6686a33e05ead106b96089ff9790.tar.gz rails-11161e6c96fb6686a33e05ead106b96089ff9790.tar.bz2 rails-11161e6c96fb6686a33e05ead106b96089ff9790.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 4 |
1 files changed, 1 insertions, 3 deletions
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| |