aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-10-20 00:35:07 -0700
committerJosé Valim <jose.valim@gmail.com>2011-10-20 00:35:07 -0700
commitef3e149db3e3e970236147fa1a3ba8e569b05c60 (patch)
tree236c7851b14f43b3eebe4a818851631e45ed6a0c
parent00eb67e01f97f1f820e49ee2795f9ea113924974 (diff)
parent5c5d5b3d2510d20998eafdd87a4458e0406e1690 (diff)
downloadrails-ef3e149db3e3e970236147fa1a3ba8e569b05c60.tar.gz
rails-ef3e149db3e3e970236147fa1a3ba8e569b05c60.tar.bz2
rails-ef3e149db3e3e970236147fa1a3ba8e569b05c60.zip
Merge pull request #3375 from arunagw/middleware_test_fix
Adding ActionDispatch::RequestId in middleware test
-rw-r--r--railties/test/application/middleware_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 093cb6ca2a..4703a59326 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -30,6 +30,7 @@ module ApplicationTests
"ActiveSupport::Cache::Strategy::LocalCache",
"Rack::Runtime",
"Rack::MethodOverride",
+ "ActionDispatch::RequestId",
"Rails::Rack::Logger", # must come after Rack::MethodOverride to properly log overridden methods
"ActionDispatch::ShowExceptions",
"ActionDispatch::RemoteIp",