MONGOID-5581 Remove rspec-mocks-diag gem

.evergreen/config.yml

@@ -326,10 +326,14 @@ axes:
   - id: "mongodb-version"
     display_name: MongoDB Version
     values:
+      - id: "latest"
+        display_name: "MongoDB Latest"
+        variables:
+           VERSION: "latest"
       - id: "6.0"
         display_name: "MongoDB 6.0"
         variables:
-           VERSION: "5.0"
+           VERSION: "6.0"
       - id: "5.3"
         display_name: "MongoDB 5.3"
         variables:
@@ -578,12 +582,12 @@ buildvariants:
   tasks:
     - name: "test"
 
-- matrix_name: "mongodb-5.3"
+- matrix_name: "mongodb-latest"
   matrix_spec:
     ruby: ["ruby-3.1"]
     driver: ["current"]
     topology: '*'
-    mongodb-version: ['5.3']
+    mongodb-version: ['latest']
     os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
@@ -628,7 +632,7 @@ buildvariants:
     driver: ["current"]
     topology: ['replica-set']
     mongodb-version: ['4.0']
-    os: ubuntu-16.04
+    os: ubuntu-18.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -661,7 +665,7 @@ buildvariants:
     ruby: ["ruby-2.6"]
     mongodb-version: "3.6"
     topology: "standalone"
-    os: ubuntu-16.04
+    os: ubuntu-18.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"

.evergreen/config/axes.yml.erb

@@ -2,10 +2,14 @@ axes:
   - id: "mongodb-version"
     display_name: MongoDB Version
     values:
+      - id: "latest"
+        display_name: "MongoDB Latest"
+        variables:
+           VERSION: "latest"
       - id: "6.0"
         display_name: "MongoDB 6.0"
         variables:
-           VERSION: "5.0"
+           VERSION: "6.0"
       - id: "5.3"
         display_name: "MongoDB 5.3"
         variables:

.evergreen/config/variants.yml.erb

@@ -10,12 +10,12 @@ buildvariants:
   tasks:
     - name: "test"
 
-- matrix_name: "mongodb-5.3"
+- matrix_name: "mongodb-latest"
   matrix_spec:
     ruby: ["ruby-3.1"]
     driver: ["current"]
     topology: '*'
-    mongodb-version: ['5.3']
+    mongodb-version: ['latest']
     os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
@@ -60,7 +60,7 @@ buildvariants:
     driver: ["current"]
     topology: ['replica-set']
     mongodb-version: ['4.0']
-    os: ubuntu-16.04
+    os: ubuntu-18.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -93,7 +93,7 @@ buildvariants:
     ruby: ["ruby-2.6"]
     mongodb-version: "3.6"
     topology: "standalone"
-    os: ubuntu-16.04
+    os: ubuntu-18.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"

gemfiles/standard.rb

@@ -16,11 +16,11 @@ def standard_dependencies
     # Evergreen configuration generation
     gem 'erubi'
     gem 'tilt'
-    gem 'solargraph'
+    gem 'solargraph', platform: :mri
   end
 
   group :development, :test do
-    gem 'rspec-core', '~> 3.10'
+    gem 'rspec', '~> 3.12'
     gem 'rubocop', '~> 1.45.1'
     gem 'rubocop-performance', '~> 1.16.0'
     gem 'rubocop-rails', '~> 2.17.4'
@@ -40,8 +40,6 @@ def standard_dependencies
     gem 'timecop'
     gem 'rspec-retry'
     gem 'benchmark-ips'
-    gem 'rspec-expectations', '~> 3.7', '>= 3.8.4'
-    gem 'rspec-mocks-diag', '~> 3.0'
     gem 'fuubar'
     gem 'rfc'
     gem 'childprocess'

spec/mongoid/config_spec.rb

@@ -570,24 +570,26 @@
 
       it 'passes uuid to driver' do
         Mongo::Client.should receive(:new).with(SpecConfig.instance.addresses,
-          auto_encryption_options: {
-            'key_vault_namespace' => 'admin.datakeys',
-            'kms_providers' => {'local' => {'key' => 'z7iYiYKLuYymEWtk4kfny1ESBwwFdA58qMqff96A8ghiOcIK75lJGPUIocku8LOFjQuEgeIP4xlln3s7r93FV9J5sAE7zg8U'}},
-            'schema_map' => {'blog_development.comments' => {
-              'bsonType' => 'object',
-              'properties' => {
-                'message' => {'encrypt' => {
-                  'algorithm' => 'AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic',
-                  'bsonType' => 'string',
-                  'keyId' => [BSON::Binary.new("G\xF0 5\xCC@HX\xA2%b\x97\xA9a\xA8\xE7", :uuid)],
-                }},
-              },
-            }}},
-          database: 'mongoid_test',
-          platform: "mongoid-#{Mongoid::VERSION}",
-          wrapping_libraries: [
-            {'name' => 'Mongoid', 'version' => Mongoid::VERSION},
-          ],
+          {
+            auto_encryption_options: {
+              'key_vault_namespace' => 'admin.datakeys',
+              'kms_providers' => {'local' => {'key' => 'z7iYiYKLuYymEWtk4kfny1ESBwwFdA58qMqff96A8ghiOcIK75lJGPUIocku8LOFjQuEgeIP4xlln3s7r93FV9J5sAE7zg8U'}},
+              'schema_map' => {'blog_development.comments' => {
+                'bsonType' => 'object',
+                'properties' => {
+                  'message' => {'encrypt' => {
+                    'algorithm' => 'AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic',
+                    'bsonType' => 'string',
+                    'keyId' => [BSON::Binary.new("G\xF0 5\xCC@HX\xA2%b\x97\xA9a\xA8\xE7", :uuid)],
+                  }},
+                },
+              }}},
+            database: 'mongoid_test',
+            platform: "mongoid-#{Mongoid::VERSION}",
+            wrapping_libraries: [
+              {'name' => 'Mongoid', 'version' => Mongoid::VERSION},
+            ]
+          }
         )
 
         client

spec/mongoid/copyable_spec.rb

@@ -91,7 +91,7 @@
           end
 
           it 'calls constructor with explicitly declared attributes only' do
-            expect(Mongoid::Factory).to receive(:build).with(cls, 'name' => 'test').and_call_original
+            expect(Mongoid::Factory).to receive(:build).with(cls, { 'name' => 'test' }).and_call_original
             cloned
           end
         end