From d898a4ba425a201827f07a5bb11c8c6bf85159b8 Mon Sep 17 00:00:00 2001 From: Rolf Bjaanes Date: Fri, 2 Apr 2010 20:00:29 +0200 Subject: Raise exceptions instead of rendering error templates in test environment [#4315 state:resolved] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- railties/lib/rails/application/configuration.rb | 2 +- .../generators/rails/app/templates/config/environments/test.rb.tt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'railties/lib/rails') 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 -- cgit v1.2.3 From 47c99f901257937c47a47953745624dd8469ec4b Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Fri, 2 Apr 2010 11:50:30 -0300 Subject: Fixing index style [#4313 state:committed] Signed-off-by: wycats --- railties/lib/rails/generators/rails/app/templates/public/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'railties/lib/rails') 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; -- cgit v1.2.3