Skip to content

Commit

Permalink
[test] Deprecate test-utils (#24099)
Browse files Browse the repository at this point in the history
  • Loading branch information
eps1lon authored Dec 22, 2020
1 parent ff6462b commit 5cd26a9
Show file tree
Hide file tree
Showing 180 changed files with 957 additions and 304 deletions.
6 changes: 1 addition & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
},
],
'nonblock-statement-body-position': 'error',
Expand Down
2 changes: 1 addition & 1 deletion packages/material-ui-codemod/src/v4.0.0/optimal-imports.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)/.test(subpath)) return;
const targetImportPath = `${targetModule}/${subpath}`;

const whitelist = getJSExports(
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/Alert/Alert.test.js
Original file line number Diff line number Diff line change
@@ -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 Alert from './Alert';
import Paper from '@material-ui/core/Paper';

Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/AlertTitle/AlertTitle.test.js
Original file line number Diff line number Diff line change
@@ -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 />', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 consoleErrorMock, { consoleWarnMock } from 'test/utils/consoleErrorMock';
import { spy } from 'sinon';
import { act, createClientRender, fireEvent, screen } from 'test/utils/createClientRender';
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/AvatarGroup/AvatarGroup.test.js
Original file line number Diff line number Diff line change
@@ -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 AvatarGroup from './AvatarGroup';
import { Avatar } from '@material-ui/core';
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/Pagination/Pagination.test.js
Original file line number Diff line number Diff line change
@@ -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 Pagination from './Pagination';
import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/Rating/Rating.test.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/Skeleton/Skeleton.test.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
8 changes: 2 additions & 6 deletions packages/material-ui-lab/src/SpeedDial/SpeedDial.test.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
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 { 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 SpeedDialAction from './SpeedDialAction';
import describeConformance from '@material-ui/core/test-utils/describeConformance';
import describeConformance from 'test/utils/describeConformance';

describe('<SpeedDialAction />', () => {
// StrictModeViolation: uses Tooltip
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
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 SpeedDialIcon from './SpeedDialIcon';
import describeConformance from '@material-ui/core/test-utils/describeConformance';
import describeConformance from 'test/utils/describeConformance';

describe('<SpeedDialIcon />', () => {
const mount = createMount();
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/TabList/TabList.test.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,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';
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/TabPanel/TabPanel.test.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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';

Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/Timeline/Timeline.test.js
Original file line number Diff line number Diff line change
@@ -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 />', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 />', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 TimelineContent from './TimelineContent';

describe('<TimelineContent />', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/TimelineDot/TimelineDot.test.js
Original file line number Diff line number Diff line change
@@ -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 />', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 />', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 TimelineOppositeContent from './TimelineOppositeContent';

describe('<TimelineOppositeContent />', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 />', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/TreeItem/TreeItem.test.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/TreeView/TreeView.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
import { createClientRender, fireEvent, screen } from 'test/utils/createClientRender';
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 consoleErrorMock from 'test/utils/consoleErrorMock';
import TreeView from './TreeView';
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui/src/Accordion/Accordion.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ 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 { getClasses, findOutermostIntrinsic } from 'test/utils';
import createMount from 'test/utils/createMount';
import describeConformance from '../test-utils/describeConformance';
import describeConformance from 'test/utils/describeConformance';
import consoleErrorMock from 'test/utils/consoleErrorMock';
import Paper from '../Paper';
import Accordion from './Accordion';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
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 />', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 />', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 '../test-utils/describeConformance';
import describeConformance from 'test/utils/describeConformance';
import { createClientRender, fireEvent } from 'test/utils/createClientRender';
import Accordion from '../Accordion';
import AccordionSummary from './AccordionSummary';
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui/src/AppBar/AppBar.test.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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 '../test-utils/describeConformance';
import describeConformance from 'test/utils/describeConformance';
import AppBar from './AppBar';
import Paper from '../Paper';

Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui/src/Avatar/Avatar.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import * as React from 'react';
import { expect } from 'chai';
import * as PropTypes from 'prop-types';
import { createClientRender, fireEvent } from 'test/utils/createClientRender';
import { getClasses } from '@material-ui/core/test-utils';
import { getClasses } from 'test/utils';
import createMount from 'test/utils/createMount';
import { spy, stub } from 'sinon';
import CancelIcon from '../internal/svg-icons/Cancel';
import describeConformance from '../test-utils/describeConformance';
import describeConformance from 'test/utils/describeConformance';
import Avatar from './Avatar';

describe('<Avatar />', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui/src/Backdrop/Backdrop.test.js
Original file line number Diff line number Diff line change
@@ -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 '../test-utils/describeConformance';
import describeConformance from 'test/utils/describeConformance';
import Backdrop from './Backdrop';
import Fade from '../Fade';

Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui/src/Badge/Badge.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import * as React from 'react';
import * as PropTypes from 'prop-types';
import { expect } from 'chai';
import { stub } from 'sinon';
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 '../test-utils/describeConformance';
import describeConformance from 'test/utils/describeConformance';
import Badge from './Badge';

function findBadge(container) {
Expand Down
Loading

0 comments on commit 5cd26a9

Please sign in to comment.