From 0b7e4684124bf702ae9da5c61e786793b65ac35d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Mon, 19 Feb 2024 11:04:18 +0100 Subject: [PATCH 1/3] [test] Create local wrapper over describeConformance --- package.json | 2 +- .../src/components/panel/GridPanel.test.tsx | 3 ++- .../DateRangeCalendar.test.tsx | 2 +- .../describes.DateRangePicker.test.tsx | 2 +- .../DateRangePickerDay.test.tsx | 2 +- .../describes.DesktopDateRangePicker.test.tsx | 3 ++- .../describes.MobileDateRangePicker.test.tsx | 8 ++------ ...tiInputDateRangeField.conformance.test.tsx | 2 +- ...putDateTimeRangeField.conformance.test.tsx | 2 +- ...tiInputTimeRangeField.conformance.test.tsx | 2 +- ...scribes.SingleInputDateRangeField.test.tsx | 2 +- ...bes.SingleInputDateTimeRangeField.test.tsx | 2 +- ...scribes.SingleInputTimeRangeField.test.tsx | 2 +- .../StaticDateRangePicker.test.tsx | 3 ++- .../tests/describes.DateCalendar.test.tsx | 3 ++- .../tests/describes.DateField.test.tsx | 3 ++- .../tests/describes.DateTimeField.test.tsx | 3 ++- .../DayCalendarSkeleton.test.tsx | 2 +- .../describes.DesktopTimePicker.test.tsx | 3 ++- .../tests/describes.DigitalClock.test.tsx | 3 ++- .../tests/describes.MobileTimePicker.test.tsx | 8 ++------ .../tests/describes.MonthCalendar.test.tsx | 3 ++- ...escribes.MultiSectionDigitalClock.test.tsx | 3 ++- .../src/PickersDay/PickersDay.test.tsx | 3 ++- .../StaticTimePicker.test.tsx | 9 ++------- .../tests/describes.TimeClock.test.tsx | 3 ++- .../tests/describes.YearCalendar.test.tsx | 3 ++- .../src/RichTreeView/RichTreeView.test.tsx | 3 ++- .../SimpleTreeView/SimpleTreeView.test.tsx | 10 ++-------- .../src/TreeItem/TreeItem.test.tsx | 10 ++-------- .../src/TreeView/TreeView.test.tsx | 3 ++- test/utils/describeConformance.ts | 20 +++++++++++++++++++ yarn.lock | 4 ++-- 33 files changed, 73 insertions(+), 63 deletions(-) create mode 100644 test/utils/describeConformance.ts diff --git a/package.json b/package.json index ee0a6c2e5890..02dc05483634 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "@mnajdova/enzyme-adapter-react-18": "^0.2.0", "@mui/icons-material": "^5.15.9", "@mui/material": "^5.15.9", - "@mui/monorepo": "https://github.com/mui/material-ui.git#master", + "@mui/monorepo": "https://github.com/michaldudak/material-ui.git#generalize-test-utils", "@mui/utils": "^5.15.9", "@next/eslint-plugin-next": "14.0.4", "@octokit/plugin-retry": "^6.0.1", diff --git a/packages/x-data-grid/src/components/panel/GridPanel.test.tsx b/packages/x-data-grid/src/components/panel/GridPanel.test.tsx index 65e17ca7bf78..ddbc8d8121c2 100644 --- a/packages/x-data-grid/src/components/panel/GridPanel.test.tsx +++ b/packages/x-data-grid/src/components/panel/GridPanel.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { createRenderer, describeConformance } from '@mui-internal/test-utils'; +import { createRenderer } from '@mui-internal/test-utils'; import { GridPanel, gridPanelClasses as classes, @@ -8,6 +8,7 @@ import { } from '@mui/x-data-grid'; import { GridRootPropsContext } from '@mui/x-data-grid/context/GridRootPropsContext'; import Popper from '@mui/material/Popper'; +import describeConformance from 'test/utils/describeConformance'; describe('', () => { const { render } = createRenderer(); diff --git a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx index 322c755dd706..c2b8b76271df 100644 --- a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx +++ b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx @@ -5,7 +5,6 @@ import { screen, fireEvent, getByRole, - describeConformance, fireTouchChangedEvent, userEvent, } from '@mui-internal/test-utils'; @@ -22,6 +21,7 @@ import { dateRangeCalendarClasses as classes, } from '@mui/x-date-pickers-pro/DateRangeCalendar'; import { DateRangePickerDay } from '@mui/x-date-pickers-pro/DateRangePickerDay'; +import describeConformance from 'test/utils/describeConformance'; import { DateRangePosition } from './DateRangeCalendar.types'; const getPickerDay = (name: string, picker = 'January 2018') => diff --git a/packages/x-date-pickers-pro/src/DateRangePicker/describes.DateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DateRangePicker/describes.DateRangePicker.test.tsx index a73fac7a776a..123333b891e0 100644 --- a/packages/x-date-pickers-pro/src/DateRangePicker/describes.DateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DateRangePicker/describes.DateRangePicker.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; -import { describeConformance } from '@mui-internal/test-utils'; import { DateRangePicker } from '@mui/x-date-pickers-pro/DateRangePicker'; import { createPickerRenderer, wrapPickerMount } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers-pro/src/DateRangePickerDay/DateRangePickerDay.test.tsx b/packages/x-date-pickers-pro/src/DateRangePickerDay/DateRangePickerDay.test.tsx index 9d339f0a5eca..3c093130f8f1 100644 --- a/packages/x-date-pickers-pro/src/DateRangePickerDay/DateRangePickerDay.test.tsx +++ b/packages/x-date-pickers-pro/src/DateRangePickerDay/DateRangePickerDay.test.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; -import { describeConformance } from '@mui-internal/test-utils'; import { DateRangePickerDay, dateRangePickerDayClasses as classes, } from '@mui/x-date-pickers-pro/DateRangePickerDay'; import { wrapPickerMount, createPickerRenderer, adapterToUse } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe('', () => { const { render } = createPickerRenderer(); diff --git a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx index 8bfa46959053..65bb95a38962 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { describeConformance, screen, userEvent } from '@mui-internal/test-utils'; +import { screen, userEvent } from '@mui-internal/test-utils'; import { adapterToUse, createPickerRenderer, @@ -13,6 +13,7 @@ import { } from 'test/utils/pickers'; import { DesktopDateRangePicker } from '@mui/x-date-pickers-pro/DesktopDateRangePicker'; import { SingleInputDateRangeField } from '@mui/x-date-pickers-pro/SingleInputDateRangeField'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ diff --git a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx index 75ac932323e8..a7a30395df98 100644 --- a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx @@ -1,10 +1,5 @@ import * as React from 'react'; -import { - describeConformance, - screen, - userEvent, - fireDiscreteEvent, -} from '@mui-internal/test-utils'; +import { screen, userEvent, fireDiscreteEvent } from '@mui-internal/test-utils'; import { MobileDateRangePicker } from '@mui/x-date-pickers-pro/MobileDateRangePicker'; import { adapterToUse, @@ -17,6 +12,7 @@ import { describeValue, describePicker, } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ diff --git a/packages/x-date-pickers-pro/src/MultiInputDateRangeField/tests/MultiInputDateRangeField.conformance.test.tsx b/packages/x-date-pickers-pro/src/MultiInputDateRangeField/tests/MultiInputDateRangeField.conformance.test.tsx index 939bf28a56a3..e78b5a240c7f 100644 --- a/packages/x-date-pickers-pro/src/MultiInputDateRangeField/tests/MultiInputDateRangeField.conformance.test.tsx +++ b/packages/x-date-pickers-pro/src/MultiInputDateRangeField/tests/MultiInputDateRangeField.conformance.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; -import { describeConformance } from '@mui-internal/test-utils'; import { MultiInputDateRangeField } from '@mui/x-date-pickers-pro/MultiInputDateRangeField'; import { createPickerRenderer, wrapPickerMount } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe('', () => { const { render } = createPickerRenderer(); diff --git a/packages/x-date-pickers-pro/src/MultiInputDateTimeRangeField/tests/MultiInputDateTimeRangeField.conformance.test.tsx b/packages/x-date-pickers-pro/src/MultiInputDateTimeRangeField/tests/MultiInputDateTimeRangeField.conformance.test.tsx index 81c4865ce0c1..15c08bfd519e 100644 --- a/packages/x-date-pickers-pro/src/MultiInputDateTimeRangeField/tests/MultiInputDateTimeRangeField.conformance.test.tsx +++ b/packages/x-date-pickers-pro/src/MultiInputDateTimeRangeField/tests/MultiInputDateTimeRangeField.conformance.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; -import { describeConformance } from '@mui-internal/test-utils'; import { MultiInputDateTimeRangeField } from '@mui/x-date-pickers-pro/MultiInputDateTimeRangeField'; import { createPickerRenderer, wrapPickerMount } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe('', () => { const { render } = createPickerRenderer(); diff --git a/packages/x-date-pickers-pro/src/MultiInputTimeRangeField/tests/MultiInputTimeRangeField.conformance.test.tsx b/packages/x-date-pickers-pro/src/MultiInputTimeRangeField/tests/MultiInputTimeRangeField.conformance.test.tsx index 218ae21f6029..cf4766317527 100644 --- a/packages/x-date-pickers-pro/src/MultiInputTimeRangeField/tests/MultiInputTimeRangeField.conformance.test.tsx +++ b/packages/x-date-pickers-pro/src/MultiInputTimeRangeField/tests/MultiInputTimeRangeField.conformance.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; -import { describeConformance } from '@mui-internal/test-utils'; import { MultiInputTimeRangeField } from '@mui/x-date-pickers-pro/MultiInputTimeRangeField'; import { createPickerRenderer, wrapPickerMount } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe('', () => { const { render } = createPickerRenderer(); diff --git a/packages/x-date-pickers-pro/src/SingleInputDateRangeField/tests/describes.SingleInputDateRangeField.test.tsx b/packages/x-date-pickers-pro/src/SingleInputDateRangeField/tests/describes.SingleInputDateRangeField.test.tsx index 0a79c9e39c54..d4fd661f34af 100644 --- a/packages/x-date-pickers-pro/src/SingleInputDateRangeField/tests/describes.SingleInputDateRangeField.test.tsx +++ b/packages/x-date-pickers-pro/src/SingleInputDateRangeField/tests/describes.SingleInputDateRangeField.test.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import TextField from '@mui/material/TextField'; -import { describeConformance } from '@mui-internal/test-utils'; import { SingleInputDateRangeField } from '@mui/x-date-pickers-pro/SingleInputDateRangeField'; import { createPickerRenderer, wrapPickerMount, describeRangeValidation } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/tests/describes.SingleInputDateTimeRangeField.test.tsx b/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/tests/describes.SingleInputDateTimeRangeField.test.tsx index 6535d00aba2d..688c76aecbf6 100644 --- a/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/tests/describes.SingleInputDateTimeRangeField.test.tsx +++ b/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/tests/describes.SingleInputDateTimeRangeField.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; -import { describeConformance } from '@mui-internal/test-utils'; import { SingleInputDateTimeRangeField } from '@mui/x-date-pickers-pro/SingleInputDateTimeRangeField'; import { createPickerRenderer, wrapPickerMount, describeRangeValidation } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/tests/describes.SingleInputTimeRangeField.test.tsx b/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/tests/describes.SingleInputTimeRangeField.test.tsx index 01d212338c9e..a1d4c585e220 100644 --- a/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/tests/describes.SingleInputTimeRangeField.test.tsx +++ b/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/tests/describes.SingleInputTimeRangeField.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; -import { describeConformance } from '@mui-internal/test-utils'; import { SingleInputTimeRangeField } from '@mui/x-date-pickers-pro/SingleInputTimeRangeField'; import { createPickerRenderer, wrapPickerMount, describeRangeValidation } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers-pro/src/StaticDateRangePicker/StaticDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/StaticDateRangePicker/StaticDateRangePicker.test.tsx index f906e1db18e7..315c0a2c0750 100644 --- a/packages/x-date-pickers-pro/src/StaticDateRangePicker/StaticDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/StaticDateRangePicker/StaticDateRangePicker.test.tsx @@ -2,13 +2,14 @@ import * as React from 'react'; import { expect } from 'chai'; import { isWeekend } from 'date-fns'; import { StaticDateRangePicker } from '@mui/x-date-pickers-pro/StaticDateRangePicker'; -import { describeConformance, screen } from '@mui-internal/test-utils'; +import { screen } from '@mui-internal/test-utils'; import { wrapPickerMount, createPickerRenderer, adapterToUse, describeRangeValidation, } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe('', () => { const { render, clock } = createPickerRenderer({ diff --git a/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx b/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx index a8b64b3f594c..e8218737fdb1 100644 --- a/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx +++ b/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { describeConformance, screen, userEvent } from '@mui-internal/test-utils'; +import { screen, userEvent } from '@mui-internal/test-utils'; import { DateCalendar, dateCalendarClasses as classes } from '@mui/x-date-pickers/DateCalendar'; import { pickersDayClasses } from '@mui/x-date-pickers/PickersDay'; import { @@ -10,6 +10,7 @@ import { describeValidation, describeValue, } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx b/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx index 7008fe302b62..71d8a57fe2b1 100644 --- a/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx +++ b/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { describeConformance, userEvent } from '@mui-internal/test-utils'; +import { userEvent } from '@mui-internal/test-utils'; import TextField from '@mui/material/TextField'; import { DateField } from '@mui/x-date-pickers/DateField'; import { @@ -12,6 +12,7 @@ import { describeValidation, describeValue, } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers/src/DateTimeField/tests/describes.DateTimeField.test.tsx b/packages/x-date-pickers/src/DateTimeField/tests/describes.DateTimeField.test.tsx index 959307f278d6..d7c5debabc49 100644 --- a/packages/x-date-pickers/src/DateTimeField/tests/describes.DateTimeField.test.tsx +++ b/packages/x-date-pickers/src/DateTimeField/tests/describes.DateTimeField.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import TextField from '@mui/material/TextField'; -import { describeConformance, userEvent } from '@mui-internal/test-utils'; +import { userEvent } from '@mui-internal/test-utils'; import { DateTimeField } from '@mui/x-date-pickers/DateTimeField'; import { adapterToUse, @@ -12,6 +12,7 @@ import { describeValidation, describeValue, } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers/src/DayCalendarSkeleton/DayCalendarSkeleton.test.tsx b/packages/x-date-pickers/src/DayCalendarSkeleton/DayCalendarSkeleton.test.tsx index 9555f053f31e..4eb557a68f0b 100644 --- a/packages/x-date-pickers/src/DayCalendarSkeleton/DayCalendarSkeleton.test.tsx +++ b/packages/x-date-pickers/src/DayCalendarSkeleton/DayCalendarSkeleton.test.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; -import { describeConformance } from '@mui-internal/test-utils'; import { DayCalendarSkeleton, dayCalendarSkeletonClasses as classes, } from '@mui/x-date-pickers/DayCalendarSkeleton'; import { createPickerRenderer } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe('', () => { const { render } = createPickerRenderer(); diff --git a/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx index 4caf35517921..be09efbdbf65 100644 --- a/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { screen, userEvent, describeConformance } from '@mui-internal/test-utils'; +import { screen, userEvent } from '@mui-internal/test-utils'; import { createPickerRenderer, wrapPickerMount, @@ -13,6 +13,7 @@ import { formatFullTimeValue, } from 'test/utils/pickers'; import { DesktopTimePicker } from '@mui/x-date-pickers/DesktopTimePicker'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers/src/DigitalClock/tests/describes.DigitalClock.test.tsx b/packages/x-date-pickers/src/DigitalClock/tests/describes.DigitalClock.test.tsx index 32efb2d1a061..05ab9ba9ba61 100644 --- a/packages/x-date-pickers/src/DigitalClock/tests/describes.DigitalClock.test.tsx +++ b/packages/x-date-pickers/src/DigitalClock/tests/describes.DigitalClock.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { screen, describeConformance } from '@mui-internal/test-utils'; +import { screen } from '@mui-internal/test-utils'; import { createPickerRenderer, wrapPickerMount, @@ -11,6 +11,7 @@ import { formatFullTimeValue, } from 'test/utils/pickers'; import { DigitalClock } from '@mui/x-date-pickers/DigitalClock'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx b/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx index cb3ca7c94668..30cb94bea7cb 100644 --- a/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx @@ -1,10 +1,5 @@ import * as React from 'react'; -import { - describeConformance, - screen, - userEvent, - fireTouchChangedEvent, -} from '@mui-internal/test-utils'; +import { screen, userEvent, fireTouchChangedEvent } from '@mui-internal/test-utils'; import { createPickerRenderer, wrapPickerMount, @@ -20,6 +15,7 @@ import { formatFullTimeValue, } from 'test/utils/pickers'; import { MobileTimePicker } from '@mui/x-date-pickers/MobileTimePicker'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ diff --git a/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx b/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx index 8050b1472760..079bc46bed6e 100644 --- a/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx +++ b/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { describeConformance, userEvent, screen } from '@mui-internal/test-utils'; +import { userEvent, screen } from '@mui-internal/test-utils'; import { wrapPickerMount, createPickerRenderer, @@ -9,6 +9,7 @@ import { describeValue, } from 'test/utils/pickers'; import { MonthCalendar, monthCalendarClasses as classes } from '@mui/x-date-pickers/MonthCalendar'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/describes.MultiSectionDigitalClock.test.tsx b/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/describes.MultiSectionDigitalClock.test.tsx index a83109110967..2c665dff2f45 100644 --- a/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/describes.MultiSectionDigitalClock.test.tsx +++ b/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/describes.MultiSectionDigitalClock.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { screen, describeConformance } from '@mui-internal/test-utils'; +import { screen } from '@mui-internal/test-utils'; import { createPickerRenderer, wrapPickerMount, @@ -11,6 +11,7 @@ import { } from 'test/utils/pickers'; import { MultiSectionDigitalClock } from '@mui/x-date-pickers/MultiSectionDigitalClock'; import { formatMeridiem } from '@mui/x-date-pickers/internals'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers/src/PickersDay/PickersDay.test.tsx b/packages/x-date-pickers/src/PickersDay/PickersDay.test.tsx index c7d516e73092..febae4a5ee06 100644 --- a/packages/x-date-pickers/src/PickersDay/PickersDay.test.tsx +++ b/packages/x-date-pickers/src/PickersDay/PickersDay.test.tsx @@ -1,10 +1,11 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { describeConformance, fireEvent, screen } from '@mui-internal/test-utils'; +import { fireEvent, screen } from '@mui-internal/test-utils'; import ButtonBase from '@mui/material/ButtonBase'; import { PickersDay, pickersDayClasses as classes } from '@mui/x-date-pickers/PickersDay'; import { adapterToUse, wrapPickerMount, createPickerRenderer } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe('', () => { const { render } = createPickerRenderer(); diff --git a/packages/x-date-pickers/src/StaticTimePicker/StaticTimePicker.test.tsx b/packages/x-date-pickers/src/StaticTimePicker/StaticTimePicker.test.tsx index 4f40dac09f38..ca5b867fcff3 100644 --- a/packages/x-date-pickers/src/StaticTimePicker/StaticTimePicker.test.tsx +++ b/packages/x-date-pickers/src/StaticTimePicker/StaticTimePicker.test.tsx @@ -1,13 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { - describeConformance, - fireTouchChangedEvent, - screen, - getAllByRole, - fireEvent, -} from '@mui-internal/test-utils'; +import { fireTouchChangedEvent, screen, getAllByRole, fireEvent } from '@mui-internal/test-utils'; import { adapterToUse, wrapPickerMount, @@ -15,6 +9,7 @@ import { describeValidation, } from 'test/utils/pickers'; import { StaticTimePicker } from '@mui/x-date-pickers/StaticTimePicker'; +import describeConformance from 'test/utils/describeConformance'; describe('', () => { const { render, clock } = createPickerRenderer({ diff --git a/packages/x-date-pickers/src/TimeClock/tests/describes.TimeClock.test.tsx b/packages/x-date-pickers/src/TimeClock/tests/describes.TimeClock.test.tsx index 9b83a035223b..7c347fe0982c 100644 --- a/packages/x-date-pickers/src/TimeClock/tests/describes.TimeClock.test.tsx +++ b/packages/x-date-pickers/src/TimeClock/tests/describes.TimeClock.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { describeConformance, screen } from '@mui-internal/test-utils'; +import { screen } from '@mui-internal/test-utils'; import { clockPointerClasses, TimeClock, @@ -13,6 +13,7 @@ import { timeClockHandler, describeValue, } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer(); diff --git a/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx b/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx index 31beecce7aa8..d46ca2cf6af5 100644 --- a/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx +++ b/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { userEvent, screen, describeConformance } from '@mui-internal/test-utils'; +import { userEvent, screen } from '@mui-internal/test-utils'; import { YearCalendar, yearCalendarClasses as classes } from '@mui/x-date-pickers/YearCalendar'; import { wrapPickerMount, @@ -9,6 +9,7 @@ import { describeValidation, describeValue, } from 'test/utils/pickers'; +import describeConformance from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ diff --git a/packages/x-tree-view/src/RichTreeView/RichTreeView.test.tsx b/packages/x-tree-view/src/RichTreeView/RichTreeView.test.tsx index 8d9725932950..bca8c33efaf6 100644 --- a/packages/x-tree-view/src/RichTreeView/RichTreeView.test.tsx +++ b/packages/x-tree-view/src/RichTreeView/RichTreeView.test.tsx @@ -1,6 +1,7 @@ import * as React from 'react'; -import { createRenderer, describeConformance } from '@mui-internal/test-utils'; +import { createRenderer } from '@mui-internal/test-utils'; import { RichTreeView, richTreeViewClasses as classes } from '@mui/x-tree-view/RichTreeView'; +import describeConformance from 'test/utils/describeConformance'; describe('', () => { const { render } = createRenderer(); diff --git a/packages/x-tree-view/src/SimpleTreeView/SimpleTreeView.test.tsx b/packages/x-tree-view/src/SimpleTreeView/SimpleTreeView.test.tsx index a8c6d3aa13db..a932a9445856 100644 --- a/packages/x-tree-view/src/SimpleTreeView/SimpleTreeView.test.tsx +++ b/packages/x-tree-view/src/SimpleTreeView/SimpleTreeView.test.tsx @@ -1,17 +1,11 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { - act, - createRenderer, - ErrorBoundary, - fireEvent, - screen, - describeConformance, -} from '@mui-internal/test-utils'; +import { act, createRenderer, ErrorBoundary, fireEvent, screen } from '@mui-internal/test-utils'; import Portal from '@mui/material/Portal'; import { SimpleTreeView, simpleTreeViewClasses as classes } from '@mui/x-tree-view/SimpleTreeView'; import { TreeItem } from '@mui/x-tree-view/TreeItem'; +import describeConformance from 'test/utils/describeConformance'; describe('', () => { const { render } = createRenderer(); diff --git a/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx b/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx index 11f216686b7b..9d0ea6e9948c 100644 --- a/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx +++ b/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx @@ -2,19 +2,13 @@ import * as React from 'react'; import { expect } from 'chai'; import PropTypes from 'prop-types'; import { spy } from 'sinon'; -import { - describeConformance, - act, - createEvent, - createRenderer, - fireEvent, - screen, -} from '@mui-internal/test-utils'; +import { act, createEvent, createRenderer, fireEvent, screen } from '@mui-internal/test-utils'; import { SimpleTreeView } from '@mui/x-tree-view/SimpleTreeView'; import { TreeItem, treeItemClasses as classes } from '@mui/x-tree-view/TreeItem'; import { TreeViewContextValue } from '@mui/x-tree-view/internals/TreeViewProvider'; import { TreeViewContext } from '@mui/x-tree-view/internals/TreeViewProvider/TreeViewContext'; import { DefaultTreeViewPlugins } from '@mui/x-tree-view/internals'; +import describeConformance from 'test/utils/describeConformance'; const TEST_TREE_VIEW_CONTEXT_VALUE: TreeViewContextValue = { instance: { diff --git a/packages/x-tree-view/src/TreeView/TreeView.test.tsx b/packages/x-tree-view/src/TreeView/TreeView.test.tsx index d1b0553a337e..a6397755c67e 100644 --- a/packages/x-tree-view/src/TreeView/TreeView.test.tsx +++ b/packages/x-tree-view/src/TreeView/TreeView.test.tsx @@ -1,6 +1,7 @@ import * as React from 'react'; -import { createRenderer, describeConformance } from '@mui-internal/test-utils'; +import { createRenderer } from '@mui-internal/test-utils'; import { TreeView, treeViewClasses as classes } from '@mui/x-tree-view/TreeView'; +import describeConformance from 'test/utils/describeConformance'; describe('', () => { const { render } = createRenderer(); diff --git a/test/utils/describeConformance.ts b/test/utils/describeConformance.ts new file mode 100644 index 000000000000..633cf72e03eb --- /dev/null +++ b/test/utils/describeConformance.ts @@ -0,0 +1,20 @@ +import { + describeConformance as baseDescribeConformance, + ConformanceOptions, +} from '@mui-internal/test-utils'; +import { ThemeProvider, createTheme } from '@mui/material/styles'; + +export default function describeConformance( + minimalElement: React.ReactElement, + getOptions: () => ConformanceOptions, +) { + function getOptionsWithDefaults() { + return { + ThemeProvider, + createTheme, + ...getOptions(), + }; + } + + return baseDescribeConformance(minimalElement, getOptionsWithDefaults); +} diff --git a/yarn.lock b/yarn.lock index f80f786be1cb..0614dafe1b9b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1890,9 +1890,9 @@ react-is "^18.2.0" react-transition-group "^4.4.5" -"@mui/monorepo@https://github.com/mui/material-ui.git#master": +"@mui/monorepo@https://github.com/michaldudak/material-ui.git#generalize-test-utils": version "5.15.10" - resolved "https://github.com/mui/material-ui.git#c5b4ebac51979272121a3b4369e43cf41509dad8" + resolved "https://github.com/michaldudak/material-ui.git#aded9c872b948d53c76ad15a7fb69ae6a60e5345" dependencies: "@googleapis/sheets" "^5.0.5" "@slack/bolt" "^3.17.1" From 1d6d60a4412e0743e8fd8d96ba7e36ac86e37f5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Tue, 20 Feb 2024 08:29:42 +0100 Subject: [PATCH 2/3] Use stable monorepo --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 02dc05483634..ee0a6c2e5890 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "@mnajdova/enzyme-adapter-react-18": "^0.2.0", "@mui/icons-material": "^5.15.9", "@mui/material": "^5.15.9", - "@mui/monorepo": "https://github.com/michaldudak/material-ui.git#generalize-test-utils", + "@mui/monorepo": "https://github.com/mui/material-ui.git#master", "@mui/utils": "^5.15.9", "@next/eslint-plugin-next": "14.0.4", "@octokit/plugin-retry": "^6.0.1", diff --git a/yarn.lock b/yarn.lock index 0614dafe1b9b..3ee747ab0645 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1890,9 +1890,9 @@ react-is "^18.2.0" react-transition-group "^4.4.5" -"@mui/monorepo@https://github.com/michaldudak/material-ui.git#generalize-test-utils": +"@mui/monorepo@https://github.com/mui/material-ui.git#master": version "5.15.10" - resolved "https://github.com/michaldudak/material-ui.git#aded9c872b948d53c76ad15a7fb69ae6a60e5345" + resolved "https://github.com/mui/material-ui.git#a367c25dcaaddf5e72cceb5a9d8ef571607486c2" dependencies: "@googleapis/sheets" "^5.0.5" "@slack/bolt" "^3.17.1" From 9be2cb88e6cabc769c7ed304d639735176ba0967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Tue, 20 Feb 2024 14:10:08 +0100 Subject: [PATCH 3/3] Use named exports --- packages/x-data-grid/src/components/panel/GridPanel.test.tsx | 2 +- .../src/DateRangeCalendar/DateRangeCalendar.test.tsx | 2 +- .../src/DateRangePicker/describes.DateRangePicker.test.tsx | 2 +- .../src/DateRangePickerDay/DateRangePickerDay.test.tsx | 2 +- .../tests/describes.DesktopDateRangePicker.test.tsx | 2 +- .../tests/describes.MobileDateRangePicker.test.tsx | 2 +- .../tests/MultiInputDateRangeField.conformance.test.tsx | 2 +- .../tests/MultiInputDateTimeRangeField.conformance.test.tsx | 2 +- .../tests/MultiInputTimeRangeField.conformance.test.tsx | 2 +- .../tests/describes.SingleInputDateRangeField.test.tsx | 2 +- .../tests/describes.SingleInputDateTimeRangeField.test.tsx | 2 +- .../tests/describes.SingleInputTimeRangeField.test.tsx | 2 +- .../src/StaticDateRangePicker/StaticDateRangePicker.test.tsx | 2 +- .../src/DateCalendar/tests/describes.DateCalendar.test.tsx | 2 +- .../src/DateField/tests/describes.DateField.test.tsx | 2 +- .../src/DateTimeField/tests/describes.DateTimeField.test.tsx | 2 +- .../src/DayCalendarSkeleton/DayCalendarSkeleton.test.tsx | 2 +- .../tests/describes.DesktopTimePicker.test.tsx | 2 +- .../src/DigitalClock/tests/describes.DigitalClock.test.tsx | 2 +- .../MobileTimePicker/tests/describes.MobileTimePicker.test.tsx | 2 +- .../src/MonthCalendar/tests/describes.MonthCalendar.test.tsx | 2 +- .../tests/describes.MultiSectionDigitalClock.test.tsx | 2 +- packages/x-date-pickers/src/PickersDay/PickersDay.test.tsx | 2 +- .../src/StaticTimePicker/StaticTimePicker.test.tsx | 2 +- .../src/TimeClock/tests/describes.TimeClock.test.tsx | 2 +- .../src/YearCalendar/tests/describes.YearCalendar.test.tsx | 2 +- packages/x-tree-view/src/RichTreeView/RichTreeView.test.tsx | 2 +- packages/x-tree-view/src/SimpleTreeView/SimpleTreeView.test.tsx | 2 +- packages/x-tree-view/src/TreeItem/TreeItem.test.tsx | 2 +- packages/x-tree-view/src/TreeView/TreeView.test.tsx | 2 +- test/utils/describeConformance.ts | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/packages/x-data-grid/src/components/panel/GridPanel.test.tsx b/packages/x-data-grid/src/components/panel/GridPanel.test.tsx index ddbc8d8121c2..35da4139dd1f 100644 --- a/packages/x-data-grid/src/components/panel/GridPanel.test.tsx +++ b/packages/x-data-grid/src/components/panel/GridPanel.test.tsx @@ -8,7 +8,7 @@ import { } from '@mui/x-data-grid'; import { GridRootPropsContext } from '@mui/x-data-grid/context/GridRootPropsContext'; import Popper from '@mui/material/Popper'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe('', () => { const { render } = createRenderer(); diff --git a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx index c2b8b76271df..156a44f61868 100644 --- a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx +++ b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx @@ -21,7 +21,7 @@ import { dateRangeCalendarClasses as classes, } from '@mui/x-date-pickers-pro/DateRangeCalendar'; import { DateRangePickerDay } from '@mui/x-date-pickers-pro/DateRangePickerDay'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; import { DateRangePosition } from './DateRangeCalendar.types'; const getPickerDay = (name: string, picker = 'January 2018') => diff --git a/packages/x-date-pickers-pro/src/DateRangePicker/describes.DateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DateRangePicker/describes.DateRangePicker.test.tsx index 123333b891e0..4fae744f4914 100644 --- a/packages/x-date-pickers-pro/src/DateRangePicker/describes.DateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DateRangePicker/describes.DateRangePicker.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { DateRangePicker } from '@mui/x-date-pickers-pro/DateRangePicker'; import { createPickerRenderer, wrapPickerMount } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers-pro/src/DateRangePickerDay/DateRangePickerDay.test.tsx b/packages/x-date-pickers-pro/src/DateRangePickerDay/DateRangePickerDay.test.tsx index 3c093130f8f1..03294c00ca36 100644 --- a/packages/x-date-pickers-pro/src/DateRangePickerDay/DateRangePickerDay.test.tsx +++ b/packages/x-date-pickers-pro/src/DateRangePickerDay/DateRangePickerDay.test.tsx @@ -4,7 +4,7 @@ import { dateRangePickerDayClasses as classes, } from '@mui/x-date-pickers-pro/DateRangePickerDay'; import { wrapPickerMount, createPickerRenderer, adapterToUse } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe('', () => { const { render } = createPickerRenderer(); diff --git a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx index 65bb95a38962..a28dc1a2e814 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx @@ -13,7 +13,7 @@ import { } from 'test/utils/pickers'; import { DesktopDateRangePicker } from '@mui/x-date-pickers-pro/DesktopDateRangePicker'; import { SingleInputDateRangeField } from '@mui/x-date-pickers-pro/SingleInputDateRangeField'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ diff --git a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx index a7a30395df98..4ebc728ce436 100644 --- a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx @@ -12,7 +12,7 @@ import { describeValue, describePicker, } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ diff --git a/packages/x-date-pickers-pro/src/MultiInputDateRangeField/tests/MultiInputDateRangeField.conformance.test.tsx b/packages/x-date-pickers-pro/src/MultiInputDateRangeField/tests/MultiInputDateRangeField.conformance.test.tsx index e78b5a240c7f..4ae82e23ec61 100644 --- a/packages/x-date-pickers-pro/src/MultiInputDateRangeField/tests/MultiInputDateRangeField.conformance.test.tsx +++ b/packages/x-date-pickers-pro/src/MultiInputDateRangeField/tests/MultiInputDateRangeField.conformance.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { MultiInputDateRangeField } from '@mui/x-date-pickers-pro/MultiInputDateRangeField'; import { createPickerRenderer, wrapPickerMount } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe('', () => { const { render } = createPickerRenderer(); diff --git a/packages/x-date-pickers-pro/src/MultiInputDateTimeRangeField/tests/MultiInputDateTimeRangeField.conformance.test.tsx b/packages/x-date-pickers-pro/src/MultiInputDateTimeRangeField/tests/MultiInputDateTimeRangeField.conformance.test.tsx index 15c08bfd519e..d2b46d40e7dc 100644 --- a/packages/x-date-pickers-pro/src/MultiInputDateTimeRangeField/tests/MultiInputDateTimeRangeField.conformance.test.tsx +++ b/packages/x-date-pickers-pro/src/MultiInputDateTimeRangeField/tests/MultiInputDateTimeRangeField.conformance.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { MultiInputDateTimeRangeField } from '@mui/x-date-pickers-pro/MultiInputDateTimeRangeField'; import { createPickerRenderer, wrapPickerMount } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe('', () => { const { render } = createPickerRenderer(); diff --git a/packages/x-date-pickers-pro/src/MultiInputTimeRangeField/tests/MultiInputTimeRangeField.conformance.test.tsx b/packages/x-date-pickers-pro/src/MultiInputTimeRangeField/tests/MultiInputTimeRangeField.conformance.test.tsx index cf4766317527..a7da491cbbcc 100644 --- a/packages/x-date-pickers-pro/src/MultiInputTimeRangeField/tests/MultiInputTimeRangeField.conformance.test.tsx +++ b/packages/x-date-pickers-pro/src/MultiInputTimeRangeField/tests/MultiInputTimeRangeField.conformance.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { MultiInputTimeRangeField } from '@mui/x-date-pickers-pro/MultiInputTimeRangeField'; import { createPickerRenderer, wrapPickerMount } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe('', () => { const { render } = createPickerRenderer(); diff --git a/packages/x-date-pickers-pro/src/SingleInputDateRangeField/tests/describes.SingleInputDateRangeField.test.tsx b/packages/x-date-pickers-pro/src/SingleInputDateRangeField/tests/describes.SingleInputDateRangeField.test.tsx index d4fd661f34af..dd7e5073e1e8 100644 --- a/packages/x-date-pickers-pro/src/SingleInputDateRangeField/tests/describes.SingleInputDateRangeField.test.tsx +++ b/packages/x-date-pickers-pro/src/SingleInputDateRangeField/tests/describes.SingleInputDateRangeField.test.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import TextField from '@mui/material/TextField'; import { SingleInputDateRangeField } from '@mui/x-date-pickers-pro/SingleInputDateRangeField'; import { createPickerRenderer, wrapPickerMount, describeRangeValidation } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/tests/describes.SingleInputDateTimeRangeField.test.tsx b/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/tests/describes.SingleInputDateTimeRangeField.test.tsx index 688c76aecbf6..c960b9a90389 100644 --- a/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/tests/describes.SingleInputDateTimeRangeField.test.tsx +++ b/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/tests/describes.SingleInputDateTimeRangeField.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { SingleInputDateTimeRangeField } from '@mui/x-date-pickers-pro/SingleInputDateTimeRangeField'; import { createPickerRenderer, wrapPickerMount, describeRangeValidation } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/tests/describes.SingleInputTimeRangeField.test.tsx b/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/tests/describes.SingleInputTimeRangeField.test.tsx index a1d4c585e220..ab43a0cede0e 100644 --- a/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/tests/describes.SingleInputTimeRangeField.test.tsx +++ b/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/tests/describes.SingleInputTimeRangeField.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { SingleInputTimeRangeField } from '@mui/x-date-pickers-pro/SingleInputTimeRangeField'; import { createPickerRenderer, wrapPickerMount, describeRangeValidation } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers-pro/src/StaticDateRangePicker/StaticDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/StaticDateRangePicker/StaticDateRangePicker.test.tsx index 315c0a2c0750..6878ccf060c0 100644 --- a/packages/x-date-pickers-pro/src/StaticDateRangePicker/StaticDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/StaticDateRangePicker/StaticDateRangePicker.test.tsx @@ -9,7 +9,7 @@ import { adapterToUse, describeRangeValidation, } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe('', () => { const { render, clock } = createPickerRenderer({ diff --git a/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx b/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx index e8218737fdb1..98fd5c80205d 100644 --- a/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx +++ b/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx @@ -10,7 +10,7 @@ import { describeValidation, describeValue, } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx b/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx index 71d8a57fe2b1..3b191484b51c 100644 --- a/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx +++ b/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx @@ -12,7 +12,7 @@ import { describeValidation, describeValue, } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers/src/DateTimeField/tests/describes.DateTimeField.test.tsx b/packages/x-date-pickers/src/DateTimeField/tests/describes.DateTimeField.test.tsx index d7c5debabc49..28a69aac0016 100644 --- a/packages/x-date-pickers/src/DateTimeField/tests/describes.DateTimeField.test.tsx +++ b/packages/x-date-pickers/src/DateTimeField/tests/describes.DateTimeField.test.tsx @@ -12,7 +12,7 @@ import { describeValidation, describeValue, } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers/src/DayCalendarSkeleton/DayCalendarSkeleton.test.tsx b/packages/x-date-pickers/src/DayCalendarSkeleton/DayCalendarSkeleton.test.tsx index 4eb557a68f0b..c277f0f54bcb 100644 --- a/packages/x-date-pickers/src/DayCalendarSkeleton/DayCalendarSkeleton.test.tsx +++ b/packages/x-date-pickers/src/DayCalendarSkeleton/DayCalendarSkeleton.test.tsx @@ -4,7 +4,7 @@ import { dayCalendarSkeletonClasses as classes, } from '@mui/x-date-pickers/DayCalendarSkeleton'; import { createPickerRenderer } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe('', () => { const { render } = createPickerRenderer(); diff --git a/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx index be09efbdbf65..5721929175ae 100644 --- a/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx @@ -13,7 +13,7 @@ import { formatFullTimeValue, } from 'test/utils/pickers'; import { DesktopTimePicker } from '@mui/x-date-pickers/DesktopTimePicker'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers/src/DigitalClock/tests/describes.DigitalClock.test.tsx b/packages/x-date-pickers/src/DigitalClock/tests/describes.DigitalClock.test.tsx index 05ab9ba9ba61..6176930c1592 100644 --- a/packages/x-date-pickers/src/DigitalClock/tests/describes.DigitalClock.test.tsx +++ b/packages/x-date-pickers/src/DigitalClock/tests/describes.DigitalClock.test.tsx @@ -11,7 +11,7 @@ import { formatFullTimeValue, } from 'test/utils/pickers'; import { DigitalClock } from '@mui/x-date-pickers/DigitalClock'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx b/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx index 30cb94bea7cb..577df307912e 100644 --- a/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx @@ -15,7 +15,7 @@ import { formatFullTimeValue, } from 'test/utils/pickers'; import { MobileTimePicker } from '@mui/x-date-pickers/MobileTimePicker'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ diff --git a/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx b/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx index 079bc46bed6e..2dffbb7b6707 100644 --- a/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx +++ b/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx @@ -9,7 +9,7 @@ import { describeValue, } from 'test/utils/pickers'; import { MonthCalendar, monthCalendarClasses as classes } from '@mui/x-date-pickers/MonthCalendar'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/describes.MultiSectionDigitalClock.test.tsx b/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/describes.MultiSectionDigitalClock.test.tsx index 2c665dff2f45..a9d72478d6de 100644 --- a/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/describes.MultiSectionDigitalClock.test.tsx +++ b/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/describes.MultiSectionDigitalClock.test.tsx @@ -11,7 +11,7 @@ import { } from 'test/utils/pickers'; import { MultiSectionDigitalClock } from '@mui/x-date-pickers/MultiSectionDigitalClock'; import { formatMeridiem } from '@mui/x-date-pickers/internals'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); diff --git a/packages/x-date-pickers/src/PickersDay/PickersDay.test.tsx b/packages/x-date-pickers/src/PickersDay/PickersDay.test.tsx index febae4a5ee06..350d7b72f788 100644 --- a/packages/x-date-pickers/src/PickersDay/PickersDay.test.tsx +++ b/packages/x-date-pickers/src/PickersDay/PickersDay.test.tsx @@ -5,7 +5,7 @@ import { fireEvent, screen } from '@mui-internal/test-utils'; import ButtonBase from '@mui/material/ButtonBase'; import { PickersDay, pickersDayClasses as classes } from '@mui/x-date-pickers/PickersDay'; import { adapterToUse, wrapPickerMount, createPickerRenderer } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe('', () => { const { render } = createPickerRenderer(); diff --git a/packages/x-date-pickers/src/StaticTimePicker/StaticTimePicker.test.tsx b/packages/x-date-pickers/src/StaticTimePicker/StaticTimePicker.test.tsx index ca5b867fcff3..72ab428d2747 100644 --- a/packages/x-date-pickers/src/StaticTimePicker/StaticTimePicker.test.tsx +++ b/packages/x-date-pickers/src/StaticTimePicker/StaticTimePicker.test.tsx @@ -9,7 +9,7 @@ import { describeValidation, } from 'test/utils/pickers'; import { StaticTimePicker } from '@mui/x-date-pickers/StaticTimePicker'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe('', () => { const { render, clock } = createPickerRenderer({ diff --git a/packages/x-date-pickers/src/TimeClock/tests/describes.TimeClock.test.tsx b/packages/x-date-pickers/src/TimeClock/tests/describes.TimeClock.test.tsx index 7c347fe0982c..1dbba428386e 100644 --- a/packages/x-date-pickers/src/TimeClock/tests/describes.TimeClock.test.tsx +++ b/packages/x-date-pickers/src/TimeClock/tests/describes.TimeClock.test.tsx @@ -13,7 +13,7 @@ import { timeClockHandler, describeValue, } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer(); diff --git a/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx b/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx index d46ca2cf6af5..fb032baa4ed0 100644 --- a/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx +++ b/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx @@ -9,7 +9,7 @@ import { describeValidation, describeValue, } from 'test/utils/pickers'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ diff --git a/packages/x-tree-view/src/RichTreeView/RichTreeView.test.tsx b/packages/x-tree-view/src/RichTreeView/RichTreeView.test.tsx index bca8c33efaf6..aac101dd6902 100644 --- a/packages/x-tree-view/src/RichTreeView/RichTreeView.test.tsx +++ b/packages/x-tree-view/src/RichTreeView/RichTreeView.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { createRenderer } from '@mui-internal/test-utils'; import { RichTreeView, richTreeViewClasses as classes } from '@mui/x-tree-view/RichTreeView'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe('', () => { const { render } = createRenderer(); diff --git a/packages/x-tree-view/src/SimpleTreeView/SimpleTreeView.test.tsx b/packages/x-tree-view/src/SimpleTreeView/SimpleTreeView.test.tsx index a932a9445856..b49c3f3f3d79 100644 --- a/packages/x-tree-view/src/SimpleTreeView/SimpleTreeView.test.tsx +++ b/packages/x-tree-view/src/SimpleTreeView/SimpleTreeView.test.tsx @@ -5,7 +5,7 @@ import { act, createRenderer, ErrorBoundary, fireEvent, screen } from '@mui-inte import Portal from '@mui/material/Portal'; import { SimpleTreeView, simpleTreeViewClasses as classes } from '@mui/x-tree-view/SimpleTreeView'; import { TreeItem } from '@mui/x-tree-view/TreeItem'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe('', () => { const { render } = createRenderer(); diff --git a/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx b/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx index 9d0ea6e9948c..fc0e06562cbc 100644 --- a/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx +++ b/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx @@ -8,7 +8,7 @@ import { TreeItem, treeItemClasses as classes } from '@mui/x-tree-view/TreeItem' import { TreeViewContextValue } from '@mui/x-tree-view/internals/TreeViewProvider'; import { TreeViewContext } from '@mui/x-tree-view/internals/TreeViewProvider/TreeViewContext'; import { DefaultTreeViewPlugins } from '@mui/x-tree-view/internals'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; const TEST_TREE_VIEW_CONTEXT_VALUE: TreeViewContextValue = { instance: { diff --git a/packages/x-tree-view/src/TreeView/TreeView.test.tsx b/packages/x-tree-view/src/TreeView/TreeView.test.tsx index a6397755c67e..ebe98365f4e3 100644 --- a/packages/x-tree-view/src/TreeView/TreeView.test.tsx +++ b/packages/x-tree-view/src/TreeView/TreeView.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { createRenderer } from '@mui-internal/test-utils'; import { TreeView, treeViewClasses as classes } from '@mui/x-tree-view/TreeView'; -import describeConformance from 'test/utils/describeConformance'; +import { describeConformance } from 'test/utils/describeConformance'; describe('', () => { const { render } = createRenderer(); diff --git a/test/utils/describeConformance.ts b/test/utils/describeConformance.ts index 633cf72e03eb..872a5c803551 100644 --- a/test/utils/describeConformance.ts +++ b/test/utils/describeConformance.ts @@ -4,7 +4,7 @@ import { } from '@mui-internal/test-utils'; import { ThemeProvider, createTheme } from '@mui/material/styles'; -export default function describeConformance( +export function describeConformance( minimalElement: React.ReactElement, getOptions: () => ConformanceOptions, ) {