[core] Remove /test-utils (#21855)

mui · Jul 20, 2020 · 44db8ee · 44db8ee
1 parent 7fcb995
commit 44db8ee
Show file tree

Hide file tree

Showing 173 changed files with 321 additions and 507 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -44,11 +44,7 @@ module.exports = {
     'no-restricted-imports': [
       'error',
       {
-        patterns: [
-          '@material-ui/*/*/*',
-          '!@material-ui/core/test-utils/*',
-          '!@material-ui/utils/macros/*.macro',
-        ],
+        patterns: ['@material-ui/*/*/*', '!@material-ui/utils/macros/*.macro'],
       },
     ],
     'no-constant-condition': 'error',
@@ -87,7 +83,6 @@ module.exports = {
   overrides: [
     {
       files: [
-        '**/test-utils/**/*.js',
         // matching the pattern of the test runner
         '*.test.js',
       ],
@@ -98,19 +93,6 @@ module.exports = {
       rules: {
         // does not work with wildcard imports. Mistakes will throw at runtime anyway
         'import/named': 'off',
-        'no-restricted-imports': [
-          'error',
-          {
-            paths: [
-              {
-                name: '@material-ui/core/test-utils',
-                importNames: ['createMount'],
-                message:
-                  "Please use `import createMount from 'test/utils/createMount'` instead. `createMount` from /core has cleanup issues that require breaking changes.",
-              },
-            ],
-          },
-        ],
 
         'material-ui/disallow-active-element-as-key-event-target': 'error',
 
@@ -176,11 +158,7 @@ module.exports = {
         'no-restricted-imports': [
           'error',
           {
-            patterns: [
-              '@material-ui/*/*/*/*',
-              '!@material-ui/core/test-utils/*',
-              '!@material-ui/utils/macros/*.macro',
-            ],
+            patterns: ['@material-ui/*/*/*/*', '!@material-ui/utils/macros/*.macro'],
           },
         ], // Allow deeper imports for TypeScript types. TODO?
         'react/prop-types': 'off',

diff --git a/packages/material-ui-codemod/src/v4.0.0/optimal-imports.js b/packages/material-ui-codemod/src/v4.0.0/optimal-imports.js
@@ -38,7 +38,7 @@ export default function transformer(fileInfo, api, options) {
 
     const subpath = match[1].replace(/\/$/, '');
 
-    if (/^(internal|test-utils)/.test(subpath)) return;
+    if (/^(internal)/.test(subpath)) return;
     const targetImportPath = `${targetModule}/${subpath}`;
 
     const whitelist = getJSExports(

diff --git a/packages/material-ui-codemod/src/v4.0.0/optimal-imports.test/actual.js b/packages/material-ui-codemod/src/v4.0.0/optimal-imports.test/actual.js
@@ -64,4 +64,3 @@ import ListSubheader from '@material-ui/core/ListSubheader';
 import TableContext from '@material-ui/core/Table/TableContext';
 import TabScrollButton from '@material-ui/core/Tabs/TabScrollButton';
 import SwitchBase from '@material-ui/core/internal/SwitchBase';
-import createMount from '@material-ui/core/test-utils/createMount';
diff --git a/packages/material-ui-codemod/src/v4.0.0/optimal-imports.test/expected.js b/packages/material-ui-codemod/src/v4.0.0/optimal-imports.test/expected.js
@@ -62,4 +62,3 @@ import ListSubheader from '@material-ui/core/ListSubheader';
 import TableContext from '@material-ui/core/Table/TableContext';
 import TabScrollButton from '@material-ui/core/Tabs/TabScrollButton';
 import SwitchBase from '@material-ui/core/internal/SwitchBase';
-import createMount from '@material-ui/core/test-utils/createMount';
diff --git a/packages/material-ui-lab/src/Alert/Alert.test.js b/packages/material-ui-lab/src/Alert/Alert.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import Paper from '@material-ui/core/Paper';
 import Alert from './Alert';
 

diff --git a/packages/material-ui-lab/src/AlertTitle/AlertTitle.test.js b/packages/material-ui-lab/src/AlertTitle/AlertTitle.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import AlertTitle from './AlertTitle';
 
 describe('<AlertTitle />', () => {

diff --git a/packages/material-ui-lab/src/Autocomplete/Autocomplete.test.js b/packages/material-ui-lab/src/Autocomplete/Autocomplete.test.js
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import { spy } from 'sinon';
 import { act, createClientRender, fireEvent, screen } from 'test/utils/createClientRender';
 import TextField from '@material-ui/core/TextField';

diff --git a/packages/material-ui-lab/src/AvatarGroup/AvatarGroup.test.js b/packages/material-ui-lab/src/AvatarGroup/AvatarGroup.test.js
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import { createClientRender } from 'test/utils/createClientRender';
 import Avatar from '@material-ui/core/Avatar';
 import AvatarGroup from './AvatarGroup';

diff --git a/packages/material-ui-lab/src/LoadingButton/LoadingButton.test.js b/packages/material-ui-lab/src/LoadingButton/LoadingButton.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import Button from '@material-ui/core/Button';
 import LoadingButton from './LoadingButton';
 

diff --git a/packages/material-ui-lab/src/Pagination/Pagination.test.js b/packages/material-ui-lab/src/Pagination/Pagination.test.js
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import { createClientRender } from 'test/utils/createClientRender';
 import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles';
 import Pagination from './Pagination';

diff --git a/packages/material-ui-lab/src/PaginationItem/PaginationItem.test.js b/packages/material-ui-lab/src/PaginationItem/PaginationItem.test.js
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import { createClientRender } from 'test/utils/createClientRender';
 import PaginationItem from './PaginationItem';
 

diff --git a/packages/material-ui-lab/src/Rating/Rating.test.js b/packages/material-ui-lab/src/Rating/Rating.test.js
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { stub, spy } from 'sinon';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import { createClientRender, fireEvent } from 'test/utils/createClientRender';
 import Rating from './Rating';
 

diff --git a/packages/material-ui-lab/src/Skeleton/Skeleton.test.js b/packages/material-ui-lab/src/Skeleton/Skeleton.test.js
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import { createClientRender } from 'test/utils/createClientRender';
 import Skeleton from './Skeleton';
 

diff --git a/packages/material-ui-lab/src/SpeedDial/SpeedDial.test.js b/packages/material-ui-lab/src/SpeedDial/SpeedDial.test.js
@@ -1,13 +1,9 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import {
-  findOutermostIntrinsic,
-  getClasses,
-  wrapsIntrinsicElement,
-} from '@material-ui/core/test-utils';
+import { findOutermostIntrinsic, getClasses, wrapsIntrinsicElement } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import Icon from '@material-ui/core/Icon';
 import Fab from '@material-ui/core/Fab';
 import SpeedDial from './SpeedDial';

diff --git a/packages/material-ui-lab/src/SpeedDialAction/SpeedDialAction.test.js b/packages/material-ui-lab/src/SpeedDialAction/SpeedDialAction.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import { useFakeTimers } from 'sinon';
 import createMount from 'test/utils/createMount';
 import { act, createClientRender, fireEvent } from 'test/utils/createClientRender';
 import Icon from '@material-ui/core/Icon';
 import Tooltip from '@material-ui/core/Tooltip';
 import Fab from '@material-ui/core/Fab';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import SpeedDialAction from './SpeedDialAction';
 
 describe('<SpeedDialAction />', () => {

diff --git a/packages/material-ui-lab/src/SpeedDialIcon/SpeedDialIcon.test.js b/packages/material-ui-lab/src/SpeedDialIcon/SpeedDialIcon.test.js
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { getClasses, findOutermostIntrinsic } from '@material-ui/core/test-utils';
+import { getClasses, findOutermostIntrinsic } from 'test/utils';
 import createMount from 'test/utils/createMount';
 import Icon from '@material-ui/core/Icon';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import SpeedDialIcon from './SpeedDialIcon';
 
 describe('<SpeedDialIcon />', () => {

diff --git a/packages/material-ui-lab/src/TabList/TabList.test.js b/packages/material-ui-lab/src/TabList/TabList.test.js
@@ -2,9 +2,9 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { createClientRender } from 'test/utils/createClientRender';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import Tab from '@material-ui/core/Tab';
 import Tabs from '@material-ui/core/Tabs';
 import TabList from './TabList';

diff --git a/packages/material-ui-lab/src/TabPanel/TabPanel.test.js b/packages/material-ui-lab/src/TabPanel/TabPanel.test.js
@@ -1,10 +1,10 @@
 // @ts-check
 import * as React from 'react';
 import { expect } from 'chai';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
 import { createClientRender } from 'test/utils/createClientRender';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import TabPanel from './TabPanel';
 import TabContext from '../TabContext';
 

diff --git a/packages/material-ui-lab/src/Timeline/Timeline.test.js b/packages/material-ui-lab/src/Timeline/Timeline.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import Timeline from './Timeline';
 
 describe('<Timeline />', () => {

diff --git a/packages/material-ui-lab/src/TimelineConnector/TimelineConnector.test.js b/packages/material-ui-lab/src/TimelineConnector/TimelineConnector.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import TimelineConnector from './TimelineConnector';
 
 describe('<TimelineConnector />', () => {

diff --git a/packages/material-ui-lab/src/TimelineContent/TimelineContent.test.js b/packages/material-ui-lab/src/TimelineContent/TimelineContent.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import Typography from '@material-ui/core/Typography';
 import TimelineContent from './TimelineContent';
 

diff --git a/packages/material-ui-lab/src/TimelineDot/TimelineDot.test.js b/packages/material-ui-lab/src/TimelineDot/TimelineDot.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import TimelineDot from './TimelineDot';
 
 describe('<TimelineDot />', () => {

diff --git a/packages/material-ui-lab/src/TimelineItem/TimelineItem.test.js b/packages/material-ui-lab/src/TimelineItem/TimelineItem.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import TimelineItem from './TimelineItem';
 
 describe('<TimelineItem />', () => {

diff --git a/packages/material-ui-lab/src/TimelineOppositeContent/TimelineOppositeContent.test.js b/packages/material-ui-lab/src/TimelineOppositeContent/TimelineOppositeContent.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import Typography from '@material-ui/core/Typography';
 import TimelineOppositeContent from './TimelineOppositeContent';
 

diff --git a/packages/material-ui-lab/src/TimelineSeparator/TimelineSeparator.test.js b/packages/material-ui-lab/src/TimelineSeparator/TimelineSeparator.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import TimelineSeparator from './TimelineSeparator';
 
 describe('<TimelineSeparator />', () => {

diff --git a/packages/material-ui-lab/src/ToggleButton/ToggleButton.test.js b/packages/material-ui-lab/src/ToggleButton/ToggleButton.test.js
@@ -3,9 +3,9 @@ import { expect } from 'chai';
 import { spy } from 'sinon';
 import { createClientRender } from 'test/utils/createClientRender';
 import createServerRender from 'test/utils/createServerRender';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import ButtonBase from '@material-ui/core/ButtonBase';
 import ToggleButton from './ToggleButton';
 

diff --git a/packages/material-ui-lab/src/ToggleButtonGroup/ToggleButtonGroup.test.js b/packages/material-ui-lab/src/ToggleButtonGroup/ToggleButtonGroup.test.js
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import { createClientRender } from 'test/utils/createClientRender';
 import ToggleButtonGroup from './ToggleButtonGroup';
 import ToggleButton from '../ToggleButton';

diff --git a/packages/material-ui-lab/src/TreeItem/TreeItem.test.js b/packages/material-ui-lab/src/TreeItem/TreeItem.test.js
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { getClasses } from '@material-ui/core/test-utils';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import {
   act,
   createEvent,

diff --git a/packages/material-ui-lab/src/TreeView/TreeView.test.js b/packages/material-ui-lab/src/TreeView/TreeView.test.js
@@ -3,8 +3,8 @@ import { expect } from 'chai';
 import { spy } from 'sinon';
 import { createClientRender, fireEvent, screen } from 'test/utils/createClientRender';
 import { ErrorBoundary } from 'test/utils/components';
-import describeConformance from '@material-ui/core/test-utils/describeConformance';
-import { getClasses } from '@material-ui/core/test-utils';
+import describeConformance from 'test/utils/describeConformance';
+import { getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
 import TreeView from './TreeView';
 import TreeItem from '../TreeItem';

diff --git a/packages/material-ui/src/Accordion/Accordion.test.js b/packages/material-ui/src/Accordion/Accordion.test.js
@@ -2,9 +2,7 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { getClasses, findOutermostIntrinsic } from '@material-ui/core/test-utils';
-import createMount from 'test/utils/createMount';
-import describeConformance from '../test-utils/describeConformance';
+import { createMount, describeConformance, getClasses, findOutermostIntrinsic } from 'test/utils';
 import Paper from '../Paper';
 import Accordion from './Accordion';
 import AccordionSummary from '../AccordionSummary';

diff --git a/packages/material-ui/src/AccordionActions/AccordionActions.test.js b/packages/material-ui/src/AccordionActions/AccordionActions.test.js
@@ -1,7 +1,6 @@
 import * as React from 'react';
-import { getClasses } from '@material-ui/core/test-utils';
-import createMount from 'test/utils/createMount';
-import describeConformance from '../test-utils/describeConformance';
+import { getClasses, createMount, describeConformance } from 'test/utils';
+
 import AccordionActions from './AccordionActions';
 
 describe('<AccordionActions />', () => {

diff --git a/packages/material-ui/src/AccordionDetails/AccordionDetails.test.js b/packages/material-ui/src/AccordionDetails/AccordionDetails.test.js
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createShallow, getClasses } from '@material-ui/core/test-utils';
+import { createShallow, getClasses } from 'test/utils';
 import createMount from 'test/utils/createMount';
-import describeConformance from '../test-utils/describeConformance';
+import describeConformance from 'test/utils/describeConformance';
 import AccordionDetails from './AccordionDetails';
 
 describe('<AccordionDetails />', () => {