Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tests] Replace legacy describeConformance with describeConformanceV5 #27817

Merged
merged 4 commits into from
Aug 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { expect } from 'chai';
import { SinonFakeTimers, useFakeTimers } from 'sinon';
import { fireEvent, screen, describeConformanceV5 } from 'test/utils';
import { fireEvent, screen, describeConformance } from 'test/utils';
import CalendarPicker, { calendarPickerClasses as classes } from '@material-ui/lab/CalendarPicker';
import {
adapterToUse,
Expand All @@ -21,7 +21,7 @@ describe('<CalendarPicker />', () => {

const render = createPickerRender();

describeConformanceV5(<CalendarPicker date={adapterToUse.date()} onChange={() => {}} />, () => ({
describeConformance(<CalendarPicker date={adapterToUse.date()} onChange={() => {}} />, () => ({
classes,
inheritComponent: 'div',
render,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import * as React from 'react';
import { createClientRender, describeConformanceV5 } from 'test/utils';
import { createClientRender, describeConformance } from 'test/utils';
import CalendarPickerSkeleton, {
calendarPickerSkeletonClasses as classes,
} from '@material-ui/lab/CalendarPickerSkeleton';

describe('<CalendarPickerSkeleton />', () => {
const render = createClientRender();

describeConformanceV5(<CalendarPickerSkeleton />, () => ({
describeConformance(<CalendarPickerSkeleton />, () => ({
classes,
inheritComponent: 'div',
render,
Expand Down
10 changes: 2 additions & 8 deletions packages/material-ui-lab/src/ClockPicker/ClockPicker.test.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
import {
describeConformanceV5,
fireEvent,
fireTouchChangedEvent,
screen,
within,
} from 'test/utils';
import { describeConformance, fireEvent, fireTouchChangedEvent, screen, within } from 'test/utils';
import ClockPicker, { clockPickerClasses as classes } from '@material-ui/lab/ClockPicker';
import {
adapterToUse,
Expand All @@ -19,7 +13,7 @@ import {
describe('<ClockPicker />', () => {
const render = createPickerRender();

describeConformanceV5(
describeConformance(
<ClockPicker date={adapterToUse.date()} showViewSwitcher onChange={() => {}} />,
() => ({
classes,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,20 @@ describe('<DateRangePicker />', () => {
/>,
() => ({
classes: {},
muiName: 'MuiDateRangePicker',
wrapMount: wrapPickerMount,
refInstanceof: window.HTMLDivElement,
skip: ['componentProp', 'mergeClassName', 'propsSpread', 'rootClass', 'reactTestRenderer'],
skip: [
'componentProp',
'componentsProp',
'themeDefaultProps',
'themeStyleOverrides',
'themeVariants',
'mergeClassName',
'propsSpread',
'rootClass',
'reactTestRenderer',
],
}),
);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { describeConformanceV5 } from 'test/utils';
import { describeConformance } from 'test/utils';
import DateRangePickerDay, {
dateRangePickerDayClasses as classes,
} from '@material-ui/lab/DateRangePickerDay';
Expand All @@ -8,7 +8,7 @@ import { adapterToUse, wrapPickerMount, createPickerRender } from '../internal/p
describe('<DateRangePickerDay />', () => {
const render = createPickerRender();

describeConformanceV5(
describeConformance(
<DateRangePickerDay
day={adapterToUse.date()}
outsideCurrentMonth={false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,20 @@ describe('<DesktopDateRangePicker />', () => {
/>,
() => ({
classes: {},
muiName: 'MuiDesktopDateRangePicker',
wrapMount: wrapPickerMount,
refInstanceof: window.HTMLDivElement,
skip: ['componentProp', 'mergeClassName', 'propsSpread', 'rootClass', 'reactTestRenderer'],
skip: [
'componentProp',
'componentsProp',
'themeDefaultProps',
'themeStyleOverrides',
'themeVariants',
'mergeClassName',
'propsSpread',
'rootClass',
'reactTestRenderer',
],
}),
);

Expand Down Expand Up @@ -341,7 +352,7 @@ describe('<DesktopDateRangePicker />', () => {
expect(screen.getByRole('tooltip')).toBeVisible();
});

// TODO: remove once we use describeConformanceV5.
// TODO: remove once we use describeConformance.
it("respect theme's defaultProps", () => {
const theme = createTheme({
components: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,20 @@ describe('<DesktopTimePicker />', () => {
/>,
() => ({
classes: {},
muiName: 'MuiDesktopTimePicker',
wrapMount: wrapPickerMount,
refInstanceof: window.HTMLDivElement,
skip: ['componentProp', 'mergeClassName', 'propsSpread', 'rootClass', 'reactTestRenderer'],
skip: [
'componentProp',
'componentsProp',
'themeDefaultProps',
'themeStyleOverrides',
'themeVariants',
'mergeClassName',
'propsSpread',
'rootClass',
'reactTestRenderer',
],
}),
);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import * as React from 'react';
import { createClientRender, describeConformanceV5, screen } from 'test/utils';
import { createClientRender, describeConformance, screen } from 'test/utils';
import { expect } from 'chai';
import Button from '@material-ui/core/Button';
import LoadingButton, { loadingButtonClasses as classes } from '@material-ui/lab/LoadingButton';

describe('<LoadingButton />', () => {
const render = createClientRender();

describeConformanceV5(<LoadingButton>Conformance?</LoadingButton>, () => ({
describeConformance(<LoadingButton>Conformance?</LoadingButton>, () => ({
classes,
inheritComponent: Button,
render,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,20 @@ describe('<MobileDateRangePicker />', () => {
/>,
() => ({
classes: {},
muiName: 'MuiMobileDateRangePicker',
wrapMount: wrapPickerMount,
refInstanceof: window.HTMLDivElement,
skip: ['componentProp', 'mergeClassName', 'propsSpread', 'rootClass', 'reactTestRenderer'],
skip: [
'componentProp',
'componentsProp',
'themeDefaultProps',
'themeStyleOverrides',
'themeVariants',
'mergeClassName',
'propsSpread',
'rootClass',
'reactTestRenderer',
],
}),
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,20 @@ describe('<MobileTimePicker />', () => {
/>,
() => ({
classes: {},
muiName: 'MuiMobileTimePicker',
wrapMount: wrapPickerMount,
refInstanceof: window.HTMLDivElement,
skip: ['componentProp', 'mergeClassName', 'propsSpread', 'rootClass', 'reactTestRenderer'],
skip: [
'componentProp',
'componentsProp',
'themeDefaultProps',
'themeStyleOverrides',
'themeVariants',
'mergeClassName',
'propsSpread',
'rootClass',
'reactTestRenderer',
],
}),
);

Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/MonthPicker/MonthPicker.test.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import * as React from 'react';
import { spy } from 'sinon';
import { expect } from 'chai';
import { fireEvent, screen, describeConformanceV5 } from 'test/utils';
import { fireEvent, screen, describeConformance } from 'test/utils';
import MonthPicker, { monthPickerClasses as classes } from '@material-ui/lab/MonthPicker';
import { adapterToUse, wrapPickerMount, createPickerRender } from '../internal/pickers/test-utils';

describe('<MonthPicker />', () => {
const render = createPickerRender();

describeConformanceV5(
describeConformance(
<MonthPicker
minDate={adapterToUse.date('2019-01-01T00:00:00.000')}
maxDate={adapterToUse.date('2029-01-01T00:00:00.000')}
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/PickersDay/PickersDay.test.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
import { describeConformanceV5, fireEvent, screen } from 'test/utils';
import { describeConformance, fireEvent, screen } from 'test/utils';
import PickersDay, { pickersDayClasses as classes } from '@material-ui/lab/PickersDay';
import { adapterToUse, wrapPickerMount, createPickerRender } from '../internal/pickers/test-utils';

describe('<PickersDay />', () => {
const render = createPickerRender();

describeConformanceV5(
describeConformance(
<PickersDay
day={adapterToUse.date()}
outsideCurrentMonth={false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,15 @@ describe('<StaticDateRangePicker />', () => {
/>,
() => ({
classes: {},
muiName: 'MuiStaticDateRangePicker',
wrapMount: wrapPickerMount,
refInstanceof: undefined,
skip: [
'componentProp',
'componentsProp',
'themeDefaultProps',
'themeStyleOverrides',
'themeVariants',
'mergeClassName',
'propsSpread',
'refForwarding',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,15 @@ describe('<StaticTimePicker />', () => {
/>,
() => ({
classes: {},
muiName: 'MuiStaticTimePicker',
wrapMount: wrapPickerMount,
refInstanceof: undefined,
skip: [
'componentProp',
'componentsProp',
'themeDefaultProps',
'themeStyleOverrides',
'themeVariants',
'mergeClassName',
'propsSpread',
// TODO: `ref` is typed but has no effect
Expand Down
11 changes: 9 additions & 2 deletions packages/material-ui-lab/src/TabList/TabList.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import TabContext from '../TabContext';
describe('<TabList />', () => {
const render = createClientRender();

// @ts-ignore mui name does not exist for this component
describeConformance(<TabList />, () => ({
// @ts-expect-error https://github.com/microsoft/TypeScript/issues/15300
classes,
inheritComponent: Tabs,
/**
Expand All @@ -24,7 +24,14 @@ describe('<TabList />', () => {
},
refInstanceof: window.HTMLDivElement,
// TODO: no idea why reactTestRenderer fails
skip: ['reactTestRenderer'],
skip: [
'componentsProp',
'themeDefaultProps',
'themeStyleOverrides',
'themeVariants',
'rootClass',
'reactTestRenderer',
],
}));

// outside of TabContext pass every test in Tabs
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/TabPanel/TabPanel.test.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import * as React from 'react';
import { expect } from 'chai';
import { createClientRender, describeConformanceV5 } from 'test/utils';
import { createClientRender, describeConformance } from 'test/utils';
import TabPanel, { tabPanelClasses as classes } from '@material-ui/lab/TabPanel';
import TabContext from '../TabContext';

describe('<TabPanel />', () => {
const render = createClientRender();

describeConformanceV5(<TabPanel value="0" />, () => ({
describeConformance(<TabPanel value="0" />, () => ({
classes,
inheritComponent: 'div',
render: (node) => render(<TabContext value="0">{node}</TabContext>),
Expand Down
13 changes: 12 additions & 1 deletion packages/material-ui-lab/src/TimePicker/TimePicker.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,20 @@ describe('<TimePicker />', () => {
/>,
() => ({
classes: {},
muiName: 'MuiTimePicker',
wrapMount: wrapPickerMount,
refInstanceof: window.HTMLDivElement,
skip: ['componentProp', 'mergeClassName', 'propsSpread', 'rootClass', 'reactTestRenderer'],
skip: [
'componentProp',
'componentsProp',
'themeDefaultProps',
'themeStyleOverrides',
'themeVariants',
'mergeClassName',
'propsSpread',
'rootClass',
'reactTestRenderer',
],
}),
);
});
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/Timeline/Timeline.test.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import * as React from 'react';
import { createClientRender, describeConformanceV5 } from 'test/utils';
import { createClientRender, describeConformance } from 'test/utils';
import Timeline, { timelineClasses as classes } from '@material-ui/lab/Timeline';

describe('<Timeline />', () => {
const render = createClientRender();

describeConformanceV5(<Timeline />, () => ({
describeConformance(<Timeline />, () => ({
classes,
inheritComponent: 'ul',
render,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import * as React from 'react';
import { createClientRender, describeConformanceV5 } from 'test/utils';
import { createClientRender, describeConformance } from 'test/utils';
import TimelineConnector, {
timelineConnectorClasses as classes,
} from '@material-ui/lab/TimelineConnector';

describe('<TimelineConnector />', () => {
const render = createClientRender();

describeConformanceV5(<TimelineConnector />, () => ({
describeConformance(<TimelineConnector />, () => ({
classes,
inheritComponent: 'span',
render,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { expect } from 'chai';
import { createClientRender, describeConformanceV5 } from 'test/utils';
import { createClientRender, describeConformance } from 'test/utils';
import Typography from '@material-ui/core/Typography';
import Timeline from '@material-ui/lab/Timeline';
import TimelineItem from '@material-ui/lab/TimelineItem';
Expand All @@ -11,7 +11,7 @@ import TimelineContent, {
describe('<TimelineContent />', () => {
const render = createClientRender();

describeConformanceV5(<TimelineContent />, () => ({
describeConformance(<TimelineContent />, () => ({
classes,
inheritComponent: Typography,
render,
Expand Down
Loading