Soften the lock requirements when eager_load is disabled

We don't need to fully disable concurrent requests: just ensure that
loads are performed in isolation.

1 files changed, 21 insertions, 4 deletions

diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index ce92ebbf66..0ea2c57c55 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -121,23 +121,40 @@ module ApplicationTests
       assert !middleware.include?("ActiveRecord::Migration::CheckPending")
     end
 
-    test "includes lock if cache_classes is set but eager_load is not" do
+    test "includes interlock if cache_classes is set but eager_load is not" do
       add_to_config "config.cache_classes = true"
       boot!
-      assert middleware.include?("Rack::Lock")
+      assert_not_includes middleware, "Rack::Lock"
+      assert_includes middleware, "ActionDispatch::LoadInterlock"
+    end
+
+    test "includes lock if cache_classes is off" do
+      add_to_config "config.cache_classes = false"
+      boot!
+      assert_includes middleware, "Rack::Lock"
+      assert_not_includes middleware, "ActionDispatch::LoadInterlock"
     end
 
     test "does not include lock if cache_classes is set and so is eager_load" do
       add_to_config "config.cache_classes = true"
       add_to_config "config.eager_load = true"
       boot!
-      assert !middleware.include?("Rack::Lock")
+      assert_not_includes middleware, "Rack::Lock"
+      assert_not_includes middleware, "ActionDispatch::LoadInterlock"
     end
 
     test "does not include lock if allow_concurrency is set" do
       add_to_config "config.allow_concurrency = true"
       boot!
-      assert !middleware.include?("Rack::Lock")
+      assert_not_includes middleware, "Rack::Lock"
+      assert_not_includes middleware, "ActionDispatch::LoadInterlock"
+    end
+
+    test "includes lock if allow_concurrency is disabled" do
+      add_to_config "config.allow_concurrency = false"
+      boot!
+      assert_includes middleware, "Rack::Lock"
+      assert_not_includes middleware, "ActionDispatch::LoadInterlock"
     end
 
     test "removes static asset server if serve_static_files is disabled" do