Fixes

Author: comandeo-mongo

.evergreen/config.yml

@@ -738,17 +738,6 @@ buildvariants:
   tasks:
      - name: "test"
 
-- matrix_name: "bson-min"
-  matrix_spec:
-    driver: [bson-min]
-    ruby: ["ruby-2.7"]
-    mongodb-version: "5.0"
-    topology: "server"
-    os: ubuntu-20.04
-  display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
-  tasks:
-    - name: "test"
-
 - matrix_name: "rails-7"
   matrix_spec:
     ruby: ["ruby-3.3"]
@@ -757,8 +746,7 @@ buildvariants:
     topology: "server"
     rails: ['7.0', '7.1']
     os: ubuntu-22.04
-    fle: helper
-  display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
+  display_name: "${rails}, ${driver}, ${mongodb-version}"
   tasks:
     - name: "test"
 
@@ -799,16 +787,3 @@ buildvariants:
   display_name: "app tests ${driver}, ${ruby}, ${rails}"
   tasks:
      - name: "test"
-
-- matrix_name: "auto-encryption"
-  matrix_spec:
-    ruby: ruby-3.1
-    driver: current
-    topology: replica_set
-    mongodb-version: ['6.0']
-    os: ubuntu-22.04
-    rails: ['7.0']
-    fle: helper
-  display_name: "FLE: ${rails}, ${driver}, ${mongodb-version}"
-  tasks:
-    - name: "test"

.evergreen/config/variants.yml.erb

@@ -87,17 +87,6 @@ buildvariants:
   tasks:
      - name: "test"
 
-- matrix_name: "bson-min"
-  matrix_spec:
-    driver: [bson-min]
-    ruby: ["ruby-2.7"]
-    mongodb-version: "5.0"
-    topology: "server"
-    os: ubuntu-20.04
-  display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
-  tasks:
-    - name: "test"
-
 - matrix_name: "rails-7"
   matrix_spec:
     ruby: ["ruby-3.3"]
@@ -106,8 +95,7 @@ buildvariants:
     topology: "server"
     rails: ['7.0', '7.1']
     os: ubuntu-22.04
-    fle: helper
-  display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
+  display_name: "${rails}, ${driver}, ${mongodb-version}"
   tasks:
     - name: "test"
 
@@ -148,16 +136,3 @@ buildvariants:
   display_name: "app tests ${driver}, ${ruby}, ${rails}"
   tasks:
      - name: "test"
-
-- matrix_name: "auto-encryption"
-  matrix_spec:
-    ruby: ruby-3.1
-    driver: current
-    topology: replica_set
-    mongodb-version: ['6.0']
-    os: ubuntu-22.04
-    rails: ['7.0']
-    fle: helper
-  display_name: "FLE: ${rails}, ${driver}, ${mongodb-version}"
-  tasks:
-    - name: "test"

spec/mongoid/serializable_spec.rb

@@ -528,13 +528,11 @@
             end
 
             it "includes the first relation" do
-              expect(relation_hash[0]).to include
-                { "_id" => "kudamm", "street" => "Kudamm" }
+              expect(relation_hash[0]).to include({ "_id" => "kudamm", "street" => "Kudamm" })
             end
 
             it "includes the second relation" do
-              expect(relation_hash[1]).to include
-                { "_id" => "tauentzienstr", "street" => "Tauentzienstr" }
+              expect(relation_hash[1]).to include( "_id" => "tauentzienstr", "street" => "Tauentzienstr" )
             end
           end
 
@@ -545,13 +543,11 @@
             end
 
             it "includes the first relation" do
-              expect(relation_hash[0]).to include
-                { "_id" => "kudamm", "street" => "Kudamm" }
+              expect(relation_hash[0]).to include({ "_id" => "kudamm", "street" => "Kudamm" })
             end
 
             it "includes the second relation" do
-              expect(relation_hash[1]).to include
-                { "_id" => "tauentzienstr", "street" => "Tauentzienstr" }
+              expect(relation_hash[1]).to include({ "_id" => "tauentzienstr", "street" => "Tauentzienstr" })
             end
           end
 
@@ -670,8 +666,7 @@
             end
 
             it "includes the specified relation" do
-              expect(relation_hash).to include
-                { "_id" => "leo-marvin", "first_name" => "Leo", "last_name" => "Marvin" }
+              expect(relation_hash).to include({ "_id" => "leo-marvin", "first_name" => "Leo", "last_name" => "Marvin" })
             end
           end
 
@@ -682,8 +677,7 @@
             end
 
             it "includes the specified relation" do
-              expect(relation_hash).to include
-                { "_id" => "leo-marvin", "first_name" => "Leo", "last_name" => "Marvin" }
+              expect(relation_hash).to include({ "_id" => "leo-marvin", "first_name" => "Leo", "last_name" => "Marvin" })
             end
           end
 
@@ -694,8 +688,7 @@
             end
 
             it "includes the specified relation sans exceptions" do
-              expect(relation_hash).to include
-                { "first_name" => "Leo", "last_name" => "Marvin" }
+              expect(relation_hash).to include({ "first_name" => "Leo", "last_name" => "Marvin" })
             end
           end
         end