From aac47e8c86c868f01c6da41c875b21846dc607cd Mon Sep 17 00:00:00 2001 From: Marija Najdova Date: Mon, 18 Jan 2021 08:53:07 +0100 Subject: [PATCH 1/5] init --- test/utils/describeConformanceV5.js | 34 +++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/test/utils/describeConformanceV5.js b/test/utils/describeConformanceV5.js index 7c39aa1e65e088..4f6a7f0139e530 100644 --- a/test/utils/describeConformanceV5.js +++ b/test/utils/describeConformanceV5.js @@ -31,15 +31,15 @@ function testComponentsProp(element, getOptions) { } /** - * Material-UI theme has a components section that allows specifying default props, overrides and variants + * Material-UI theme has a components section that allows specifying default props. * Components from @inheritComponent * @param {React.ReactElement} element * @param {() => ConformanceOptions} getOptions */ -function testThemeComponents(element, getOptions) { +function testThemeDefaultProps(element, getOptions) { const render = createClientRender(); - describe('theme: components', () => { + describe('theme: default components', () => { it("respect theme's defaultProps", () => { const { muiName, testThemeComponentsDefaultPropName: testProp = 'id' } = getOptions(); const theme = createMuiTheme({ @@ -56,7 +56,19 @@ function testThemeComponents(element, getOptions) { expect(container.firstChild).to.have.attribute(testProp, 'testProp'); }); + }); +} + +/** + * Material-UI theme has a components section that allows specifying style overrides. + * Components from @inheritComponent + * @param {React.ReactElement} element + * @param {() => ConformanceOptions} getOptions + */ +function testThemeStyleOverrides(element, getOptions) { + const render = createClientRender(); + describe('theme: style overrides', () => { it("respect theme's styleOverrides custom state", () => { const { muiName, testStateOverrides } = getOptions(); @@ -158,7 +170,19 @@ function testThemeComponents(element, getOptions) { }); } }); + }); +} + +/** + * Material-UI theme has a components section that allows specifying custom variants. + * Components from @inheritComponent + * @param {React.ReactElement} element + * @param {() => ConformanceOptions} getOptions + */ +function testThemeVariants(element, getOptions) { + const render = createClientRender(); + describe('theme: variants', () => { it("respect theme's variants", () => { const { muiName, testVariantProps = {} } = getOptions(); @@ -199,7 +223,9 @@ const fullSuite = { refForwarding: describeRef, rootClass: testRootClass, reactTestRenderer: testReactTestRenderer, - themeComponents: testThemeComponents, + themeDefaultProps: testThemeDefaultProps, + themeStyleOverrides: testThemeStyleOverrides, + themeVariants: testThemeVariants, }; /** From 1e3dfe538e6bc99ca667d404ca71097d179158f9 Mon Sep 17 00:00:00 2001 From: Marija Najdova Date: Mon, 18 Jan 2021 09:18:46 +0100 Subject: [PATCH 2/5] fixed ripple test --- packages/material-ui/src/ButtonBase/TouchRipple.test.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/material-ui/src/ButtonBase/TouchRipple.test.js b/packages/material-ui/src/ButtonBase/TouchRipple.test.js index c7d709b897dc48..d9d47d6571dcb7 100644 --- a/packages/material-ui/src/ButtonBase/TouchRipple.test.js +++ b/packages/material-ui/src/ButtonBase/TouchRipple.test.js @@ -48,7 +48,13 @@ describe('', () => { inheritComponent: 'span', mount, refInstanceof: Object, - skip: ['componentsProp', 'refForwarding', 'themeComponents'], + skip: [ + 'componentsProp', + 'refForwarding', + 'themeDefaultProps', + 'themeStyleOverrides', + 'themeVariants', + ], })); describe('prop: center', () => { From fb8f8f573584136dffd3c04015dd362930bc638d Mon Sep 17 00:00:00 2001 From: Marija Najdova Date: Mon, 18 Jan 2021 09:19:50 +0100 Subject: [PATCH 3/5] fixed touch ripple --- packages/material-ui/src/ButtonBase/TouchRipple.test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/material-ui/src/ButtonBase/TouchRipple.test.js b/packages/material-ui/src/ButtonBase/TouchRipple.test.js index d9d47d6571dcb7..15d5da97145017 100644 --- a/packages/material-ui/src/ButtonBase/TouchRipple.test.js +++ b/packages/material-ui/src/ButtonBase/TouchRipple.test.js @@ -51,7 +51,6 @@ describe('', () => { skip: [ 'componentsProp', 'refForwarding', - 'themeDefaultProps', 'themeStyleOverrides', 'themeVariants', ], From 87dfc6cc4929229a4a6cfc89c641377e57a853d2 Mon Sep 17 00:00:00 2001 From: Marija Najdova Date: Mon, 18 Jan 2021 09:36:21 +0100 Subject: [PATCH 4/5] Added muiName --- packages/material-ui/src/ButtonBase/TouchRipple.test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/material-ui/src/ButtonBase/TouchRipple.test.js b/packages/material-ui/src/ButtonBase/TouchRipple.test.js index 15d5da97145017..70bb9c5a4f8eb8 100644 --- a/packages/material-ui/src/ButtonBase/TouchRipple.test.js +++ b/packages/material-ui/src/ButtonBase/TouchRipple.test.js @@ -48,6 +48,7 @@ describe('', () => { inheritComponent: 'span', mount, refInstanceof: Object, + muiName: 'MuiTouchRipple', skip: [ 'componentsProp', 'refForwarding', From 46d183141cff1474b6a920bd5ba56357e1500dea Mon Sep 17 00:00:00 2001 From: Marija Najdova Date: Mon, 18 Jan 2021 09:49:51 +0100 Subject: [PATCH 5/5] prettier --- packages/material-ui/src/ButtonBase/TouchRipple.test.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/material-ui/src/ButtonBase/TouchRipple.test.js b/packages/material-ui/src/ButtonBase/TouchRipple.test.js index 70bb9c5a4f8eb8..c5754d8361cfc8 100644 --- a/packages/material-ui/src/ButtonBase/TouchRipple.test.js +++ b/packages/material-ui/src/ButtonBase/TouchRipple.test.js @@ -49,12 +49,7 @@ describe('', () => { mount, refInstanceof: Object, muiName: 'MuiTouchRipple', - skip: [ - 'componentsProp', - 'refForwarding', - 'themeStyleOverrides', - 'themeVariants', - ], + skip: ['componentsProp', 'refForwarding', 'themeStyleOverrides', 'themeVariants'], })); describe('prop: center', () => {