chore: sanity check: import directly

gagik · gagik · commit 486e1013e347 · 2025-12-03T14:30:30.000+01:00
diff --git a/packages/browser-repl/src/components/editor.spec.tsx b/packages/browser-repl/src/components/editor.spec.tsx
@@ -1,8 +1,8 @@
 import sinon from 'sinon';
-import { expect } from '../../testing/chai';
+import { expect } from '../../testing/src/chai';
 import { Editor, createCommands } from './editor';
 import type { Command } from '@mongodb-js/compass-editor';
-import { shallow } from '../../testing/enzyme';
+import { shallow } from '../../testing/src/enzyme';
 import React from 'react';
 
 describe('<Editor />', function () {
diff --git a/packages/browser-repl/src/components/shell-input.spec.tsx b/packages/browser-repl/src/components/shell-input.spec.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import sinon from 'sinon';
-import { expect } from '../../testing/chai';
-import { shallow, mount } from '../../testing/enzyme';
+import { expect } from '../../testing/src/chai';
+import { shallow, mount } from '../../testing/src/enzyme';
 
 import { ShellInput } from './shell-input';
 import { Editor } from './editor';
diff --git a/packages/browser-repl/src/components/shell-output-line.spec.tsx b/packages/browser-repl/src/components/shell-output-line.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { expect } from '../../testing/chai';
-import { shallow, mount } from '../../testing/enzyme';
+import { expect } from '../../testing/src/chai';
+import { shallow, mount } from '../../testing/src/enzyme';
 
 import { ShellOutputLine } from './shell-output-line';
 import { HelpOutput } from './types/help-output';
diff --git a/packages/browser-repl/src/components/shell-output.spec.tsx b/packages/browser-repl/src/components/shell-output.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { expect } from '../../testing/chai';
-import { shallow } from '../../testing/enzyme';
+import { expect } from '../../testing/src/chai';
+import { shallow } from '../../testing/src/enzyme';
 
 import type { ShellOutputEntry } from './shell-output-line';
 import { ShellOutputLine } from './shell-output-line';
diff --git a/packages/browser-repl/src/components/shell.spec.tsx b/packages/browser-repl/src/components/shell.spec.tsx
@@ -3,7 +3,7 @@ import React, { useState, useEffect } from 'react';
 import sinon from 'sinon';
 import { render, screen, waitFor, configure } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { expect } from '../../testing/chai';
+import { expect } from '../../testing/src/chai';
 
 import { Shell } from './shell';
 import type { ShellOutputEntry } from './shell-output-line';
diff --git a/packages/browser-repl/src/components/types/cursor-iteration-result-output.spec.tsx b/packages/browser-repl/src/components/types/cursor-iteration-result-output.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { expect } from '../../../testing/chai';
-import { shallow } from '../../../testing/enzyme';
+import { expect } from '../../testing/src/chai';
+import { shallow } from '../../testing/src/enzyme';
 
 import { CursorIterationResultOutput } from './cursor-iteration-result-output';
 import { ObjectOutput } from './object-output';
diff --git a/packages/browser-repl/src/components/types/cursor-output.spec.tsx b/packages/browser-repl/src/components/types/cursor-output.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { expect } from '../../../testing/chai';
-import { shallow, mount } from '../../../testing/enzyme';
+import { expect } from '../../testing/src/chai';
+import { shallow, mount } from '../../testing/src/enzyme';
 
 import { CursorOutput } from './cursor-output';
 import { CursorIterationResultOutput } from './cursor-iteration-result-output';
diff --git a/packages/browser-repl/src/components/types/error-output.spec.tsx b/packages/browser-repl/src/components/types/error-output.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { expect } from '../../../testing/chai';
-import { render, mount } from '../../../testing/enzyme';
+import { expect } from '../../testing/src/chai';
+import { render, mount } from '../../testing/src/enzyme';
 
 import { ErrorOutput } from './error-output';
 
diff --git a/packages/browser-repl/src/components/types/help-output.spec.tsx b/packages/browser-repl/src/components/types/help-output.spec.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { expect } from '../../../testing/chai';
-import type { ShallowWrapper } from '../../../testing/enzyme';
-import { shallow } from '../../../testing/enzyme';
+import { expect } from '../../testing/src/chai';
+import type { ShallowWrapper } from '../../testing/src/enzyme';
+import { shallow } from '../../testing/src/enzyme';
 
 import { HelpOutput } from './help-output';
 
diff --git a/packages/browser-repl/src/components/types/show-collections-output.spec.tsx b/packages/browser-repl/src/components/types/show-collections-output.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { expect } from '../../../testing/chai';
-import { shallow } from '../../../testing/enzyme';
+import { expect } from '../../testing/src/chai';
+import { shallow } from '../../testing/src/enzyme';
 
 import { ShowCollectionsOutput } from './show-collections-output';
 
diff --git a/packages/browser-repl/src/components/types/show-dbs-output.spec.tsx b/packages/browser-repl/src/components/types/show-dbs-output.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { expect } from '../../../testing/chai';
-import { shallow } from '../../../testing/enzyme';
+import { expect } from '../../testing/src/chai';
+import { shallow } from '../../testing/src/enzyme';
 
 import { ShowDbsOutput } from './show-dbs-output';
 
diff --git a/packages/browser-repl/src/components/utils/expandable.spec.tsx b/packages/browser-repl/src/components/utils/expandable.spec.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import sinon from 'sinon';
 import { Icon } from '@mongodb-js/compass-components';
-import { expect } from '../../../testing/chai';
-import { mount } from '../../../testing/enzyme';
+import { expect } from '../../testing/src/chai';
+import { mount } from '../../testing/src/enzyme';
 import { Expandable } from './expandable';
 
 describe('<Expandable />', function () {
diff --git a/packages/browser-repl/src/components/utils/line-with-icon.spec.tsx b/packages/browser-repl/src/components/utils/line-with-icon.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { expect } from '../../../testing/chai';
-import { shallow } from '../../../testing/enzyme';
+import { expect } from '../../testing/src/chai';
+import { shallow } from '../../testing/src/enzyme';
 import { LineWithIcon } from './line-with-icon';
 
 describe('<LineWithIcon />', function () {
diff --git a/packages/browser-repl/src/components/utils/syntax-highlight.spec.tsx b/packages/browser-repl/src/components/utils/syntax-highlight.spec.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { CodemirrorInlineEditor } from '@mongodb-js/compass-editor';
-import { expect } from '../../../testing/chai';
-import { mount } from '../../../testing/enzyme';
+import { expect } from '../../testing/src/chai';
+import { mount } from '../../testing/src/enzyme';
 import { SyntaxHighlight } from './syntax-highlight';
 
 describe('<SyntaxHighlight />', function () {
diff --git a/packages/browser-repl/src/iframe-runtime/iframe-runtime.spec.ts b/packages/browser-repl/src/iframe-runtime/iframe-runtime.spec.ts
@@ -1,5 +1,5 @@
 import { IframeRuntime } from './iframe-runtime';
-import { expect } from '../../testing/chai';
+import { expect } from '../../testing/src/chai';
 import type { ServiceProvider } from '@mongosh/service-provider-core';
 import * as bson from 'bson';
 
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/e2e-tests",
-  "version": "3.16.7",
+  "version": "3.17.0",
   "private": true,
   "description": "MongoDB Shell E2E Tests Package",
   "homepage": "https://github.com/mongodb-js/mongosh",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@mongosh/cli-repl": "2.5.10",
-    "@mongosh/service-provider-core": "3.6.5",
+    "@mongosh/service-provider-core": "3.7.0",
     "@mongodb-js/oidc-plugin": "^2.0.5",
     "strip-ansi": "^6.0.0"
   },
@@ -50,7 +50,6 @@
     "mongodb": "^6.19.0",
     "node-fetch": "^3.3.2",
     "prettier": "^2.8.8",
-    "rimraf": "^3.0.2",
-    "@mongosh/testing": "0.0.0-dev.0"
+    "rimraf": "^3.0.2"
   }
 }
diff --git a/packages/e2e-tests/test/e2e-analytics.spec.ts b/packages/e2e-tests/test/e2e-analytics.spec.ts
@@ -1,5 +1,6 @@
 import { expect } from 'chai';
-import { startTestCluster, eventually } from '@mongosh/testing';
+import { startTestCluster } from '../../testing/src/integration-testing-hooks';
+import { eventually } from '../../testing/src/eventually';
 
 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 '@mongosh/testing';
-import type { TestShell } from './test-shell';
+} from '../../testing/src/integration-testing-hooks';
 
 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,4 +1,7 @@
-import { skipIfApiStrict, startSharedTestServer } from '@mongosh/testing';
+import {
+  skipIfApiStrict,
+  startSharedTestServer,
+} from '../../testing/src/integration-testing-hooks';
 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 '@mongosh/testing';
+import { startSharedTestServer } from '../../testing/src/integration-testing-hooks';
 
 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
@@ -2,8 +2,8 @@ import {
   startTestCluster,
   skipIfServerVersion,
   skipIfApiStrict,
-  eventually,
-} from '@mongosh/testing';
+} from '../../testing/src/integration-testing-hooks';
+import { eventually } from '../../testing/src/eventually';
 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 '@mongosh/testing';
+import { eventually } from '../../testing/src/eventually';
 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,17 +1,19 @@
 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';
+import {
   makeFakeHTTPServer,
   fakeAWSHandlers,
-} from '@mongosh/testing';
+} from '../../testing/src/fake-kms';
 import { once } from 'events';
 import { serialize } from 'v8';
 import { inspect } from 'util';
@@ -30,6 +32,8 @@ describe('FLE tests', function () {
   let cryptLibrary82: string;
 
   before(async function () {
+    this.timeout(120_000); // Downloading the crypt-shared library can take some time
+
     if (process.platform === 'linux') {
       const [major, minor] = (process.report as any)
         .getReport()
diff --git a/packages/e2e-tests/test/e2e-oidc.spec.ts b/packages/e2e-tests/test/e2e-oidc.spec.ts
@@ -2,16 +2,15 @@ import {
   MongoRunnerSetup,
   skipIfApiStrict,
   skipIfEnvServerVersion,
-  getTestCertificatePath,
-} from '@mongosh/testing';
+} from '../../testing/src/integration-testing-hooks';
 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 { readReplLogFile, useTmpdir } from './repl-helpers';
+import { getCertPath, readReplLogFile, useTmpdir } from './repl-helpers';
 import {
   baseOidcServerConfig,
   commonOidcServerArgs,
@@ -68,7 +67,7 @@ describe('OIDC auth e2e', function () {
       },
     };
     const httpsServerKeyCertBundle = await fs.readFile(
-      getTestCertificatePath('server.bundle.pem')
+      getCertPath('server.bundle.pem')
     );
     [oidcMockProvider, oidcMockProviderHttps] = await Promise.all([
       OIDCMockProvider.create(oidcMockProviderConfig),
@@ -412,7 +411,7 @@ describe('OIDC auth e2e', function () {
   it('can specify --tlsUseSystemCA as a no-op', async function () {
     await fs.mkdir(path.join(tmpdir.path, 'certs'), { recursive: true });
     await fs.copyFile(
-      getTestCertificatePath('ca.crt'),
+      getCertPath('ca.crt'),
       path.join(tmpdir.path, 'certs', 'somefilename.crt')
     );
 
@@ -442,7 +441,7 @@ describe('OIDC auth e2e', function () {
   it('uses system ca by default when calling the IdP https endpoint', async function () {
     await fs.mkdir(path.join(tmpdir.path, 'certs'), { recursive: true });
     await fs.copyFile(
-      getTestCertificatePath('ca.crt'),
+      getCertPath('ca.crt'),
       path.join(tmpdir.path, 'certs', 'somefilename.crt')
     );
 
diff --git a/packages/e2e-tests/test/e2e-proxy.spec.ts b/packages/e2e-tests/test/e2e-proxy.spec.ts
@@ -10,11 +10,14 @@ import {
   skipIfEnvServerVersion,
   startSharedTestServer,
   startTestServer,
-  getTestCertificatePath,
-} from '@mongosh/testing';
+} from '../../testing/src/integration-testing-hooks';
 import type { Server as HTTPSServer } from 'https';
 import { createServer as createHTTPSServer } from 'https';
-import { connectionStringWithLocalhost, useTmpdir } from './repl-helpers';
+import {
+  connectionStringWithLocalhost,
+  getCertPath,
+  useTmpdir,
+} from './repl-helpers';
 import { once } from 'events';
 import { connect } from 'net';
 import type { AddressInfo, Socket } from 'net';
@@ -29,8 +32,8 @@ import {
   skipOIDCTestsDueToPlatformOrServerVersion,
 } from './oidc-helpers';
 
-const CA_CERT = getTestCertificatePath('ca.crt');
-const SERVER_BUNDLE = getTestCertificatePath('server.bundle.pem');
+const CA_CERT = getCertPath('ca.crt');
+const SERVER_BUNDLE = getCertPath('server.bundle.pem');
 
 describe('e2e proxy support', function () {
   skipIfApiStrict();
diff --git a/packages/e2e-tests/test/e2e-snapshot.spec.ts b/packages/e2e-tests/test/e2e-snapshot.spec.ts
@@ -1,4 +1,7 @@
-import { skipIfApiStrict, startSharedTestServer } from '@mongosh/testing';
+import {
+  skipIfApiStrict,
+  startSharedTestServer,
+} from '../../testing/src/integration-testing-hooks';
 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 '@mongosh/testing';
+import { eventually } from '../../testing/src/eventually';
 
 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 '@mongosh/testing';
+import { eventually } from '../../testing/src/eventually';
 
 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
diff --git a/packages/e2e-tests/test/e2e.spec.ts b/packages/e2e-tests/test/e2e.spec.ts
diff --git a/packages/e2e-tests/test/repl-helpers.ts b/packages/e2e-tests/test/repl-helpers.ts
diff --git a/packages/e2e-tests/test/test-shell.ts b/packages/e2e-tests/test/test-shell.ts
