RUBY-2859 Fix comment helper specification tests (#2421)

Author: comandeo-mongo

spec/spec_tests/data/crud_unified/bulkWrite-comment.yml

@@ -28,6 +28,9 @@ initialData: &initial_data
       - _id: 4
         x: 44
 
+# Tests in this file differs from the one in specification repo because
+# Ruby dirver does not group bulk write operations by command.
+# See https://jira.mongodb.org/browse/DRIVERS-2215
 tests:
   - description: 'BulkWrite with string comment'
     runOnRequirements:
@@ -48,15 +51,15 @@ tests:
             - updateOne:
                 filter: &updateOne_filter
                   _id: 2
-                update: &update { x: "updated" }
+                update: &update { $set: {x: "updated"} }
             - deleteOne:
                 filter: &deleteOne_filter
                   _id: 3
           comment: &string_comment "comment"
         expectResult: &expect_results
           deletedCount: 1
           insertedCount: 1
-          insertedIds: { 0: 5 }
+          insertedIds: { $$unsetOrMatches: { 0: 5} }
           matchedCount: 2
           modifiedCount: 2
           upsertedCount: 0
@@ -92,6 +95,7 @@ tests:
                 delete: *collection_name
                 deletes:
                   - q: *deleteOne_filter
+                    limit: 1
                 ordered: true
                 comment: *string_comment
     outcome: &outcome
@@ -148,6 +152,7 @@ tests:
                 delete: *collection_name
                 deletes:
                   - q: *deleteOne_filter
+                    limit: 1
                 ordered: true
                 comment: *document_comment
     outcome: *outcome

spec/spec_tests/data/crud_unified/updateMany-comment.yml

@@ -29,8 +29,7 @@ tests:
         object: *collection0
         arguments:
           filter: &filter { _id: 1 }
-          update: &update
-            - $set: { x: 22 }
+          update: &update { $set: {x: 22} }
           comment: "comment"
     expectEvents:
       - client: *client0
@@ -42,6 +41,7 @@ tests:
                   -
                     q: *filter
                     u: *update
+                    multi: true
                 comment: "comment"
     outcome: &outcome
       - collectionName: *collection0Name
@@ -69,6 +69,7 @@ tests:
                   -
                     q: *filter
                     u: *update
+                    multi: true
                 comment: *comment
     outcome: *outcome
 
@@ -94,5 +95,6 @@ tests:
                   -
                     q: *filter
                     u: *update
+                    multi: true
                 comment: "comment"
     outcome: *initialData

spec/spec_tests/data/crud_unified/updateOne-comment.yml

@@ -29,7 +29,7 @@ tests:
         object: *collection0
         arguments:
           filter: &filter { _id: 1 }
-          update: &update { x: 22 }
+          update: &update { $set: {x: 22} }
           comment: "comment"
     expectEvents:
       - client: *client0