Skip to content

Commit

Permalink
[test] Conformance to handle wrapped elements (#24679)
Browse files Browse the repository at this point in the history
  • Loading branch information
natac13 authored Jan 30, 2021
1 parent 2b56383 commit e127eb9
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions test/utils/describeConformanceV5.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function testThemeDefaultProps(element, getOptions) {
describe('theme: default components', () => {
it("respect theme's defaultProps", () => {
const testProp = 'data-id';
const { muiName } = getOptions();
const { muiName, render: testRender = render } = getOptions();
const theme = createMuiTheme({
components: {
[muiName]: {
Expand All @@ -54,7 +54,7 @@ function testThemeDefaultProps(element, getOptions) {
},
});

const { container } = render(<ThemeProvider theme={theme}>{element}</ThemeProvider>);
const { container } = testRender(<ThemeProvider theme={theme}>{element}</ThemeProvider>);

expect(container.firstChild).to.have.attribute(testProp, 'testProp');
});
Expand All @@ -75,8 +75,7 @@ function testThemeStyleOverrides(element, getOptions) {
if (/jsdom/.test(window.navigator.userAgent)) {
this.skip();
}

const { muiName, testStateOverrides } = getOptions();
const { muiName, testStateOverrides, render: testRender = render } = getOptions();

if (!testStateOverrides) {
return;
Expand All @@ -96,13 +95,14 @@ function testThemeStyleOverrides(element, getOptions) {
},
});

const { container } = render(
const { container } = testRender(
<ThemeProvider theme={theme}>
{React.cloneElement(element, {
[testStateOverrides.prop]: testStateOverrides.value,
})}
</ThemeProvider>,
);

expect(container.firstChild).to.toHaveComputedStyle(testStyle);
});

Expand All @@ -111,7 +111,7 @@ function testThemeStyleOverrides(element, getOptions) {
this.skip();
}

const { muiName, testDeepOverrides } = getOptions();
const { muiName, testDeepOverrides, render: testRender = render } = getOptions();

const testStyle = {
marginTop: '13px',
Expand Down Expand Up @@ -139,7 +139,7 @@ function testThemeStyleOverrides(element, getOptions) {
},
});

const { container } = render(<ThemeProvider theme={theme}>{element}</ThemeProvider>);
const { container } = testRender(<ThemeProvider theme={theme}>{element}</ThemeProvider>);

expect(container.firstChild).to.toHaveComputedStyle(testStyle);

Expand All @@ -166,7 +166,7 @@ function testThemeStyleOverrides(element, getOptions) {
},
});

const { container: containerWithoutRootOverrides } = render(
const { container: containerWithoutRootOverrides } = testRender(
<ThemeProvider theme={themeWithoutRootOverrides}>{element}</ThemeProvider>,
);

Expand Down Expand Up @@ -198,7 +198,7 @@ function testThemeVariants(element, getOptions) {
this.skip();
}

const { muiName, testVariantProps = {} } = getOptions();
const { muiName, testVariantProps = {}, render: testRender = render } = getOptions();

const testStyle = {
marginTop: '13px',
Expand All @@ -217,7 +217,7 @@ function testThemeVariants(element, getOptions) {
},
});

const { getByTestId } = render(
const { getByTestId } = testRender(
<ThemeProvider theme={theme}>
{React.cloneElement(element, { ...testVariantProps, 'data-testid': 'with-props' })}
{React.cloneElement(element, { 'data-testid': 'without-props' })}
Expand Down

0 comments on commit e127eb9

Please sign in to comment.