aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-01 20:46:18 +0100
committerJosé Valim <jose.valim@gmail.com>2011-12-01 20:46:18 +0100
commit750bb5c865ac9234da91ec451eec7d9de55b8f9b (patch)
tree16873e2a42d812f637cde622ab933e1e7667f10c /railties/test
parent956ecff8337908d7c3908977a5c8e12296a5b576 (diff)
downloadrails-750bb5c865ac9234da91ec451eec7d9de55b8f9b.tar.gz
rails-750bb5c865ac9234da91ec451eec7d9de55b8f9b.tar.bz2
rails-750bb5c865ac9234da91ec451eec7d9de55b8f9b.zip
Split ShowExceptions responsibilities in two middlewares.
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/application/middleware/exceptions_test.rb (renamed from railties/test/application/middleware/show_exceptions_test.rb)2
-rw-r--r--railties/test/application/middleware_test.rb4
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/test/application/middleware/show_exceptions_test.rb b/railties/test/application/middleware/exceptions_test.rb
index f3cae6a11e..0174352900 100644
--- a/railties/test/application/middleware/show_exceptions_test.rb
+++ b/railties/test/application/middleware/exceptions_test.rb
@@ -3,7 +3,7 @@ require 'isolation/abstract_unit'
require 'rack/test'
module ApplicationTests
- class ShowExceptionsTest < Test::Unit::TestCase
+ class MiddlewareExceptionsTest < Test::Unit::TestCase
include ActiveSupport::Testing::Isolation
include Rack::Test::Methods
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index dba79bfd96..578370cfca 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -33,6 +33,7 @@ module ApplicationTests
"ActionDispatch::RequestId",
"Rails::Rack::Logger", # must come after Rack::MethodOverride to properly log overridden methods
"ActionDispatch::ShowExceptions",
+ "ActionDispatch::DebugExceptions",
"ActionDispatch::RemoteIp",
"Rack::Sendfile",
"ActionDispatch::Reloader",
@@ -104,10 +105,11 @@ module ApplicationTests
assert !middleware.include?("ActionDispatch::Static")
end
- test "includes show exceptions even if action_dispatch.show_exceptions is disabled" do
+ test "includes exceptions middlewares even if action_dispatch.show_exceptions is disabled" do
add_to_config "config.action_dispatch.show_exceptions = false"
boot!
assert middleware.include?("ActionDispatch::ShowExceptions")
+ assert middleware.include?("ActionDispatch::DebugExceptions")
end
test "removes ActionDispatch::Reloader if cache_classes is true" do