test: fix missing insertedIds in spec tests

Author: durran

src/bulk/common.ts

@@ -535,8 +535,8 @@ function executeCommands(
     }
 
     // Merge the results together
-    const writeResult = new BulkWriteResult(bulkOperation.s.bulkResult);
     const mergeResult = mergeBatchResults(batch, bulkOperation.s.bulkResult, err, result);
+    const writeResult = new BulkWriteResult(bulkOperation.s.bulkResult);
     if (mergeResult != null) {
       return callback(undefined, writeResult);
     }
@@ -1233,7 +1233,6 @@ export abstract class BulkOperationBase {
       this.s.executed = true;
       const finalOptions = { ...this.s.options, ...options };
       const operation = new BulkWriteShimOperation(this, finalOptions);
-
       return executeOperation(this.s.collection.s.db.s.client, operation);
     }, callback);
   }

test/tools/unified-spec-runner/operations.ts

@@ -657,7 +657,21 @@ operations.set('rewrapManyDataKey', async ({ entities, operation }) => {
   const clientEncryption = entities.getEntity('clientEncryption', operation.object);
   const { filter, opts } = operation.arguments!;
 
-  return await clientEncryption.rewrapManyDataKey(filter, opts);
+  const rewrapManyDataKeyResult = await clientEncryption.rewrapManyDataKey(filter, opts);
+  if (rewrapManyDataKeyResult.bulkWriteResult != null) {
+    // TODO: Create DRIVERS ticket.
+    //
+    // The unified spec runner match function will assert that documents have no extra
+    // keys.  For `rewrapManyDataKey` operations, our unifed tests will fail because
+    // our BulkWriteResult class has an insertedIds property, which is correct by the
+    // spec but not defined in the spec tests.
+    const { bulkWriteResult } = rewrapManyDataKeyResult;
+    Object.defineProperty(bulkWriteResult, 'insertedIds', {
+      value: bulkWriteResult.insertedIds,
+      enumerable: false
+    });
+  }
+  return rewrapManyDataKeyResult;
 });
 
 operations.set('deleteKey', async ({ entities, operation }) => {