rebase fixes

Author: nbbeeken

test/functional/operation_example.test.js

@@ -2934,7 +2934,7 @@ describe('Operation Examples', function () {
           { upsert: true, writeConcern: { w: 1 } },
           function (err, result) {
             expect(err).to.not.exist;
-            test.equal(1, result.result.n);
+            expect(result).property('upsertedCount').to.equal(1);
 
             // Fetch the document that we modified and check if it got inserted correctly
             collection.findOne({ a: 1 }, function (err, item) {

test/functional/operation_generators_example.test.js

@@ -4464,7 +4464,7 @@ describe('Operation (Generators)', function () {
         // Get the collection
         var col = db.collection('find_one_and_delete_with_generators');
         var r = yield col.insertMany([{ a: 1, b: 1 }], { writeConcern: { w: 1 } });
-        test.equal(1, r.result.n);
+        expect(r).property('insertedCount').to.equal(1);
 
         r = yield col.findOneAndDelete({ a: 1 }, { projection: { b: 1 }, sort: { a: 1 } });
         test.equal(1, r.lastErrorObject.n);
@@ -4509,7 +4509,7 @@ describe('Operation (Generators)', function () {
         // Get the collection
         var col = db.collection('find_one_and_replace_with_generators');
         var r = yield col.insertMany([{ a: 1, b: 1 }], { writeConcern: { w: 1 } });
-        test.equal(1, r.result.n);
+        expect(r).property('insertedCount').to.equal(1);
 
         r = yield col.findOneAndReplace(
           { a: 1 },
@@ -4564,7 +4564,7 @@ describe('Operation (Generators)', function () {
         // Get the collection
         var col = db.collection('find_one_and_update_with_generators');
         var r = yield col.insertMany([{ a: 1, b: 1 }], { writeConcern: { w: 1 } });
-        test.equal(1, r.result.n);
+        expect(r).property('insertedCount').to.equal(1);
 
         r = yield col.findOneAndUpdate(
           { a: 1 },

test/functional/operation_promises_example.test.js

@@ -4831,7 +4831,7 @@ describe('Operation (Promises)', function () {
         // Get the collection
         var col = db.collection('find_one_and_replace_with_promise');
         return col.insertMany([{ a: 1, b: 1 }], { writeConcern: { w: 1 } }).then(function (r) {
-          test.equal(1, r.result.n);
+          expect(r).property('insertedCount').to.equal(1);
 
           return col
             .findOneAndReplace(