chore(e2e-tests): import from @mongosh/testing

addaleax · addaleax · commit ac0399f04218 · 2025-12-05T17:17:18.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
@@ -29,6 +29,7 @@
   "dependencies": {
     "@mongosh/cli-repl": "2.5.10",
     "@mongosh/service-provider-core": "3.7.0",
+    "@mongosh/testing": "0.0.0-dev.0",
     "@mongodb-js/oidc-plugin": "^2.0.5",
     "strip-ansi": "^6.0.0"
   },
diff --git a/packages/e2e-tests/test/e2e-analytics.spec.ts b/packages/e2e-tests/test/e2e-analytics.spec.ts
@@ -1,6 +1,5 @@
 import { expect } from 'chai';
-import { startTestCluster } from '../../testing/src/integration-testing-hooks';
-import { eventually } from '../../testing/src/eventually';
+import { startTestCluster, eventually } from '@mongosh/testing';
 
 describe('e2e Analytics Node', function () {
   const replSetName = 'replicaSet';
diff --git a/packages/e2e-tests/test/e2e-auth.spec.ts b/packages/e2e-tests/test/e2e-auth.spec.ts
@@ -1,12 +1,12 @@
 import { expect } from 'chai';
 import type { Db, Document, MongoClientOptions } from 'mongodb';
 import { MongoClient } from 'mongodb';
-import { eventually } from '../../testing/src/eventually';
 import type { TestShell } from './test-shell';
 import {
+  eventually,
   skipIfApiStrict,
   startSharedTestServer,
-} from '../../testing/src/integration-testing-hooks';
+} from '@mongosh/testing';
 
 type AssertUserExists = (opts?: Document, username?: string) => Promise<void>;
 function createAssertUserExists(db: Db, dbName: string): AssertUserExists {
diff --git a/packages/e2e-tests/test/e2e-banners.spec.ts b/packages/e2e-tests/test/e2e-banners.spec.ts
@@ -1,7 +1,4 @@
-import {
-  skipIfApiStrict,
-  startSharedTestServer,
-} from '../../testing/src/integration-testing-hooks';
+import { skipIfApiStrict, startSharedTestServer } from '@mongosh/testing';
 import type { TestShell } from './test-shell';
 
 describe('e2e startup banners', function () {
diff --git a/packages/e2e-tests/test/e2e-bson.spec.ts b/packages/e2e-tests/test/e2e-bson.spec.ts
@@ -3,7 +3,7 @@ import type { Db } from 'mongodb';
 import { MongoClient } from 'mongodb';
 import * as bson from 'bson';
 import type { TestShell } from './test-shell';
-import { startSharedTestServer } from '../../testing/src/integration-testing-hooks';
+import { startSharedTestServer } from '@mongosh/testing';
 
 describe('BSON e2e', function () {
   const testServer = startSharedTestServer();
diff --git a/packages/e2e-tests/test/e2e-direct.spec.ts b/packages/e2e-tests/test/e2e-direct.spec.ts
@@ -1,9 +1,9 @@
 import {
+  eventually,
   startTestCluster,
   skipIfServerVersion,
   skipIfApiStrict,
-} from '../../testing/src/integration-testing-hooks';
-import { eventually } from '../../testing/src/eventually';
+} from '@mongosh/testing';
 import { expect } from 'chai';
 import type { TestShell } from './test-shell';
 
diff --git a/packages/e2e-tests/test/e2e-editor.spec.ts b/packages/e2e-tests/test/e2e-editor.spec.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import path from 'path';
 import { promises as fs } from 'fs';
-import { eventually } from '../../testing/src/eventually';
+import { eventually } from '@mongosh/testing';
 import { TestShell } from './test-shell';
 import { ensureTestShellAfterHook } from './test-shell-context';
 import {
diff --git a/packages/e2e-tests/test/e2e-fle.spec.ts b/packages/e2e-tests/test/e2e-fle.spec.ts
@@ -1,15 +1,15 @@
 import { expect } from 'chai';
 import { MongoClient } from 'mongodb';
 import type { TestShell } from './test-shell';
-import { eventually } from '../../testing/src/eventually';
 import {
+  eventually,
   startTestServer,
   skipIfApiStrict,
   skipIfServerVersion,
   skipIfCommunityServer,
   downloadCurrentCryptSharedLibrary,
   sortObjectArray,
-} from '../../testing/src/integration-testing-hooks';
+} from '@mongosh/testing';
 import {
   makeFakeHTTPServer,
   fakeAWSHandlers,
diff --git a/packages/e2e-tests/test/e2e-oidc.spec.ts b/packages/e2e-tests/test/e2e-oidc.spec.ts
@@ -1,16 +1,17 @@
 import {
+  getTestCertificatePath as getCertPath,
   MongoRunnerSetup,
   skipIfApiStrict,
   skipIfEnvServerVersion,
-} from '../../testing/src/integration-testing-hooks';
+} from '@mongosh/testing';
 import { promises as fs } from 'fs';
 import type { OIDCMockProviderConfig } from '@mongodb-js/oidc-mock-provider';
 import { OIDCMockProvider } from '@mongodb-js/oidc-mock-provider';
 import type { TestShell } from './test-shell';
 import path from 'path';
 import { expect } from 'chai';
 import { createServer as createHTTPSServer } from 'https';
-import { getCertPath, readReplLogFile, useTmpdir } from './repl-helpers';
+import { readReplLogFile, useTmpdir } from './repl-helpers';
 import {
   baseOidcServerConfig,
   commonOidcServerArgs,
diff --git a/packages/e2e-tests/test/e2e-proxy.spec.ts b/packages/e2e-tests/test/e2e-proxy.spec.ts
@@ -5,19 +5,16 @@ import type {
 } from 'http';
 import { createServer as createHTTPServer, request } from 'http';
 import {
+  getTestCertificatePath as getCertPath,
   MongoRunnerSetup,
   skipIfApiStrict,
   skipIfEnvServerVersion,
   startSharedTestServer,
   startTestServer,
-} from '../../testing/src/integration-testing-hooks';
+} from '@mongosh/testing';
 import type { Server as HTTPSServer } from 'https';
 import { createServer as createHTTPSServer } from 'https';
-import {
-  connectionStringWithLocalhost,
-  getCertPath,
-  useTmpdir,
-} from './repl-helpers';
+import { connectionStringWithLocalhost, useTmpdir } from './repl-helpers';
 import { once } from 'events';
 import { connect } from 'net';
 import type { AddressInfo, Socket } from 'net';
diff --git a/packages/e2e-tests/test/e2e-snapshot.spec.ts b/packages/e2e-tests/test/e2e-snapshot.spec.ts
@@ -1,7 +1,4 @@
-import {
-  skipIfApiStrict,
-  startSharedTestServer,
-} from '../../testing/src/integration-testing-hooks';
+import { skipIfApiStrict, startSharedTestServer } from '@mongosh/testing';
 import { expect } from 'chai';
 
 const setDifference = <T>(a: T[], b: T[]) => a.filter((e) => !b.includes(e));
diff --git a/packages/e2e-tests/test/e2e-snippet.spec.ts b/packages/e2e-tests/test/e2e-snippet.spec.ts
@@ -3,7 +3,7 @@ import path from 'path';
 import { expect } from 'chai';
 import type { TestShell } from './test-shell';
 import { useTmpdir } from './repl-helpers';
-import { eventually } from '../../testing/src/eventually';
+import { eventually } from '@mongosh/testing';
 
 describe('snippet integration tests', function () {
   this.timeout(120_000);
diff --git a/packages/e2e-tests/test/e2e-streams.spec.ts b/packages/e2e-tests/test/e2e-streams.spec.ts
@@ -4,7 +4,7 @@ import { MongoClient } from 'mongodb';
 import { expect } from 'chai';
 import type { TestShell } from './test-shell';
 import { sleep } from './util-helpers';
-import { eventually } from '../../testing/src/eventually';
+import { eventually } from '@mongosh/testing';
 
 const {
   STREAMS_E2E_SPI_CONNECTION_STRING = '',
diff --git a/packages/e2e-tests/test/e2e-tls.spec.ts b/packages/e2e-tests/test/e2e-tls.spec.ts
@@ -1,12 +1,14 @@
 import { expect } from 'chai';
 import { promises as fs } from 'fs';
 import path from 'path';
-import { startTestServer } from '../../testing/src/integration-testing-hooks';
+import {
+  getTestCertificatePath as getCertPath,
+  startTestServer,
+} from '@mongosh/testing';
 import {
   useTmpdir,
   setTemporaryHomeDirectory,
   readReplLogFile,
-  getCertPath,
   connectionStringWithLocalhost,
 } from './repl-helpers';
 
diff --git a/packages/e2e-tests/test/e2e.spec.ts b/packages/e2e-tests/test/e2e.spec.ts
@@ -3,13 +3,13 @@ import { expect } from 'chai';
 import type { Db } from 'mongodb';
 import { MongoClient, ObjectId } from 'mongodb';
 
-import { eventually } from '../../testing/src/eventually';
 import { TestShell } from './test-shell';
 import { ensureTestShellAfterHook } from './test-shell-context';
 import {
+  eventually,
   skipIfServerVersion,
   startSharedTestServer,
-} from '../../testing/src/integration-testing-hooks';
+} from '@mongosh/testing';
 import { promises as fs, createReadStream } from 'fs';
 import { promisify } from 'util';
 import path from 'path';
diff --git a/packages/e2e-tests/test/repl-helpers.ts b/packages/e2e-tests/test/repl-helpers.ts
@@ -5,7 +5,7 @@ import rimraf from 'rimraf';
 import * as chai from 'chai';
 import sinonChai from 'sinon-chai';
 import chaiAsPromised from 'chai-as-promised';
-import type { MongodSetup } from '../../testing/src/integration-testing-hooks';
+import type { MongodSetup } from '@mongosh/testing';
 import type { MongoLogEntry } from 'mongodb-log-writer';
 
 chai.use(sinonChai);
@@ -140,10 +140,6 @@ const setTemporaryHomeDirectory = () => {
   return { homedir, env };
 };
 
-function getCertPath(filename: string): string {
-  return path.join(__dirname, '..', '..', 'testing', 'certificates', filename);
-}
-
 // TLS requires matching hostnames, so here we need to explicitly
 // specify `localhost` + IPv4 instead of `127.0.0.1`
 async function connectionStringWithLocalhost(
@@ -166,7 +162,6 @@ export {
   readReplLogFile,
   fakeExternalEditor,
   setTemporaryHomeDirectory,
-  getCertPath,
   connectionStringWithLocalhost,
   MongoLogEntryFromFile,
 };
diff --git a/packages/e2e-tests/test/test-shell.ts b/packages/e2e-tests/test/test-shell.ts
@@ -9,7 +9,7 @@ import { inspect } from 'util';
 import path from 'path';
 import stripAnsi from 'strip-ansi';
 import { EJSON } from 'bson';
-import { eventually } from '../../testing/src/eventually';
+import { eventually } from '@mongosh/testing';
 
 /* eslint-disable mocha/no-exports -- This file export hooks wrapping Mocha's Hooks APIs */
 
