test(NODE-3387): correctly extract findOneX values in unified operati…

…ons (#2966)

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

@@ -309,7 +309,7 @@ operations.set('find', async ({ entities, operation }) => {
 operations.set('findOneAndReplace', async ({ entities, operation }) => {
   const collection = entities.getEntity('collection', operation.object);
   const { filter, replacement, ...opts } = operation.arguments;
-  return collection.findOneAndReplace(filter, replacement, translateOptions(opts));
+  return (await collection.findOneAndReplace(filter, replacement, translateOptions(opts))).value;
 });
 
 operations.set('findOneAndUpdate', async ({ entities, operation }) => {
@@ -318,6 +318,12 @@ operations.set('findOneAndUpdate', async ({ entities, operation }) => {
   return (await collection.findOneAndUpdate(filter, update, translateOptions(opts))).value;
 });
 
+operations.set('findOneAndDelete', async ({ entities, operation }) => {
+  const collection = entities.getEntity('collection', operation.object);
+  const { filter, ...opts } = operation.arguments;
+  return (await collection.findOneAndDelete(filter, opts)).value;
+});
+
 operations.set('failPoint', async ({ entities, operation }) => {
   const client = entities.getEntity('client', operation.arguments.client);
   return entities.failPoints.enableFailPoint(client, operation.arguments.failPoint);
@@ -467,11 +473,6 @@ operations.set('estimatedDocumentCount', async ({ entities, operation }) => {
   return collection.estimatedDocumentCount(operation.arguments);
 });
 
-operations.set('findOneAndDelete', async ({ entities, operation }) => {
-  const collection = entities.getEntity('collection', operation.object);
-  return collection.findOneAndDelete(operation.arguments.filter);
-});
-
 operations.set('runCommand', async ({ entities, operation }: OperationFunctionParams) => {
   const db = entities.getEntity('db', operation.object);
   return db.command(operation.arguments.command);