post-rebase fixes

Author: nirinchev

tests/integration/tools/mongodb/read/aggregate.test.ts

@@ -1,15 +1,12 @@
 import {
     databaseCollectionParameters,
-    setupIntegrationTest,
     validateToolMetadata,
-    validateAutoConnectBehavior,
     validateThrowsForInvalidArguments,
     getResponseElements,
 } from "../../../helpers.js";
+import { describeWithMongoDB, validateAutoConnectBehavior } from "../mongodbHelpers.js";
 
-describe("aggregate tool", () => {
-    const integration = setupIntegrationTest();
-
+describeWithMongoDB("aggregate tool", (integration) => {
     validateToolMetadata(integration, "aggregate", "Run an aggregation against a MongoDB collection", [
         ...databaseCollectionParameters,
         {

tests/integration/tools/mongodb/read/collectionIndexes.test.ts

@@ -1,17 +1,14 @@
 import { IndexDirection } from "mongodb";
 import {
     databaseCollectionParameters,
-    setupIntegrationTest,
     validateToolMetadata,
-    validateAutoConnectBehavior,
     validateThrowsForInvalidArguments,
     getResponseElements,
     databaseCollectionInvalidArgs,
 } from "../../../helpers.js";
+import { describeWithMongoDB, validateAutoConnectBehavior } from "../mongodbHelpers.js";
 
-describe("collectionIndexes tool", () => {
-    const integration = setupIntegrationTest();
-
+describeWithMongoDB("collectionIndexes tool", (integration) => {
     validateToolMetadata(
         integration,
         "collection-indexes",

tests/integration/tools/mongodb/read/find.test.ts

@@ -3,14 +3,12 @@ import {
     databaseCollectionParameters,
     setupIntegrationTest,
     validateToolMetadata,
-    validateAutoConnectBehavior,
     validateThrowsForInvalidArguments,
     getResponseElements,
 } from "../../../helpers.js";
+import { describeWithMongoDB, validateAutoConnectBehavior } from "../mongodbHelpers.js";
 
-describe("find tool", () => {
-    const integration = setupIntegrationTest();
-
+describeWithMongoDB("find tool", (integration) => {
     validateToolMetadata(integration, "find", "Run a find query against a MongoDB collection", [
         ...databaseCollectionParameters,