Fix Mongoid CI (#5986) (#5993) (#5998)

Author: comandeo-mongo

.evergreen/config.yml

@@ -642,18 +642,7 @@ buildvariants:
     driver: ["current"]
     topology: '*'
     mongodb-version: ['4.4']
-    os: rhel80
-  display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
-  tasks:
-    - name: "test"
-
-- matrix_name: "ruby-2.6"
-  matrix_spec:
-    ruby: ["ruby-2.6"]
-    driver: ["current"]
-    topology: ['replica-set']
-    mongodb-version: ['4.0']
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -664,29 +653,29 @@ buildvariants:
     ruby: ["ruby-3.1"]
     mongodb-version: "6.0"
     topology: ['replica-set', 'sharded-cluster']
-    os: debian11
+    os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
 
 - matrix_name: "driver-oldstable"
   matrix_spec:
     driver: [oldstable, min]
-    ruby: ["ruby-2.6"]
-    mongodb-version: "4.0"
+    ruby: ["ruby-2.7"]
+    mongodb-version: "4.4"
     topology: ['replica-set', 'sharded-cluster']
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
 
 - matrix_name: "driver-min"
   matrix_spec:
     driver: [min]
-    ruby: ["ruby-2.6"]
+    ruby: ["ruby-2.7"]
     mongodb-version: "3.6"
     topology: "standalone"
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
@@ -744,22 +733,22 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-2.7"]
     driver: ["current"]
-    mongodb-version: "4.0"
+    mongodb-version: "4.4"
     topology: "standalone"
     rails: ['5.2']
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "${rails}, ${driver}, ${mongodb-version}"
   tasks:
      - name: "test"
 
 - matrix_name: "i18n-1.0"
   matrix_spec:
-    ruby: "ruby-2.6"
+    ruby: "ruby-2.7"
     driver: ["current"]
     mongodb-version: "4.4"
     topology: "standalone"
     i18n: '1.0'
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "i18n-1.0 ${rails}, ${driver}, ${mongodb-version}"
   tasks:
      - name: "test"

.evergreen/config/variants.yml.erb

@@ -38,18 +38,7 @@ buildvariants:
     driver: ["current"]
     topology: '*'
     mongodb-version: ['4.4']
-    os: rhel80
-  display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
-  tasks:
-    - name: "test"
-
-- matrix_name: "ruby-2.6"
-  matrix_spec:
-    ruby: ["ruby-2.6"]
-    driver: ["current"]
-    topology: ['replica-set']
-    mongodb-version: ['4.0']
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -60,29 +49,29 @@ buildvariants:
     ruby: ["ruby-3.1"]
     mongodb-version: "6.0"
     topology: ['replica-set', 'sharded-cluster']
-    os: debian11
+    os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
 
 - matrix_name: "driver-oldstable"
   matrix_spec:
     driver: [oldstable, min]
-    ruby: ["ruby-2.6"]
-    mongodb-version: "4.0"
+    ruby: ["ruby-2.7"]
+    mongodb-version: "4.4"
     topology: ['replica-set', 'sharded-cluster']
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
 
 - matrix_name: "driver-min"
   matrix_spec:
     driver: [min]
-    ruby: ["ruby-2.6"]
+    ruby: ["ruby-2.7"]
     mongodb-version: "3.6"
     topology: "standalone"
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
@@ -140,22 +129,22 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-2.7"]
     driver: ["current"]
-    mongodb-version: "4.0"
+    mongodb-version: "4.4"
     topology: "standalone"
     rails: ['5.2']
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "${rails}, ${driver}, ${mongodb-version}"
   tasks:
      - name: "test"
 
 - matrix_name: "i18n-1.0"
   matrix_spec:
-    ruby: "ruby-2.6"
+    ruby: "ruby-2.7"
     driver: ["current"]
     mongodb-version: "4.4"
     topology: "standalone"
     i18n: '1.0'
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "i18n-1.0 ${rails}, ${driver}, ${mongodb-version}"
   tasks:
      - name: "test"

spec/shared

@@ -2,27 +2,30 @@
 
 module Mongoid
   module Expectations
-
-    def connection_class
-      if defined?(Mongo::Server::ConnectionBase)
-        Mongo::Server::ConnectionBase
-      else
-        # Pre-2.8 drivers
-        Mongo::Server::Connection
+    # Previously this method used RSpec::Mocks with .exactly.times(n).and_call_original,
+    # which stopped working reliably in Ruby 3.3. Now we directly wrap the target method.
+    def expect_query(number)
+      if %i[ sharded load-balanced ].include?(ClusterConfig.instance.topology) && number > 0
+        skip 'This spec requires replica set or standalone topology'
       end
-    end
 
-    def expect_query(number)
-      rv = nil
-      RSpec::Mocks.with_temporary_scope do
-        if number > 0
-          expect_any_instance_of(connection_class).to receive(:command_started).exactly(number).times.and_call_original
-        else
-          expect_any_instance_of(connection_class).not_to receive(:command_started)
+      klass = Mongo::Server::ConnectionBase
+      original_method = klass.instance_method(:command_started)
+      query_count = 0
+
+      begin
+        klass.define_method(:command_started) do |*args, **kwargs|
+          query_count += 1
+          original_method.bind_call(self, *args, **kwargs)
         end
-        rv = yield
+
+        result = yield
+        expect(query_count).to eq(number)
+        result
+      ensure
+        klass.remove_method(:command_started)
+        klass.define_method(:command_started, original_method)
       end
-      rv
     end
 
     def expect_no_queries(&block)