Skip to content

Commit 2edf4a7

Browse files
authored
Fix a flaky test in query_assertions_test.rb (rails#50503)
1 parent 65f4022 commit 2edf4a7

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

activerecord/test/cases/assertions/query_assertions_test.rb

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,27 +90,25 @@ def test_assert_no_queries_match_matcher
9090
if current_adapter?(:PostgreSQLAdapter)
9191
def test_assert_queries_count_include_schema
9292
Post.columns # load columns
93-
assert_raises(Minitest::Assertion, match: "0 instead of 1 queries were executed") do
94-
assert_queries_count(1, include_schema: true) { Post.columns }
93+
assert_raises(Minitest::Assertion, match: "1 or more queries expected") do
94+
assert_queries_count(include_schema: true) { Post.columns }
9595
end
9696

9797
Post.reset_column_information
98-
assert_queries_count(1, include_schema: true) { Post.columns }
98+
assert_queries_count(include_schema: true) { Post.columns }
9999
end
100100

101101
def test_assert_no_queries_include_schema
102102
assert_no_queries { Post.none }
103103

104-
error = assert_raises(Minitest::Assertion) {
104+
assert_raises(Minitest::Assertion, match: /\d instead of 0/) {
105105
assert_no_queries { Post.first }
106106
}
107-
assert_match(/1 instead of 0/, error.message)
108107

109108
Post.reset_column_information
110-
error = assert_raises(Minitest::Assertion) {
109+
assert_raises(Minitest::Assertion, match: /\d instead of 0/) {
111110
assert_no_queries(include_schema: true) { Post.columns }
112111
}
113-
assert_match(/1 instead of 0/, error.message)
114112
end
115113

116114
def test_assert_queries_match_include_schema

0 commit comments

Comments
 (0)