1 files changed, 36 insertions, 22 deletions

diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index ee88bd8144..fcb72c2904 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -128,10 +128,10 @@ class FixturesTest < ActiveRecord::TestCase
         ]
       }
 
-      conn.stubs(:max_allowed_packet).returns(packet_size - mysql_margin)
-
-      error = assert_raises(ActiveRecord::ActiveRecordError) { conn.insert_fixtures_set(fixtures) }
-      assert_match(/Fixtures set is too large #{packet_size}\./, error.message)
+      conn.stub(:max_allowed_packet, packet_size - mysql_margin) do
+        error = assert_raises(ActiveRecord::ActiveRecordError) { conn.insert_fixtures_set(fixtures) }
+        assert_match(/Fixtures set is too large #{packet_size}\./, error.message)
+      end
     end
 
     def test_insert_fixture_set_when_max_allowed_packet_is_bigger_than_fixtures_set_size
@@ -143,10 +143,10 @@ class FixturesTest < ActiveRecord::TestCase
         ]
       }
 
-      conn.stubs(:max_allowed_packet).returns(packet_size)
-
-      assert_difference "TrafficLight.count" do
-        conn.insert_fixtures_set(fixtures)
+      conn.stub(:max_allowed_packet, packet_size) do
+        assert_difference "TrafficLight.count" do
+          conn.insert_fixtures_set(fixtures)
+        end
       end
     end
 
@@ -164,12 +164,13 @@ class FixturesTest < ActiveRecord::TestCase
         ]
       }
 
-      conn.stubs(:max_allowed_packet).returns(packet_size)
+      conn.stub(:max_allowed_packet, packet_size) do
+        conn.insert_fixtures_set(fixtures)
 
-      conn.insert_fixtures_set(fixtures)
-      assert_equal 2, subscriber.events.size
-      assert_operator subscriber.events.first.bytesize, :<, packet_size
-      assert_operator subscriber.events.second.bytesize, :<, packet_size
+        assert_equal 2, subscriber.events.size
+        assert_operator subscriber.events.first.bytesize, :<, packet_size
+        assert_operator subscriber.events.second.bytesize, :<, packet_size
+      end
     ensure
       ActiveSupport::Notifications.unsubscribe(subscription)
     end
@@ -188,10 +189,10 @@ class FixturesTest < ActiveRecord::TestCase
         ]
       }
 
-      conn.stubs(:max_allowed_packet).returns(packet_size)
-
-      assert_difference ["TrafficLight.count", "Comment.count"], +1 do
-        conn.insert_fixtures_set(fixtures)
+      conn.stub(:max_allowed_packet, packet_size) do
+        assert_difference ["TrafficLight.count", "Comment.count"], +1 do
+          conn.insert_fixtures_set(fixtures)
+        end
       end
       assert_equal 1, subscriber.events.size
     ensure
@@ -833,29 +834,42 @@ class TransactionalFixturesOnConnectionNotification < ActiveRecord::TestCase
   self.use_instantiated_fixtures = false
 
   def test_transaction_created_on_connection_notification
-    connection = stub(transaction_open?: false)
+    connection = Class.new do
+      attr_accessor :pool
+
+      def transaction_open?; end
+      def begin_transaction(*args); end
+      def rollback_transaction(*args); end
+    end.new
+
+    connection.pool = Class.new do
+      def lock_thread=(lock_thread); end
+    end.new
+
     connection.expects(:begin_transaction).with(joinable: false)
-    pool = connection.stubs(:pool).returns(ActiveRecord::ConnectionAdapters::ConnectionPool.new(ActiveRecord::Base.connection_pool.spec))
-    pool.stubs(:lock_thread=).with(false)
+
     fire_connection_notification(connection)
   end
 
   def test_notification_established_transactions_are_rolled_back
-    # Mocha is not thread-safe so define our own stub to test
     connection = Class.new do
       attr_accessor :rollback_transaction_called
       attr_accessor :pool
+
       def transaction_open?; true; end
       def begin_transaction(*args); end
       def rollback_transaction(*args)
         @rollback_transaction_called = true
       end
     end.new
+
     connection.pool = Class.new do
-      def lock_thread=(lock_thread); false; end
+      def lock_thread=(lock_thread); end
     end.new
+
     fire_connection_notification(connection)
     teardown_fixtures
+
     assert(connection.rollback_transaction_called, "Expected <mock connection>#rollback_transaction to be called but was not")
   end