From 23dd50316cfd1cbb576c342abdc87a73d926faa0 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Thu, 1 Aug 2019 15:25:59 +0100
Subject: [PATCH] FIX: Rollback when multisite tests raise exceptions

---
 spec/rails_helper.rb | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index c5dcc9bd0d2..339f11727c0 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -264,18 +264,10 @@ RSpec.configure do |config|
   # force a rollback after using a multisite connection.
   def test_multisite_connection(name)
     RailsMultisite::ConnectionManagement.with_connection(name) do
-      spec_exception = nil
-
-      ActiveRecord::Base.transaction do
-        begin
-          yield
-        rescue Exception => spec_exception
-        ensure
-          raise ActiveRecord::Rollback
-        end
+      ActiveRecord::Base.transaction(joinable: false) do
+        yield
+        raise ActiveRecord::Rollback
       end
-
-      raise spec_exception if spec_exception
     end
   end