aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2013-03-03 13:20:44 -0700
committerJosé Valim <jose.valim@plataformatec.com.br>2013-03-03 13:20:44 -0700
commit9ee6f3cc8ef1cd50648ec2882803943d3bd1f24a (patch)
tree6060894be73e4d699528cc4b8acd8ef4b06e2c1e /railties/test
parent86cf7a2d166430fac1611aa7593b52b46eeb9f70 (diff)
downloadrails-9ee6f3cc8ef1cd50648ec2882803943d3bd1f24a.tar.gz
rails-9ee6f3cc8ef1cd50648ec2882803943d3bd1f24a.tar.bz2
rails-9ee6f3cc8ef1cd50648ec2882803943d3bd1f24a.zip
Bring config.allow_concurrency back
Since the Rack::Lock still exists in development, let's provide a way to disable it explicitly.
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/application/middleware_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 73ef2046c0..d8076c7151 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -96,6 +96,12 @@ module ApplicationTests
assert !middleware.include?("Rack::Lock")
end
+ test "removes lock if allow concurrency is set" do
+ add_to_config "config.allow_concurrency = true"
+ boot!
+ assert !middleware.include?("Rack::Lock")
+ end
+
test "removes static asset server if serve_static_assets is disabled" do
add_to_config "config.serve_static_assets = false"
boot!