Skip to content

Commit a556be5

Browse files
committed
Use ActiveRecord::Base.lease_connection for uncached dirties tests
This commit addresses these errors since rails#51192 renames `.connection` into `.lease_connection` Follow up rails#51204 ```ruby $ cd activerecord $ bin/test test/cases/query_cache_test.rb -n /uncached_dirties/ Using sqlite3 Run options: -n /uncached_dirties/ --seed 57207 E Error: QueryCacheTest#test_query_cache_uncached_dirties: NoMethodError: undefined method `connection' for class ActiveRecord::Base lib/active_record/dynamic_matchers.rb:22:in `method_missing' test/cases/query_cache_test.rb:712:in `block (2 levels) in test_query_cache_uncached_dirties' /home/yahonda/src/github.com/rails/rails/activesupport/lib/active_support/testing/assertions.rb:241:in `assert_no_changes' test/cases/query_cache_test.rb:712:in `block in test_query_cache_uncached_dirties' test/cases/query_cache_test.rb:771:in `block (2 levels) in middleware' /home/yahonda/src/github.com/rails/rails/activesupport/lib/active_support/execution_wrapper.rb:91:in `wrap' test/cases/query_cache_test.rb:771:in `block in middleware' test/cases/query_cache_test.rb:720:in `test_query_cache_uncached_dirties' bin/test test/cases/query_cache_test.rb:709 E Error: QueryCacheTest#test_query_cache_connection_uncached_dirties: NoMethodError: undefined method `connection' for class ActiveRecord::Base lib/active_record/dynamic_matchers.rb:22:in `method_missing' test/cases/query_cache_test.rb:726:in `block (2 levels) in test_query_cache_connection_uncached_dirties' /home/yahonda/src/github.com/rails/rails/activesupport/lib/active_support/testing/assertions.rb:241:in `assert_no_changes' test/cases/query_cache_test.rb:726:in `block in test_query_cache_connection_uncached_dirties' test/cases/query_cache_test.rb:771:in `block (2 levels) in middleware' /home/yahonda/src/github.com/rails/rails/activesupport/lib/active_support/execution_wrapper.rb:91:in `wrap' test/cases/query_cache_test.rb:771:in `block in middleware' test/cases/query_cache_test.rb:734:in `test_query_cache_connection_uncached_dirties' bin/test test/cases/query_cache_test.rb:723 E Error: QueryCacheTest#test_query_cache_uncached_dirties_disabled_with_nested_cache: NoMethodError: undefined method `connection' for class ActiveRecord::Base lib/active_record/dynamic_matchers.rb:22:in `method_missing' test/cases/query_cache_test.rb:740:in `block (2 levels) in test_query_cache_uncached_dirties_disabled_with_nested_cache' /home/yahonda/src/github.com/rails/rails/activesupport/lib/active_support/testing/assertions.rb:194:in `assert_changes' test/cases/query_cache_test.rb:740:in `block in test_query_cache_uncached_dirties_disabled_with_nested_cache' test/cases/query_cache_test.rb:771:in `block (2 levels) in middleware' /home/yahonda/src/github.com/rails/rails/activesupport/lib/active_support/execution_wrapper.rb:91:in `wrap' test/cases/query_cache_test.rb:771:in `block in middleware' test/cases/query_cache_test.rb:757:in `test_query_cache_uncached_dirties_disabled_with_nested_cache' bin/test test/cases/query_cache_test.rb:737 Finished in 0.134429s, 22.3166 runs/s, 0.0000 assertions/s. 3 runs, 0 assertions, 0 failures, 3 errors, 0 skips $ ```
1 parent 5d528ba commit a556be5

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

activerecord/test/cases/query_cache_test.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -709,11 +709,11 @@ def test_clear_query_cache_is_called_on_all_connections
709709
def test_query_cache_uncached_dirties
710710
mw = middleware { |env|
711711
Post.first
712-
assert_no_changes -> { ActiveRecord::Base.connection.query_cache.size } do
712+
assert_no_changes -> { ActiveRecord::Base.lease_connection.query_cache.size } do
713713
Post.uncached(dirties: false) { Post.create!(title: "a new post", body: "and a body") }
714714
end
715715

716-
assert_changes -> { ActiveRecord::Base.connection.query_cache.size }, from: 1, to: 0 do
716+
assert_changes -> { ActiveRecord::Base.lease_connection.query_cache.size }, from: 1, to: 0 do
717717
Post.uncached(dirties: true) { Post.create!(title: "a new post", body: "and a body") }
718718
end
719719
}
@@ -723,12 +723,12 @@ def test_query_cache_uncached_dirties
723723
def test_query_cache_connection_uncached_dirties
724724
mw = middleware { |env|
725725
Post.first
726-
assert_no_changes -> { ActiveRecord::Base.connection.query_cache.size } do
727-
Post.connection.uncached(dirties: false) { Post.create!(title: "a new post", body: "and a body") }
726+
assert_no_changes -> { ActiveRecord::Base.lease_connection.query_cache.size } do
727+
Post.lease_connection.uncached(dirties: false) { Post.create!(title: "a new post", body: "and a body") }
728728
end
729729

730-
assert_changes -> { ActiveRecord::Base.connection.query_cache.size }, from: 1, to: 0 do
731-
Post.connection.uncached(dirties: true) { Post.create!(title: "a new post", body: "and a body") }
730+
assert_changes -> { ActiveRecord::Base.lease_connection.query_cache.size }, from: 1, to: 0 do
731+
Post.lease_connection.uncached(dirties: true) { Post.create!(title: "a new post", body: "and a body") }
732732
end
733733
}
734734
mw.call({})
@@ -737,7 +737,7 @@ def test_query_cache_connection_uncached_dirties
737737
def test_query_cache_uncached_dirties_disabled_with_nested_cache
738738
mw = middleware { |env|
739739
Post.first
740-
assert_changes -> { ActiveRecord::Base.connection.query_cache.size }, from: 1, to: 0 do
740+
assert_changes -> { ActiveRecord::Base.lease_connection.query_cache.size }, from: 1, to: 0 do
741741
Post.uncached(dirties: false) do
742742
Post.cache do
743743
Post.create!(title: "a new post", body: "and a body")
@@ -746,9 +746,9 @@ def test_query_cache_uncached_dirties_disabled_with_nested_cache
746746
end
747747

748748
Post.first
749-
assert_changes -> { ActiveRecord::Base.connection.query_cache.size }, from: 1, to: 0 do
750-
Post.connection.uncached(dirties: false) do
751-
Post.connection.cache do
749+
assert_changes -> { ActiveRecord::Base.lease_connection.query_cache.size }, from: 1, to: 0 do
750+
Post.lease_connection.uncached(dirties: false) do
751+
Post.lease_connection.cache do
752752
Post.create!(title: "a new post", body: "and a body")
753753
end
754754
end

0 commit comments

Comments
 (0)