Skip to content

Commit

Permalink
Merge branch 'master' into issue-44153-accordion
Browse files Browse the repository at this point in the history
  • Loading branch information
ZeeshanTamboli authored Nov 15, 2024
2 parents 685c2ce + f2cfee3 commit ea6bfcb
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions packages-internal/test-utils/src/describeConformance.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -617,12 +617,14 @@ function testThemeDefaultProps(
});

describe('default props provider:', () => {
it('respect custom default props', async function test() {
it('respect custom default props', async function test(t = {}) {
const testProp = 'data-id';
const { muiName, render, DefaultPropsProvider } = getOptions();

if (!DefaultPropsProvider) {
this.skip();
// @ts-ignore
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
this?.skip?.() ?? t?.skip();
}

if (!muiName) {
Expand All @@ -634,6 +636,7 @@ function testThemeDefaultProps(
}

const { container } = await render(
// @ts-expect-error we skip it above.
<DefaultPropsProvider
value={{
[muiName]: {
Expand Down

0 comments on commit ea6bfcb

Please sign in to comment.