Merge commit 'rails/master'

1 files changed, 6 insertions, 0 deletions

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"