Ensure that preventing writes is invoked before `materialize_transactions` consistently

1 files changed, 21 insertions, 9 deletions

diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index 79a431c7ee..3d31533ec8 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -166,9 +166,13 @@ module ActiveRecord
     end
 
     def test_errors_when_an_insert_query_is_called_while_preventing_writes
-      assert_raises(ActiveRecord::ReadOnlyError) do
-        @connection.while_preventing_writes do
-          @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')")
+      assert_no_queries do
+        assert_raises(ActiveRecord::ReadOnlyError) do
+          @connection.while_preventing_writes do
+            @connection.transaction do
+              @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
+            end
+          end
         end
       end
     end
@@ -176,9 +180,13 @@ module ActiveRecord
     def test_errors_when_an_update_query_is_called_while_preventing_writes
       @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')")
 
-      assert_raises(ActiveRecord::ReadOnlyError) do
-        @connection.while_preventing_writes do
-          @connection.update("UPDATE subscribers SET nick = '9989' WHERE nick = '138853948594'")
+      assert_no_queries do
+        assert_raises(ActiveRecord::ReadOnlyError) do
+          @connection.while_preventing_writes do
+            @connection.transaction do
+              @connection.update("UPDATE subscribers SET nick = '9989' WHERE nick = '138853948594'")
+            end
+          end
         end
       end
     end
@@ -186,9 +194,13 @@ module ActiveRecord
     def test_errors_when_a_delete_query_is_called_while_preventing_writes
       @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')")
 
-      assert_raises(ActiveRecord::ReadOnlyError) do
-        @connection.while_preventing_writes do
-          @connection.delete("DELETE FROM subscribers WHERE nick = '138853948594'")
+      assert_no_queries do
+        assert_raises(ActiveRecord::ReadOnlyError) do
+          @connection.while_preventing_writes do
+            @connection.transaction do
+              @connection.delete("DELETE FROM subscribers WHERE nick = '138853948594'")
+            end
+          end
         end
       end
     end