aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-04-03 10:56:15 -0700
committerXavier Noria <fxn@hashref.com>2010-04-03 10:56:15 -0700
commit11161e6c96fb6686a33e05ead106b96089ff9790 (patch)
tree35d5618f1a866ce8ba11efd8e6851d2fd7bbf5fc /railties
parent4996d1a445acd965d0064500ad00d692a742f669 (diff)
parent467d251c3dcbd3e4dd1e785a21d63535b795a64c (diff)
downloadrails-11161e6c96fb6686a33e05ead106b96089ff9790.tar.gz
rails-11161e6c96fb6686a33e05ead106b96089ff9790.tar.bz2
rails-11161e6c96fb6686a33e05ead106b96089ff9790.zip
Merge commit 'rails/master'
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/application/configuration.rb2
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt3
-rw-r--r--railties/lib/rails/generators/rails/app/templates/public/index.html3
-rw-r--r--railties/test/application/middleware_test.rb6
4 files changed, 12 insertions, 2 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 44635ff4f6..5c7de616be 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -132,7 +132,7 @@ module Rails
middleware.use('::Rack::Lock', :if => lambda { !allow_concurrency })
middleware.use('::Rack::Runtime')
middleware.use('::Rails::Rack::Logger')
- middleware.use('::ActionDispatch::ShowExceptions', lambda { consider_all_requests_local })
+ middleware.use('::ActionDispatch::ShowExceptions', lambda { consider_all_requests_local }, :if => lambda { action_dispatch.show_exceptions })
middleware.use("::ActionDispatch::RemoteIp", lambda { action_dispatch.ip_spoofing_check }, lambda { action_dispatch.trusted_proxies })
middleware.use('::Rack::Sendfile', lambda { action_dispatch.x_sendfile_header })
middleware.use('::ActionDispatch::Callbacks', lambda { !cache_classes })
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
index 0b87b241ec..beb28e2229 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
@@ -14,6 +14,9 @@
config.consider_all_requests_local = true
config.action_controller.perform_caching = false
+ # Raise exceptions instead of rendering exception templates
+ config.action_dispatch.show_exceptions = false
+
# Disable request forgery protection in test environment
config.action_controller.allow_forgery_protection = false
diff --git a/railties/lib/rails/generators/rails/app/templates/public/index.html b/railties/lib/rails/generators/rails/app/templates/public/index.html
index 836da1b689..9fb304a66b 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/index.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/index.html
@@ -82,7 +82,8 @@
#about-content {
background-color: #ffd;
border: 1px solid #fc0;
- margin-left: -11px;
+ margin-left: -55px;
+ margin-right: -10px;
}
#about-content table {
margin-top: 10px;
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"