Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a flaky test in query_assertions_test.rb #50503

Merged
merged 1 commit into from
Jan 2, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 5 additions & 7 deletions activerecord/test/cases/assertions/query_assertions_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -90,27 +90,25 @@ def test_assert_no_queries_match_matcher
if current_adapter?(:PostgreSQLAdapter)
def test_assert_queries_count_include_schema
Post.columns # load columns
assert_raises(Minitest::Assertion, match: "0 instead of 1 queries were executed") do
assert_queries_count(1, include_schema: true) { Post.columns }
assert_raises(Minitest::Assertion, match: "1 or more queries expected") do
assert_queries_count(include_schema: true) { Post.columns }
end

Post.reset_column_information
assert_queries_count(1, include_schema: true) { Post.columns }
assert_queries_count(include_schema: true) { Post.columns }
end

def test_assert_no_queries_include_schema
assert_no_queries { Post.none }

error = assert_raises(Minitest::Assertion) {
assert_raises(Minitest::Assertion, match: /\d instead of 0/) {
assert_no_queries { Post.first }
}
assert_match(/1 instead of 0/, error.message)

Post.reset_column_information
error = assert_raises(Minitest::Assertion) {
assert_raises(Minitest::Assertion, match: /\d instead of 0/) {
assert_no_queries(include_schema: true) { Post.columns }
}
assert_match(/1 instead of 0/, error.message)
end

def test_assert_queries_match_include_schema
Expand Down