refactor: Split out @deephaven/test-utils package (#2225)

- Split out a `@deephaven/test-utils` dev package to remove `jest` dependencies from `@deephaven/utils` resolves #2185 BREAKING CHANGE: TestUtils has been moved to new package `@deephaven-test-utils`. Consumers will need to install the new package as a dev dependency and update references.
deephaven · Sep 17, 2024 · 1d027d3 · 1d027d3
1 parent bc720d1
commit 1d027d3
Show file tree

Hide file tree

Showing 118 changed files with 265 additions and 128 deletions.
diff --git a/jest.setup.ts b/jest.setup.ts
@@ -4,7 +4,7 @@ import { performance } from 'perf_hooks';
 import 'jest-canvas-mock';
 import './__mocks__/dh-core';
 import Log from '@deephaven/log';
-import { TestUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 
 let logLevel = parseInt(process.env.DH_LOG_LEVEL ?? '', 10);
 if (!Number.isFinite(logLevel)) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -66,6 +66,7 @@
     "@deephaven/prettier-config": "file:../prettier-config",
     "@deephaven/redux": "file:../redux",
     "@deephaven/stylelint-config": "file:../stylelint-config",
+    "@deephaven/test-utils": "file:../test-utils",
     "@deephaven/tsconfig": "file:../tsconfig",
     "@deephaven/utils": "file:../utils",
     "@fortawesome/fontawesome-common-types": "^6.1.1",

diff --git a/packages/app-utils/package.json b/packages/app-utils/package.json
@@ -22,6 +22,7 @@
     "build:babel": "babel ./src --out-dir ./dist --extensions \".ts,.tsx,.js,.jsx\" --source-maps --root-mode upward"
   },
   "devDependencies": {
+    "@deephaven/test-utils": "file:../test-utils",
     "react": "^17.x",
     "react-dom": "^17.x",
     "react-redux": "^7.x",

diff --git a/packages/app-utils/src/components/AppBootstrap.test.tsx b/packages/app-utils/src/components/AppBootstrap.test.tsx
@@ -9,7 +9,7 @@ import type {
   IdeConnection,
   dh as DhType,
 } from '@deephaven/jsapi-types';
-import { TestUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import AppBootstrap from './AppBootstrap';
 
 const { asMock } = TestUtils;

diff --git a/packages/app-utils/tsconfig.json b/packages/app-utils/tsconfig.json
@@ -21,6 +21,7 @@
     { "path": "../plugin" },
     { "path": "../react-hooks" },
     { "path": "../redux" },
+    { "path": "../test-utils" },
     { "path": "../utils" }
   ]
 }
diff --git a/packages/auth-plugins/package.json b/packages/auth-plugins/package.json
@@ -45,6 +45,7 @@
     "js-cookie": "^3.0.5"
   },
   "devDependencies": {
+    "@deephaven/test-utils": "file:../test-utils",
     "@types/react": "^17.0.2"
   },
   "peerDependencies": {

diff --git a/packages/auth-plugins/src/AuthPluginBase.test.tsx b/packages/auth-plugins/src/AuthPluginBase.test.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { act, render, screen } from '@testing-library/react';
 import { ClientContext } from '@deephaven/jsapi-bootstrap';
 import type { CoreClient } from '@deephaven/jsapi-types';
-import { TestUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import AuthPluginBase from './AuthPluginBase';
 
 const mockChildText = 'Mock Auth Base Child';

diff --git a/packages/auth-plugins/src/AuthPluginParent.test.tsx b/packages/auth-plugins/src/AuthPluginParent.test.tsx
@@ -3,7 +3,7 @@ import { act, render, screen } from '@testing-library/react';
 import { ApiContext, ClientContext } from '@deephaven/jsapi-bootstrap';
 import { dh } from '@deephaven/jsapi-shim';
 import type { CoreClient, LoginOptions } from '@deephaven/jsapi-types';
-import { TestUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import AuthPluginParent from './AuthPluginParent';
 import { AuthConfigMap } from './AuthPlugin';
 

diff --git a/packages/auth-plugins/tsconfig.json b/packages/auth-plugins/tsconfig.json
@@ -13,6 +13,7 @@
     { "path": "../jsapi-utils" },
     { "path": "../log" },
     { "path": "../redux" },
+    { "path": "../test-utils" },
     { "path": "../utils" }
   ]
 }
diff --git a/packages/chart/package.json b/packages/chart/package.json
@@ -50,6 +50,7 @@
   "devDependencies": {
     "@deephaven/jsapi-shim": "file:../jsapi-shim",
     "@deephaven/mocks": "file:../mocks",
+    "@deephaven/test-utils": "file:../test-utils",
     "@types/plotly.js": "^2.12.11"
   },
   "files": [

diff --git a/packages/chart/src/ChartModelFactory.test.ts b/packages/chart/src/ChartModelFactory.test.ts
@@ -1,5 +1,5 @@
 import dh from '@deephaven/jsapi-shim';
-import { TestUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import ChartModelFactory from './ChartModelFactory';
 import type { ChartTheme } from './ChartTheme';
 import FigureChartModel from './FigureChartModel';

diff --git a/packages/chart/src/ChartTheme.test.ts b/packages/chart/src/ChartTheme.test.ts
@@ -1,6 +1,6 @@
 /// <reference types="./declaration" />
 
-import { TestUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import { resolveCssVariablesInRecord } from '@deephaven/components';
 import { defaultChartTheme } from './ChartTheme';
 import chartThemeRaw from './ChartTheme.module.scss';

diff --git a/packages/chart/tsconfig.json b/packages/chart/tsconfig.json
@@ -12,6 +12,7 @@
     { "path": "../jsapi-utils" },
     { "path": "../log" },
     { "path": "../react-hooks" },
+    { "path": "../test-utils" },
     { "path": "../utils" }
   ]
 }
diff --git a/packages/code-studio/package.json b/packages/code-studio/package.json
@@ -78,6 +78,7 @@
     "@deephaven/mocks": "file:../mocks",
     "@deephaven/prettier-config": "file:../prettier-config",
     "@deephaven/stylelint-config": "file:../stylelint-config",
+    "@deephaven/test-utils": "file:../test-utils",
     "autoprefixer": "^10.4.8"
   },
   "publishConfig": {

diff --git a/packages/code-studio/src/main/AppMainContainer.test.tsx b/packages/code-studio/src/main/AppMainContainer.test.tsx
@@ -19,7 +19,7 @@ import type {
   IdeSession,
   VariableChanges,
 } from '@deephaven/jsapi-types';
-import { TestUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import { Workspace, createMockStore } from '@deephaven/redux';
 import userEvent from '@testing-library/user-event';
 import { DEFAULT_DASHBOARD_ID } from '@deephaven/dashboard';

diff --git a/packages/code-studio/src/settings/ColumnSpecificSectionContent.test.tsx b/packages/code-studio/src/settings/ColumnSpecificSectionContent.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { Formatter } from '@deephaven/jsapi-utils';
 import { ApiContext } from '@deephaven/jsapi-bootstrap';
 import dh from '@deephaven/jsapi-shim';
-import { TestUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import {
   ColumnSpecificSectionContent,
   ColumnSpecificSectionContentProps,

diff --git a/packages/code-studio/tsconfig.json b/packages/code-studio/tsconfig.json
@@ -32,6 +32,7 @@
     { "path": "../redux" },
     { "path": "../storage" },
     { "path": "../utils" },
-    { "path": "../filters" }
+    { "path": "../filters" },
+    { "path": "../test-utils" }
   ]
 }
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -59,6 +59,7 @@
   },
   "devDependencies": {
     "@deephaven/mocks": "file:../mocks",
+    "@deephaven/test-utils": "file:../test-utils",
     "react-redux": "^7.2.4"
   },
   "files": [

diff --git a/packages/components/src/ErrorBoundary.test.tsx b/packages/components/src/ErrorBoundary.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { render } from '@testing-library/react';
-import { TestUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import ErrorBoundary, { ErrorBoundaryProps } from './ErrorBoundary';
 
 function ThrowComponent(): JSX.Element {

diff --git a/packages/components/src/ItemList.test.tsx b/packages/components/src/ItemList.test.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { Range, TestUtils, ClickOptions } from '@deephaven/utils';
+import { Range } from '@deephaven/utils';
+import { ClickOptions, TestUtils } from '@deephaven/test-utils';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import ItemList from './ItemList';

diff --git a/packages/components/src/spectrum/picker/usePickerItemScale.test.ts b/packages/components/src/spectrum/picker/usePickerItemScale.test.ts
@@ -1,4 +1,4 @@
-import { TestUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import type { ProviderContext } from '@react-types/provider';
 import { renderHook } from '@testing-library/react-hooks';
 import { useSpectrumThemeProvider } from '../../theme';

diff --git a/packages/components/src/spectrum/picker/usePickerScrollOnOpen.test.ts b/packages/components/src/spectrum/picker/usePickerScrollOnOpen.test.ts
@@ -1,5 +1,5 @@
 import { renderHook } from '@testing-library/react-hooks';
-import { TestUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import {
   findSpectrumPickerScrollArea,
   usePopoverOnScrollRef,

diff --git a/packages/components/src/spectrum/utils/useRenderNormalizedItem.test.tsx b/packages/components/src/spectrum/utils/useRenderNormalizedItem.test.tsx
@@ -2,7 +2,7 @@ import React, { Key } from 'react';
 import { Item } from '@adobe/react-spectrum';
 import { renderHook } from '@testing-library/react-hooks';
 import { isElementOfType } from '@deephaven/react-hooks';
-import { TestUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import { ItemContent } from '../ItemContent';
 import { useRenderNormalizedItem } from './useRenderNormalizedItem';
 import { getItemKey, NormalizedItem } from './itemUtils';

diff --git a/packages/components/src/theme/ThemeProvider.test.tsx b/packages/components/src/theme/ThemeProvider.test.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { act, render } from '@testing-library/react';
-import { assertNotNull, TestUtils } from '@deephaven/utils';
+import { assertNotNull } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import { ThemeContextValue, ThemeProvider } from './ThemeProvider';
 import { DEFAULT_LIGHT_THEME_KEY, ThemeData } from './ThemeModel';
 import {

diff --git a/packages/components/src/theme/ThemeUtils.test.ts b/packages/components/src/theme/ThemeUtils.test.ts
@@ -1,7 +1,8 @@
 import fs from 'fs';
 import path from 'path';
 
-import { ColorUtils, TestUtils } from '@deephaven/utils';
+import { ColorUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import {
   DEFAULT_DARK_THEME_KEY,
   DEFAULT_PRELOAD_DATA_VARIABLES,

diff --git a/packages/components/src/theme/useTheme.test.ts b/packages/components/src/theme/useTheme.test.ts
@@ -1,6 +1,6 @@
 import { useContext } from 'react';
 import { renderHook } from '@testing-library/react-hooks';
-import { TestUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import { useTheme } from './useTheme';
 
 const { asMock } = TestUtils;

diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json
@@ -9,6 +9,7 @@
   "references": [
     { "path": "../log" },
     { "path": "../react-hooks" },
+    { "path": "../test-utils" },
     { "path": "../utils" }
   ]
 }
diff --git a/packages/console/package.json b/packages/console/package.json
@@ -52,7 +52,8 @@
   },
   "devDependencies": {
     "@deephaven/jsapi-shim": "file:../jsapi-shim",
-    "@deephaven/mocks": "file:../mocks"
+    "@deephaven/mocks": "file:../mocks",
+    "@deephaven/test-utils": "file:../test-utils"
   },
   "files": [
     "dist"

diff --git a/packages/console/src/ConsoleStatusBar.test.tsx b/packages/console/src/ConsoleStatusBar.test.tsx
@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/react';
 import dh from '@deephaven/jsapi-shim';
 import { ContextActions, DropdownActions } from '@deephaven/components';
 import { vsCheck } from '@deephaven/icons';
-import { TestUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import userEvent from '@testing-library/user-event';
 import ConsoleStatusBar from './ConsoleStatusBar';
 

diff --git a/packages/console/src/command-history/CommandHistoryActions.test.tsx b/packages/console/src/command-history/CommandHistoryActions.test.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { TestUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import CommandHistoryActions from './CommandHistoryActions';
 
 const { asMock } = TestUtils;