1 files changed, 9 insertions, 2 deletions
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index a905598d80..caef39d16f 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -94,13 +94,20 @@ module ApplicationTests
       assert !middleware.include?("ActiveRecord::Migration::CheckPending")
     end
 
-    test "removes lock if cache classes is set" do
+    test "includes lock if cache_classes is set but eager_load is not" do
       add_to_config "config.cache_classes = true"
       boot!
+      assert middleware.include?("Rack::Lock")
+    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")
     end
 
-    test "removes lock if allow concurrency is set" do
+    test "does not include lock if allow_concurrency is set" do
       add_to_config "config.allow_concurrency = true"
       boot!
       assert !middleware.include?("Rack::Lock")