Skip to content

Commit c329f67

Browse files
committed
Remove mount from describeConformance
1 parent 710f2ec commit c329f67

File tree

16 files changed

+1
-111
lines changed

16 files changed

+1
-111
lines changed

packages-internal/test-utils/src/describeConformance.tsx

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
/* eslint-env mocha */
22
import * as React from 'react';
33
import { expect } from 'chai';
4-
import { ReactWrapper } from 'enzyme';
54
import ReactTestRenderer from 'react-test-renderer';
6-
import createMount from './createMount';
75
import createDescribe from './createDescribe';
8-
import findOutermostIntrinsic from './findOutermostIntrinsic';
96
import { MuiRenderResult } from './createRenderer';
107

118
function capitalize(string: string): string {
@@ -46,7 +43,6 @@ export interface ConformanceOptions {
4643
after?: () => void;
4744
inheritComponent?: React.ElementType;
4845
render: (node: React.ReactElement<any>) => MuiRenderResult;
49-
mount?: (node: React.ReactElement<any>) => ReactWrapper;
5046
only?: Array<keyof typeof fullSuite>;
5147
skip?: Array<keyof typeof fullSuite | 'classesRoot'>;
5248
testComponentsRootPropWith?: string;
@@ -66,9 +62,6 @@ export interface ConformanceOptions {
6662
testCustomVariant?: boolean;
6763
testVariantProps?: object;
6864
testLegacyComponentsProp?: boolean;
69-
wrapMount?: (
70-
mount: (node: React.ReactElement<any>) => ReactWrapper,
71-
) => (node: React.ReactElement<any>) => ReactWrapper;
7265
slots?: Record<string, SlotTestingOptions>;
7366
ThemeProvider?: React.ElementType;
7467
createTheme?: (arg: any) => any;
@@ -83,18 +76,6 @@ export interface ConformanceOptions {
8376
* - has the type of `inheritComponent`
8477
*/
8578

86-
/**
87-
* Returns the component with the same constructor as `component` that renders
88-
* the outermost host
89-
*/
90-
export function findRootComponent(wrapper: ReactWrapper, component: string | React.ElementType) {
91-
const outermostHostElement = findOutermostIntrinsic(wrapper).getElement();
92-
93-
return wrapper.find(component as string).filterWhere((componentWrapper) => {
94-
return componentWrapper.contains(outermostHostElement);
95-
});
96-
}
97-
9879
export function randomStringValue() {
9980
return `s${Math.random().toString(36).slice(2)}`;
10081
}
@@ -1077,7 +1058,6 @@ function describeConformance(
10771058
only = Object.keys(fullSuite),
10781059
slots,
10791060
skip = [],
1080-
wrapMount,
10811061
} = getOptions();
10821062

10831063
let filteredTests = Object.keys(fullSuite).filter(
@@ -1092,21 +1072,11 @@ function describeConformance(
10921072
filteredTests = filteredTests.filter((testKey) => !slotBasedTests.includes(testKey));
10931073
}
10941074

1095-
const baseMount = createMount();
1096-
const mount = wrapMount !== undefined ? wrapMount(baseMount) : baseMount;
1097-
10981075
after(runAfterHook);
10991076

1100-
function getTestOptions(): ConformanceOptions {
1101-
return {
1102-
...getOptions(),
1103-
mount,
1104-
};
1105-
}
1106-
11071077
filteredTests.forEach((testKey) => {
11081078
const test = fullSuite[testKey];
1109-
test(minimalElement, getTestOptions);
1079+
test(minimalElement, getOptions);
11101080
});
11111081
}
11121082

packages/mui-joy/src/Menu/Menu.test.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ describe('Joy <Menu />', () => {
3131
<DropdownContext.Provider value={testContext}>{node}</DropdownContext.Provider>,
3232
);
3333
},
34-
wrapMount: (mount) => (node: React.ReactNode) => {
35-
const wrapper = mount(
36-
<DropdownContext.Provider value={testContext}>{node}</DropdownContext.Provider>,
37-
);
38-
return wrapper.childAt(0);
39-
},
4034
ThemeProvider,
4135
muiName: 'JoyMenu',
4236
refInstanceof: window.HTMLUListElement,

packages/mui-joy/src/MenuButton/MenuButton.test.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ describe('<MenuButton />', () => {
2222
describeConformance(<MenuButton />, () => ({
2323
classes,
2424
inheritComponent: 'button',
25-
wrapMount: (mount) => (node: React.ReactNode) => {
26-
const wrapper = mount(
27-
<DropdownContext.Provider value={testContext}>{node}</DropdownContext.Provider>,
28-
);
29-
return wrapper.childAt(0);
30-
},
3125
muiName: 'JoyMenuButton',
3226
refInstanceof: window.HTMLButtonElement,
3327
render: (node) => {

packages/mui-joy/src/MenuItem/MenuItem.test.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ describe('Joy <MenuItem />', () => {
3636
classes,
3737
inheritComponent: ListItemButton,
3838
render: (node) => render(<MenuProvider value={testContext}>{node}</MenuProvider>),
39-
wrapMount: (mount) => (node) => {
40-
const wrapper = mount(<MenuProvider value={testContext}>{node}</MenuProvider>);
41-
return wrapper.childAt(0);
42-
},
4339
ThemeProvider,
4440
refInstanceof: window.HTMLLIElement,
4541
testComponentPropWith: 'a',

packages/mui-joy/src/Tab/Tab.test.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ describe('Joy <Tab />', () => {
3232
classes,
3333
inheritComponent: 'button',
3434
render: (node) => render(<TabsProvider defaultValue={0}>{node}</TabsProvider>),
35-
wrapMount: (mount) => (node) => mount(<TabsProvider defaultValue={0}>{node}</TabsProvider>),
3635
ThemeProvider,
3736
muiName: 'JoyTab',
3837
refInstanceof: window.HTMLButtonElement,

packages/mui-joy/src/TabList/TabList.test.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ describe('Joy <TabList />', () => {
2121
classes,
2222
inheritComponent: 'div',
2323
render: (node) => render(<TabsProvider defaultValue={0}>{node}</TabsProvider>),
24-
wrapMount: (mount) => (node) => mount(<TabsProvider defaultValue={0}>{node}</TabsProvider>),
2524
ThemeProvider,
2625
muiName: 'JoyTabList',
2726
refInstanceof: window.HTMLDivElement,

packages/mui-joy/src/TabPanel/TabPanel.test.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ describe('Joy <TabPanel />', () => {
2020
classes,
2121
inheritComponent: 'div',
2222
render: (node) => render(<TabsProvider defaultValue={0}>{node}</TabsProvider>),
23-
wrapMount: (mount) => (node) => mount(<TabsProvider defaultValue={0}>{node}</TabsProvider>),
2423
ThemeProvider,
2524
muiName: 'JoyTabPanel',
2625
refInstanceof: window.HTMLDivElement,

packages/mui-lab/src/TabList/TabList.test.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ describe('<TabList />', () => {
1919
* @param {React.ReactNode} node
2020
*/
2121
render: (node) => render(<TabContext value="0">{node}</TabContext>),
22-
wrapMount: (mount) => (node) => {
23-
const wrapper = mount(<TabContext value="0">{node}</TabContext>);
24-
return wrapper.childAt(0);
25-
},
2622
refInstanceof: window.HTMLDivElement,
2723
// TODO: no idea why reactTestRenderer fails
2824
skip: [

packages/mui-lab/src/TabPanel/TabPanel.test.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ describe('<TabPanel />', () => {
1212
classes,
1313
inheritComponent: 'div',
1414
render: (node) => render(<TabContext value="0">{node}</TabContext>),
15-
wrapMount: (mount) => (node) => mount(<TabContext value="0">{node}</TabContext>),
1615
refInstanceof: window.HTMLDivElement,
1716
muiName: 'MuiTabPanel',
1817
skip: [

packages/mui-material/src/StepContent/StepContent.test.js

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,6 @@ describe('<StepContent />', () => {
1313
describeConformance(<StepContent />, () => ({
1414
classes,
1515
inheritComponent: 'div',
16-
wrapMount: (mount) => (node) => {
17-
const wrapper = mount(
18-
<Stepper orientation="vertical">
19-
<Step>{node}</Step>
20-
</Stepper>,
21-
);
22-
// `wrapper.find(Step)` tree.
23-
// "->" indicates the path we want
24-
// "n:" indicates the index
25-
// <ForwardRef(Step)>
26-
// -> 0: <MuiStepRoot>
27-
// 0: <Noop /> // from Emotion
28-
// -> 1: <div className="MuiStep-root">
29-
// -> 0: <MuiStepContentRoot />
30-
return wrapper.find(Step).childAt(0).childAt(1).childAt(0);
31-
},
3216
muiName: 'MuiStepContent',
3317
refInstanceof: window.HTMLDivElement,
3418
render: (node) => {

0 commit comments

Comments
 (0)