MONGOID-5754 Making sure Mongoid works right with latest driver

gemfiles/driver_master.gemfile

@@ -1,7 +1,7 @@
 # rubocop:todo all
 source "https://rubygems.org"
 
-gem 'bson', git: "https://github.com/mongodb/bson-ruby", branch: '4-stable'
+gem 'bson', git: "https://github.com/mongodb/bson-ruby"
 gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver"
 
 gem 'actionpack'

gemfiles/driver_stable.gemfile

@@ -1,7 +1,7 @@
 # rubocop:todo all
 source "https://rubygems.org"
 
-gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.18-stable'
+gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.19-stable'
 
 gem 'actionpack'
 

lib/mongoid/clients/sessions.rb

@@ -59,6 +59,8 @@ def with_session(options = {})
           else
             raise ex
           end
+        rescue *transactions_not_supported_exceptions
+          raise Mongoid::Errors::TransactionsNotSupported
         ensure
           Threaded.clear_session(client: persistence_context.client)
         end
@@ -90,6 +92,8 @@ def transaction(options = {}, session_options: {})
               session.start_transaction(options)
               yield
               commit_transaction(session)
+            rescue *transactions_not_supported_exceptions
+              raise Mongoid::Errors::TransactionsNotSupported
             rescue Mongoid::Errors::Rollback
               abort_transaction(session)
             rescue Mongoid::Errors::InvalidSessionNesting
@@ -150,6 +154,22 @@ def after_rollback(*args, &block)
 
         private
 
+        # Driver version 2.20 introduced a new exception for reporting that
+        # transactions are not supported. Prior to that, the condition was
+        # discovered by the rescue clause falling through to a different
+        # exception.
+        #
+        # This method ensures that Mongoid continues to work with older driver
+        # versions, by only returning the new exception.
+        #
+        # Once support is removed for all versions prior to 2.20.0, we can
+        # replace this method.
+        def transactions_not_supported_exceptions
+          return nil unless defined? Mongo::Error::TransactionsNotSupported
+
+          Mongo::Error::TransactionsNotSupported
+        end
+
         # @return [ Mongo::Session ] Session for the current client.
         def _session
           Threaded.get_session(client: persistence_context.client)