Merge pull request rails#53494 from zzak/re-53492

Make sure query_cache config tests are using the right connection

Author: byroot

activerecord/test/cases/query_cache_test.rb

@@ -147,12 +147,12 @@ def test_cache_is_not_applied_when_config_is_false
       ActiveRecord::Base.establish_connection(db_config.configuration_hash.merge(query_cache: false))
     end
 
-    mw = middleware { |env|
-      ActiveRecord::Base.connection_handler.connection_pool_list(:reading).each do |pool|
-        assert_not_predicate pool.lease_connection, :query_cache_enabled
-        assert_nil pool.query_cache.instance_variable_get(:@max_size)
+    mw = middleware do |env|
+      ActiveRecord::Base.connected_to(role: :reading) do
+        assert_cache :off
+        assert_nil ActiveRecord::Base.lease_connection.pool.query_cache.instance_variable_get(:@max_size)
       end
-    }
+    end
 
     mw.call({})
   ensure
@@ -165,12 +165,12 @@ def test_cache_is_applied_when_config_is_string
       ActiveRecord::Base.establish_connection(db_config.configuration_hash.merge(query_cache: "unlimited"))
     end
 
-    mw = middleware { |env|
-      ActiveRecord::Base.connection_handler.connection_pool_list(:reading).each do |pool|
-        assert_predicate pool.lease_connection, :query_cache_enabled
-        assert_nil pool.query_cache.instance_variable_get(:@max_size)
+    mw = middleware do |env|
+      ActiveRecord::Base.connected_to(role: :reading) do
+        assert_cache :clean
+        assert_nil ActiveRecord::Base.lease_connection.pool.query_cache.instance_variable_get(:@max_size)
       end
-    }
+    end
 
     mw.call({})
   ensure
@@ -183,12 +183,12 @@ def test_cache_is_applied_when_config_is_integer
       ActiveRecord::Base.establish_connection(db_config.configuration_hash.merge(query_cache: 42))
     end
 
-    mw = middleware { |env|
-      ActiveRecord::Base.connection_handler.connection_pool_list(:reading).each do |pool|
-        assert_predicate pool.lease_connection, :query_cache_enabled
-        assert_equal 42, pool.query_cache.instance_variable_get(:@max_size)
+    mw = middleware do |env|
+      ActiveRecord::Base.connected_to(role: :reading) do
+        assert_cache :clean
+        assert_equal 42, ActiveRecord::Base.lease_connection.pool.query_cache.instance_variable_get(:@max_size)
       end
-    }
+    end
 
     mw.call({})
   ensure
@@ -201,19 +201,18 @@ def test_cache_is_applied_when_config_is_nil
       ActiveRecord::Base.establish_connection(db_config.configuration_hash.merge(query_cache: nil))
     end
 
-    mw = middleware { |env|
-      ActiveRecord::Base.connection_handler.connection_pool_list(:reading).each do |pool|
-        assert_predicate pool.lease_connection, :query_cache_enabled
+    mw = middleware do |env|
+      ActiveRecord::Base.connected_to(role: :reading) do
+        assert_cache :clean
+        assert_equal ActiveRecord::ConnectionAdapters::QueryCache::DEFAULT_SIZE, ActiveRecord::Base.lease_connection.pool.query_cache.instance_variable_get(:@max_size)
       end
-    }
+    end
 
     mw.call({})
   ensure
     clean_up_connection_handler
   end
 
-
-
   if Process.respond_to?(:fork) && !in_memory_db?
     def test_query_cache_with_forked_processes
       ActiveRecord::Base.connected_to(role: :reading) do