Fix a flaky test in query_assertions_test.rb (#50503)

rails · Jan 2, 2024 · 2edf4a7 · 2edf4a7
1 parent 65f4022
commit 2edf4a7
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/activerecord/test/cases/assertions/query_assertions_test.rb b/activerecord/test/cases/assertions/query_assertions_test.rb
@@ -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