diff --git a/packages/mui-core/src/AutocompleteUnstyled/useAutocomplete.test.js b/packages/mui-core/src/AutocompleteUnstyled/useAutocomplete.test.js
index 2039083cd70686..92aa4f194144ca 100644
--- a/packages/mui-core/src/AutocompleteUnstyled/useAutocomplete.test.js
+++ b/packages/mui-core/src/AutocompleteUnstyled/useAutocomplete.test.js
@@ -1,10 +1,10 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, screen, ErrorBoundary, act, fireEvent } from 'test/utils';
+import { createRenderer, screen, ErrorBoundary, act, fireEvent } from 'test/utils';
import { useAutocomplete, createFilterOptions } from '@mui/core/AutocompleteUnstyled';
describe('useAutocomplete', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
it('should preserve DOM nodes of options when re-ordering', () => {
const Test = (props) => {
diff --git a/packages/mui-core/src/BackdropUnstyled/BackdropUnstyled.test.js b/packages/mui-core/src/BackdropUnstyled/BackdropUnstyled.test.js
index 1f1695a9534b8f..1ee586a2d8c25b 100644
--- a/packages/mui-core/src/BackdropUnstyled/BackdropUnstyled.test.js
+++ b/packages/mui-core/src/BackdropUnstyled/BackdropUnstyled.test.js
@@ -1,10 +1,10 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import BackdropUnstyled, { backdropUnstyledClasses as classes } from '@mui/core/BackdropUnstyled';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(
diff --git a/packages/mui-core/src/BadgeUnstyled/BadgeUnstyled.test.js b/packages/mui-core/src/BadgeUnstyled/BadgeUnstyled.test.js
index 83d4b2a56b7236..5a004f2e9660b1 100644
--- a/packages/mui-core/src/BadgeUnstyled/BadgeUnstyled.test.js
+++ b/packages/mui-core/src/BadgeUnstyled/BadgeUnstyled.test.js
@@ -1,10 +1,10 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import BadgeUnstyled, { badgeUnstyledClasses as classes } from '@mui/core/BadgeUnstyled';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(
diff --git a/packages/mui-core/src/ButtonUnstyled/ButtonUnstyled.test.tsx b/packages/mui-core/src/ButtonUnstyled/ButtonUnstyled.test.tsx
index f2f25b4a64709e..c212fe9db50dba 100644
--- a/packages/mui-core/src/ButtonUnstyled/ButtonUnstyled.test.tsx
+++ b/packages/mui-core/src/ButtonUnstyled/ButtonUnstyled.test.tsx
@@ -1,11 +1,11 @@
import * as React from 'react';
-import { createMount, createClientRender, describeConformanceUnstyled } from 'test/utils';
+import { createMount, createRenderer, describeConformanceUnstyled } from 'test/utils';
import ButtonUnstyled, { buttonUnstyledClasses } from '@mui/core/ButtonUnstyled';
import { expect } from 'chai';
describe('', () => {
const mount = createMount();
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformanceUnstyled(, () => ({
inheritComponent: 'button',
diff --git a/packages/mui-core/src/ButtonUnstyled/useButton.test.tsx b/packages/mui-core/src/ButtonUnstyled/useButton.test.tsx
index 5650d6d931a794..86e45201932589 100644
--- a/packages/mui-core/src/ButtonUnstyled/useButton.test.tsx
+++ b/packages/mui-core/src/ButtonUnstyled/useButton.test.tsx
@@ -1,11 +1,11 @@
import * as React from 'react';
import { useButton } from '@mui/core/ButtonUnstyled';
-import { createClientRender, fireEvent } from 'test/utils';
+import { createRenderer, fireEvent } from 'test/utils';
import { expect } from 'chai';
import { spy } from 'sinon';
describe('useButton', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describe('state: active', () => {
describe('when using a button element', () => {
diff --git a/packages/mui-core/src/ClickAwayListener/ClickAwayListener.test.js b/packages/mui-core/src/ClickAwayListener/ClickAwayListener.test.js
index ce45da4c57cba4..22371a0f77c585 100644
--- a/packages/mui-core/src/ClickAwayListener/ClickAwayListener.test.js
+++ b/packages/mui-core/src/ClickAwayListener/ClickAwayListener.test.js
@@ -2,7 +2,7 @@ import * as React from 'react';
import * as ReactDOM from 'react-dom';
import { expect } from 'chai';
import { spy, useFakeTimers } from 'sinon';
-import { act, createClientRender, fireEvent, fireDiscreteEvent, screen } from 'test/utils';
+import { act, createRenderer, fireEvent, fireDiscreteEvent, screen } from 'test/utils';
import Portal from '@mui/core/Portal';
import ClickAwayListener from '@mui/core/ClickAwayListener';
@@ -19,7 +19,7 @@ describe('', () => {
clock.restore();
});
- const clientRender = createClientRender();
+ const { render: clientRender } = createRenderer();
/**
* @type {typeof plainRender extends (...args: infer T) => any ? T : enver} args
*
diff --git a/packages/mui-core/src/FormControlUnstyled/FormControlUnstyled.test.tsx b/packages/mui-core/src/FormControlUnstyled/FormControlUnstyled.test.tsx
index 784dad46666b82..9f7780ad056274 100644
--- a/packages/mui-core/src/FormControlUnstyled/FormControlUnstyled.test.tsx
+++ b/packages/mui-core/src/FormControlUnstyled/FormControlUnstyled.test.tsx
@@ -1,12 +1,7 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
-import {
- createMount,
- createClientRender,
- describeConformanceUnstyled,
- fireEvent,
-} from 'test/utils';
+import { createMount, createRenderer, describeConformanceUnstyled, fireEvent } from 'test/utils';
import FormControlUnstyled, {
formControlUnstyledClasses,
useFormControlUnstyled,
@@ -14,7 +9,7 @@ import FormControlUnstyled, {
describe('', () => {
const mount = createMount();
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformanceUnstyled(, () => ({
inheritComponent: 'div',
diff --git a/packages/mui-core/src/InputUnstyled/InputUnstyled.test.tsx b/packages/mui-core/src/InputUnstyled/InputUnstyled.test.tsx
index 9f6f3b427561d2..6027b56f455488 100644
--- a/packages/mui-core/src/InputUnstyled/InputUnstyled.test.tsx
+++ b/packages/mui-core/src/InputUnstyled/InputUnstyled.test.tsx
@@ -1,10 +1,10 @@
import * as React from 'react';
-import { createMount, createClientRender, describeConformanceUnstyled } from 'test/utils';
+import { createMount, createRenderer, describeConformanceUnstyled } from 'test/utils';
import InputUnstyled, { inputUnstyledClasses } from '@mui/core/InputUnstyled';
describe('', () => {
const mount = createMount();
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformanceUnstyled(, () => ({
inheritComponent: 'div',
diff --git a/packages/mui-core/src/ModalUnstyled/ModalUnstyled.test.js b/packages/mui-core/src/ModalUnstyled/ModalUnstyled.test.js
index 13889dce9dfd91..99f6b3e8dc13cd 100644
--- a/packages/mui-core/src/ModalUnstyled/ModalUnstyled.test.js
+++ b/packages/mui-core/src/ModalUnstyled/ModalUnstyled.test.js
@@ -1,10 +1,10 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import ModalUnstyled, { modalUnstyledClasses as classes } from '@mui/core/ModalUnstyled';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
let savedBodyStyle;
before(() => {
diff --git a/packages/mui-core/src/NoSsr/NoSsr.test.js b/packages/mui-core/src/NoSsr/NoSsr.test.js
index 49a197210f3ff4..55f3e056dce285 100644
--- a/packages/mui-core/src/NoSsr/NoSsr.test.js
+++ b/packages/mui-core/src/NoSsr/NoSsr.test.js
@@ -1,10 +1,10 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, createServerRender } from 'test/utils';
+import { createRenderer, createServerRender } from 'test/utils';
import NoSsr from '@mui/core/NoSsr';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
const serverRender = createServerRender({ expectUseLayoutEffectWarning: true });
describe('server-side rendering', () => {
diff --git a/packages/mui-core/src/Popper/Popper.test.js b/packages/mui-core/src/Popper/Popper.test.js
index 359d6b178751c2..49d9daa68a1dc4 100644
--- a/packages/mui-core/src/Popper/Popper.test.js
+++ b/packages/mui-core/src/Popper/Popper.test.js
@@ -2,14 +2,14 @@ import * as React from 'react';
import { expect } from 'chai';
import { useFakeTimers } from 'sinon';
import PropTypes from 'prop-types';
-import { describeConformance, act, createClientRender, fireEvent, screen } from 'test/utils';
+import { describeConformance, act, createRenderer, fireEvent, screen } from 'test/utils';
import { ThemeProvider, createTheme } from '@mui/system';
import Grow from '@mui/material/Grow';
import Popper from '@mui/core/Popper';
describe('', () => {
let rtlTheme;
- const render = createClientRender();
+ const { render } = createRenderer();
const defaultProps = {
anchorEl: () => document.createElement('svg'),
children: Hello World,
diff --git a/packages/mui-core/src/Portal/Portal.test.js b/packages/mui-core/src/Portal/Portal.test.js
index 2a3c5fc8453fc4..bf06e56512ac02 100644
--- a/packages/mui-core/src/Portal/Portal.test.js
+++ b/packages/mui-core/src/Portal/Portal.test.js
@@ -1,12 +1,12 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
-import { createServerRender, createClientRender } from 'test/utils';
+import { createServerRender, createRenderer } from 'test/utils';
import Portal from './Portal';
describe('', () => {
const serverRender = createServerRender({ expectUseLayoutEffectWarning: true });
- const render = createClientRender();
+ const { render } = createRenderer();
describe('server-side', () => {
before(function beforeHook() {
diff --git a/packages/mui-core/src/SliderUnstyled/SliderUnstyled.test.js b/packages/mui-core/src/SliderUnstyled/SliderUnstyled.test.js
index e52b16d8bf62df..92493d1a591383 100644
--- a/packages/mui-core/src/SliderUnstyled/SliderUnstyled.test.js
+++ b/packages/mui-core/src/SliderUnstyled/SliderUnstyled.test.js
@@ -2,13 +2,7 @@ import SliderUnstyled, { sliderUnstyledClasses as classes } from '@mui/core/Slid
import { expect } from 'chai';
import * as React from 'react';
import { spy, stub } from 'sinon';
-import {
- createClientRender,
- createMount,
- describeConformance,
- fireEvent,
- screen,
-} from 'test/utils';
+import { createRenderer, createMount, describeConformance, fireEvent, screen } from 'test/utils';
describe('', () => {
before(function beforeHook() {
@@ -18,7 +12,7 @@ describe('', () => {
});
const mount = createMount();
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-core/src/SwitchUnstyled/SwitchUnstyled.test.tsx b/packages/mui-core/src/SwitchUnstyled/SwitchUnstyled.test.tsx
index dd674332ba461e..3a5c308a56816a 100644
--- a/packages/mui-core/src/SwitchUnstyled/SwitchUnstyled.test.tsx
+++ b/packages/mui-core/src/SwitchUnstyled/SwitchUnstyled.test.tsx
@@ -1,11 +1,11 @@
import * as React from 'react';
-import { createMount, createClientRender, describeConformanceUnstyled } from 'test/utils';
+import { createMount, createRenderer, describeConformanceUnstyled } from 'test/utils';
import SwitchUnstyled, { SwitchState, switchUnstyledClasses } from '@mui/core/SwitchUnstyled';
import { expect } from 'chai';
describe('', () => {
const mount = createMount();
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformanceUnstyled(, () => ({
inheritComponent: 'span',
diff --git a/packages/mui-core/src/SwitchUnstyled/useSwitch.test.tsx b/packages/mui-core/src/SwitchUnstyled/useSwitch.test.tsx
index bc1835af2c4e7b..51971425078b94 100644
--- a/packages/mui-core/src/SwitchUnstyled/useSwitch.test.tsx
+++ b/packages/mui-core/src/SwitchUnstyled/useSwitch.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
import { spy } from 'sinon';
import {
act,
- createClientRender,
+ createRenderer,
focusVisible,
programmaticFocusTriggersFocusVisible,
screen,
@@ -12,7 +12,7 @@ import {
import { useSwitch, UseSwitchProps, UseSwitchResult } from '@mui/core/SwitchUnstyled';
describe('useSwitch', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
const invokeUseSwitch = (props: UseSwitchProps): UseSwitchResult => {
const ref = React.createRef();
function TestComponent() {
diff --git a/packages/mui-core/src/TextareaAutosize/TextareaAutosize.test.js b/packages/mui-core/src/TextareaAutosize/TextareaAutosize.test.js
index 190e8aa4a689db..06242833003dca 100644
--- a/packages/mui-core/src/TextareaAutosize/TextareaAutosize.test.js
+++ b/packages/mui-core/src/TextareaAutosize/TextareaAutosize.test.js
@@ -4,14 +4,14 @@ import sinon, { spy, stub, useFakeTimers } from 'sinon';
import {
describeConformance,
act,
- createClientRender,
+ createRenderer,
fireEvent,
strictModeDoubleLoggingSupressed,
} from 'test/utils';
import TextareaAutosize from '@mui/core/TextareaAutosize';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
inheritComponent: 'textarea',
diff --git a/packages/mui-core/src/Unstable_TrapFocus/Unstable_TrapFocus.test.js b/packages/mui-core/src/Unstable_TrapFocus/Unstable_TrapFocus.test.js
index 2b6c53a9eb3151..7f64ff9faadea1 100644
--- a/packages/mui-core/src/Unstable_TrapFocus/Unstable_TrapFocus.test.js
+++ b/packages/mui-core/src/Unstable_TrapFocus/Unstable_TrapFocus.test.js
@@ -2,12 +2,12 @@ import * as React from 'react';
import * as ReactDOM from 'react-dom';
import { useFakeTimers } from 'sinon';
import { expect } from 'chai';
-import { act, createClientRender, screen } from 'test/utils';
+import { act, createRenderer, screen } from 'test/utils';
import TrapFocus from '@mui/core/Unstable_TrapFocus';
import Portal from '@mui/core/Portal';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
let initialFocus = null;
diff --git a/packages/mui-joy/src/styles/CssVarsProvider.test.tsx b/packages/mui-joy/src/styles/CssVarsProvider.test.tsx
index c3dda97d7bd701..8b16f42e83c7c7 100644
--- a/packages/mui-joy/src/styles/CssVarsProvider.test.tsx
+++ b/packages/mui-joy/src/styles/CssVarsProvider.test.tsx
@@ -1,12 +1,12 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, screen } from 'test/utils';
+import { createRenderer, screen } from 'test/utils';
import { styled, CssVarsProvider, useTheme } from '@mui/joy/styles';
import defaultTheme from './defaultTheme';
describe('[Joy] CssVarsProvider', () => {
let originalMatchmedia: typeof window.matchMedia;
- const render = createClientRender();
+ const { render } = createRenderer();
const storage: Record = {};
beforeEach(() => {
originalMatchmedia = window.matchMedia;
diff --git a/packages/mui-joy/src/styles/ThemeProvider.test.tsx b/packages/mui-joy/src/styles/ThemeProvider.test.tsx
index dc452f11528cb0..e8746202695149 100644
--- a/packages/mui-joy/src/styles/ThemeProvider.test.tsx
+++ b/packages/mui-joy/src/styles/ThemeProvider.test.tsx
@@ -1,11 +1,11 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender } from 'test/utils';
+import { createRenderer } from 'test/utils';
import { ThemeProvider, useTheme } from '@mui/joy/styles';
import defaultTheme from './defaultTheme';
describe('[Joy] ThemeProvider', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
it('can render component without ThemeProvider', () => {
const Text = () => {
const theme = useTheme();
diff --git a/packages/mui-joy/src/styles/styled.test.tsx b/packages/mui-joy/src/styles/styled.test.tsx
index 313bb1b848684c..49cf1f3fb49f17 100644
--- a/packages/mui-joy/src/styles/styled.test.tsx
+++ b/packages/mui-joy/src/styles/styled.test.tsx
@@ -1,13 +1,13 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender } from 'test/utils';
+import { createRenderer } from 'test/utils';
import { ThemeProvider, styled } from '@mui/joy/styles';
import defaultTheme from './defaultTheme';
const toPixel = (val: string | number | undefined) => (typeof val === 'number' ? `${val}px` : val);
describe('[Joy] styled', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
it('use defaultTheme given no ThemeProvider', function test() {
if (/jsdom/.test(window.navigator.userAgent)) {
this.skip();
diff --git a/packages/mui-lab/src/CalendarPickerSkeleton/CalendarPickerSkeleton.test.tsx b/packages/mui-lab/src/CalendarPickerSkeleton/CalendarPickerSkeleton.test.tsx
index cf7d0104ff87d1..608b62b726d00b 100644
--- a/packages/mui-lab/src/CalendarPickerSkeleton/CalendarPickerSkeleton.test.tsx
+++ b/packages/mui-lab/src/CalendarPickerSkeleton/CalendarPickerSkeleton.test.tsx
@@ -1,11 +1,11 @@
import * as React from 'react';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import CalendarPickerSkeleton, {
calendarPickerSkeletonClasses as classes,
} from '@mui/lab/CalendarPickerSkeleton';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-lab/src/LoadingButton/LoadingButton.test.js b/packages/mui-lab/src/LoadingButton/LoadingButton.test.js
index 0a109419513afa..1132e7db790e87 100644
--- a/packages/mui-lab/src/LoadingButton/LoadingButton.test.js
+++ b/packages/mui-lab/src/LoadingButton/LoadingButton.test.js
@@ -1,11 +1,11 @@
import * as React from 'react';
-import { createClientRender, describeConformance, screen } from 'test/utils';
+import { createRenderer, describeConformance, screen } from 'test/utils';
import { expect } from 'chai';
import Button from '@mui/material/Button';
import LoadingButton, { loadingButtonClasses as classes } from '@mui/lab/LoadingButton';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(Conformance?, () => ({
classes,
diff --git a/packages/mui-lab/src/Masonry/Masonry.test.js b/packages/mui-lab/src/Masonry/Masonry.test.js
index bfa3354b21d9bb..af7b5bbd266972 100644
--- a/packages/mui-lab/src/Masonry/Masonry.test.js
+++ b/packages/mui-lab/src/Masonry/Masonry.test.js
@@ -1,12 +1,12 @@
import * as React from 'react';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import Masonry, { masonryClasses as classes } from '@mui/lab/Masonry';
import { expect } from 'chai';
import { createTheme } from '@mui/material/styles';
import { getStyle, parseToNumber } from './Masonry';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(
diff --git a/packages/mui-lab/src/TabList/TabList.test.js b/packages/mui-lab/src/TabList/TabList.test.js
index 62c1c5d9863a57..8a99d65603c5b1 100644
--- a/packages/mui-lab/src/TabList/TabList.test.js
+++ b/packages/mui-lab/src/TabList/TabList.test.js
@@ -1,14 +1,14 @@
// @ts-check
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import Tab from '@mui/material/Tab';
import Tabs, { tabsClasses as classes } from '@mui/material/Tabs';
import TabList from './TabList';
import TabContext from '../TabContext';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
// @ts-ignore mui name does not exist for this component
describeConformance(, () => ({
diff --git a/packages/mui-lab/src/TabPanel/TabPanel.test.tsx b/packages/mui-lab/src/TabPanel/TabPanel.test.tsx
index d0b8e09d7e95a7..47908a1d1cd14b 100644
--- a/packages/mui-lab/src/TabPanel/TabPanel.test.tsx
+++ b/packages/mui-lab/src/TabPanel/TabPanel.test.tsx
@@ -1,11 +1,11 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import TabPanel, { tabPanelClasses as classes } from '@mui/lab/TabPanel';
import TabContext from '../TabContext';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-lab/src/Timeline/Timeline.test.tsx b/packages/mui-lab/src/Timeline/Timeline.test.tsx
index bec8be256ebaa5..ba44b0cecb2824 100644
--- a/packages/mui-lab/src/Timeline/Timeline.test.tsx
+++ b/packages/mui-lab/src/Timeline/Timeline.test.tsx
@@ -1,9 +1,9 @@
import * as React from 'react';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import Timeline, { timelineClasses as classes } from '@mui/lab/Timeline';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-lab/src/TimelineConnector/TimelineConnector.test.js b/packages/mui-lab/src/TimelineConnector/TimelineConnector.test.js
index a1821c7e0d407f..d6e9bf06b43172 100644
--- a/packages/mui-lab/src/TimelineConnector/TimelineConnector.test.js
+++ b/packages/mui-lab/src/TimelineConnector/TimelineConnector.test.js
@@ -1,9 +1,9 @@
import * as React from 'react';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import TimelineConnector, { timelineConnectorClasses as classes } from '@mui/lab/TimelineConnector';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-lab/src/TimelineContent/TimelineContent.test.js b/packages/mui-lab/src/TimelineContent/TimelineContent.test.js
index 3a92876c5e64e5..7af431ccf15dcf 100644
--- a/packages/mui-lab/src/TimelineContent/TimelineContent.test.js
+++ b/packages/mui-lab/src/TimelineContent/TimelineContent.test.js
@@ -1,13 +1,13 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import Typography from '@mui/material/Typography';
import Timeline from '@mui/lab/Timeline';
import TimelineItem from '@mui/lab/TimelineItem';
import TimelineContent, { timelineContentClasses as classes } from '@mui/lab/TimelineContent';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-lab/src/TimelineDot/TimelineDot.test.js b/packages/mui-lab/src/TimelineDot/TimelineDot.test.js
index 77c5da72c2b094..2e301df522812e 100644
--- a/packages/mui-lab/src/TimelineDot/TimelineDot.test.js
+++ b/packages/mui-lab/src/TimelineDot/TimelineDot.test.js
@@ -1,10 +1,10 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import TimelineDot, { timelineDotClasses as classes } from '@mui/lab/TimelineDot';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-lab/src/TimelineItem/TimelineItem.test.js b/packages/mui-lab/src/TimelineItem/TimelineItem.test.js
index acf74ae263a927..961d96a7e285a0 100644
--- a/packages/mui-lab/src/TimelineItem/TimelineItem.test.js
+++ b/packages/mui-lab/src/TimelineItem/TimelineItem.test.js
@@ -1,9 +1,9 @@
import * as React from 'react';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import TimelineItem, { timelineItemClasses as classes } from '@mui/lab/TimelineItem';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-lab/src/TimelineOppositeContent/TimelineOppositeContent.test.js b/packages/mui-lab/src/TimelineOppositeContent/TimelineOppositeContent.test.js
index 76e21e96d93231..d32183fdd18e0e 100644
--- a/packages/mui-lab/src/TimelineOppositeContent/TimelineOppositeContent.test.js
+++ b/packages/mui-lab/src/TimelineOppositeContent/TimelineOppositeContent.test.js
@@ -1,6 +1,6 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import Typography from '@mui/material/Typography';
import Timeline from '@mui/lab/Timeline';
import TimelineItem from '@mui/lab/TimelineItem';
@@ -9,7 +9,7 @@ import TimelineOppositeContent, {
} from '@mui/lab/TimelineOppositeContent';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-lab/src/TimelineSeparator/TimelineSeparator.test.js b/packages/mui-lab/src/TimelineSeparator/TimelineSeparator.test.js
index 961e58296303ab..22d69543ab8872 100644
--- a/packages/mui-lab/src/TimelineSeparator/TimelineSeparator.test.js
+++ b/packages/mui-lab/src/TimelineSeparator/TimelineSeparator.test.js
@@ -1,9 +1,9 @@
import * as React from 'react';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import TimelineSeparator, { timelineSeparatorClasses as classes } from '@mui/lab/TimelineSeparator';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-lab/src/TreeItem/TreeItem.test.js b/packages/mui-lab/src/TreeItem/TreeItem.test.js
index 595caae9e52a8b..cd0d01b7612c0f 100644
--- a/packages/mui-lab/src/TreeItem/TreeItem.test.js
+++ b/packages/mui-lab/src/TreeItem/TreeItem.test.js
@@ -6,7 +6,7 @@ import {
describeConformance,
act,
createEvent,
- createClientRender,
+ createRenderer,
fireEvent,
screen,
} from 'test/utils';
@@ -14,7 +14,7 @@ import TreeView from '@mui/lab/TreeView';
import TreeItem, { treeItemClasses as classes } from '@mui/lab/TreeItem';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-lab/src/TreeView/TreeView.test.js b/packages/mui-lab/src/TreeView/TreeView.test.js
index 64b14d8427016b..7563a827813287 100644
--- a/packages/mui-lab/src/TreeView/TreeView.test.js
+++ b/packages/mui-lab/src/TreeView/TreeView.test.js
@@ -3,7 +3,7 @@ import { expect } from 'chai';
import { spy } from 'sinon';
import {
act,
- createClientRender,
+ createRenderer,
ErrorBoundary,
fireEvent,
screen,
@@ -14,7 +14,7 @@ import TreeView, { treeViewClasses as classes } from '@mui/lab/TreeView';
import TreeItem from '@mui/lab/TreeItem';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-lab/src/internal/pickers/test-utils.tsx b/packages/mui-lab/src/internal/pickers/test-utils.tsx
index bb85ad3445a672..0db97a1def8568 100644
--- a/packages/mui-lab/src/internal/pickers/test-utils.tsx
+++ b/packages/mui-lab/src/internal/pickers/test-utils.tsx
@@ -1,6 +1,6 @@
import * as React from 'react';
import { parseISO } from 'date-fns';
-import { createClientRender, fireEvent, screen } from 'test/utils';
+import { createRenderer, fireEvent, screen } from 'test/utils';
import { TransitionProps } from '@mui/material/transitions';
import AdapterDateFns from '@mui/lab/AdapterDateFns';
import LocalizationProvider from '@mui/lab/LocalizationProvider';
@@ -54,7 +54,7 @@ export function createPickerRender({
locale,
...renderOptions
}: PickerRenderOptions & import('test/utils').RenderOptions = {}) {
- const clientRender = createClientRender(renderOptions);
+ const { render: clientRender } = createRenderer(renderOptions);
function Wrapper({ children }: { children?: React.ReactNode }) {
return (
diff --git a/packages/mui-lab/test/integration/Tabs.test.js b/packages/mui-lab/test/integration/Tabs.test.js
index c58f692eabea29..14537af5e135c3 100644
--- a/packages/mui-lab/test/integration/Tabs.test.js
+++ b/packages/mui-lab/test/integration/Tabs.test.js
@@ -1,13 +1,13 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender } from 'test/utils';
+import { createRenderer } from 'test/utils';
import Tab from '@mui/material/Tab';
import TabContext from '@mui/lab/TabContext';
import TabList from '@mui/lab/TabList';
import TabPanel from '@mui/lab/TabPanel';
describe(' integration', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
it('wires up aria attributes', () => {
const { getAllByRole, setProps } = render(
diff --git a/packages/mui-material-next/src/Button/Button.test.js b/packages/mui-material-next/src/Button/Button.test.js
index b52d38b1d68236..622081a026a40b 100644
--- a/packages/mui-material-next/src/Button/Button.test.js
+++ b/packages/mui-material-next/src/Button/Button.test.js
@@ -3,7 +3,7 @@ import { expect } from 'chai';
import {
describeConformance,
act,
- createClientRender,
+ createRenderer,
fireEvent,
createServerRender,
} from 'test/utils';
@@ -11,7 +11,7 @@ import Button, { buttonClasses as classes } from '@mui/material/Button';
import ButtonBase from '@mui/material/ButtonBase';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material-next/src/Button/Ripple.test.js b/packages/mui-material-next/src/Button/Ripple.test.js
index 8a1ba50a2d2466..48b8c719085ec0 100644
--- a/packages/mui-material-next/src/Button/Ripple.test.js
+++ b/packages/mui-material-next/src/Button/Ripple.test.js
@@ -1,12 +1,12 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy, useFakeTimers } from 'sinon';
-import { createClientRender } from 'test/utils';
+import { createRenderer } from 'test/utils';
import Ripple from './Ripple';
import classes from './touchRippleClasses';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
it('should have the ripple className', () => {
const { container } = render(
diff --git a/packages/mui-material-next/src/Button/TouchRipple.test.js b/packages/mui-material-next/src/Button/TouchRipple.test.js
index 3a82f4a85374dd..8dc3ee8dd53872 100644
--- a/packages/mui-material-next/src/Button/TouchRipple.test.js
+++ b/packages/mui-material-next/src/Button/TouchRipple.test.js
@@ -1,13 +1,13 @@
import * as React from 'react';
import { useFakeTimers } from 'sinon';
import { expect } from 'chai';
-import { describeConformance, act, createClientRender } from 'test/utils';
+import { describeConformance, act, createRenderer } from 'test/utils';
import TouchRipple, { DELAY_RIPPLE } from './TouchRipple';
const cb = () => {};
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
/**
* @param {object} other props to spread to TouchRipple
diff --git a/packages/mui-material-next/src/Input/Input.test.js b/packages/mui-material-next/src/Input/Input.test.js
index 502f1c05d4bf32..6a5ec582f078ca 100644
--- a/packages/mui-material-next/src/Input/Input.test.js
+++ b/packages/mui-material-next/src/Input/Input.test.js
@@ -2,11 +2,11 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import { expect } from 'chai';
import { spy } from 'sinon';
-import { describeConformance, act, createClientRender, fireEvent, screen } from 'test/utils';
+import { describeConformance, act, createRenderer, fireEvent, screen } from 'test/utils';
import Input, { inputClasses as classes } from '@mui/material-next/Input';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/Accordion/Accordion.test.js b/packages/mui-material/src/Accordion/Accordion.test.js
index 9e0582836cb9ad..9f8bfb034fca19 100644
--- a/packages/mui-material/src/Accordion/Accordion.test.js
+++ b/packages/mui-material/src/Accordion/Accordion.test.js
@@ -2,13 +2,13 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import { expect } from 'chai';
import { spy } from 'sinon';
-import { describeConformance, createClientRender, fireEvent } from 'test/utils';
+import { describeConformance, createRenderer, fireEvent } from 'test/utils';
import Accordion, { accordionClasses as classes } from '@mui/material/Accordion';
import Paper from '@mui/material/Paper';
import AccordionSummary from '@mui/material/AccordionSummary';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
const minimalChildren = [Header];
diff --git a/packages/mui-material/src/AccordionActions/AccordionActions.test.js b/packages/mui-material/src/AccordionActions/AccordionActions.test.js
index a1ac5f4d595df6..03ab384751d557 100644
--- a/packages/mui-material/src/AccordionActions/AccordionActions.test.js
+++ b/packages/mui-material/src/AccordionActions/AccordionActions.test.js
@@ -1,11 +1,11 @@
import * as React from 'react';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import AccordionActions, {
accordionActionsClasses as classes,
} from '@mui/material/AccordionActions';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(Conformance, () => ({
classes,
diff --git a/packages/mui-material/src/AccordionDetails/AccordionDetails.test.js b/packages/mui-material/src/AccordionDetails/AccordionDetails.test.js
index 05ab21b8d30e11..08d38664921cbd 100644
--- a/packages/mui-material/src/AccordionDetails/AccordionDetails.test.js
+++ b/packages/mui-material/src/AccordionDetails/AccordionDetails.test.js
@@ -1,12 +1,12 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import AccordionDetails, {
accordionDetailsClasses as classes,
} from '@mui/material/AccordionDetails';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(Conformance, () => ({
classes,
diff --git a/packages/mui-material/src/AccordionSummary/AccordionSummary.test.js b/packages/mui-material/src/AccordionSummary/AccordionSummary.test.js
index 8230b9961afdec..10f24117c82498 100644
--- a/packages/mui-material/src/AccordionSummary/AccordionSummary.test.js
+++ b/packages/mui-material/src/AccordionSummary/AccordionSummary.test.js
@@ -1,7 +1,7 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
-import { describeConformance, act, createClientRender, fireEvent } from 'test/utils';
+import { describeConformance, act, createRenderer, fireEvent } from 'test/utils';
import AccordionSummary, {
accordionSummaryClasses as classes,
} from '@mui/material/AccordionSummary';
@@ -9,7 +9,7 @@ import Accordion from '@mui/material/Accordion';
import ButtonBase from '@mui/material/ButtonBase';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/Alert/Alert.test.js b/packages/mui-material/src/Alert/Alert.test.js
index 182c4fd7592d50..08ff9e8c1ad49a 100644
--- a/packages/mui-material/src/Alert/Alert.test.js
+++ b/packages/mui-material/src/Alert/Alert.test.js
@@ -1,10 +1,10 @@
import * as React from 'react';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import Alert, { alertClasses as classes } from '@mui/material/Alert';
import Paper from '@mui/material/Paper';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/AlertTitle/AlertTitle.test.js b/packages/mui-material/src/AlertTitle/AlertTitle.test.js
index d84adb80c14b92..d4485944128773 100644
--- a/packages/mui-material/src/AlertTitle/AlertTitle.test.js
+++ b/packages/mui-material/src/AlertTitle/AlertTitle.test.js
@@ -1,9 +1,9 @@
import * as React from 'react';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import AlertTitle, { alertTitleClasses as classes } from '@mui/material/AlertTitle';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/AppBar/AppBar.test.js b/packages/mui-material/src/AppBar/AppBar.test.js
index 923e8e7a01a097..066f137f40c5c3 100644
--- a/packages/mui-material/src/AppBar/AppBar.test.js
+++ b/packages/mui-material/src/AppBar/AppBar.test.js
@@ -1,11 +1,11 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, describeConformance, screen } from 'test/utils';
+import { createRenderer, describeConformance, screen } from 'test/utils';
import AppBar, { appBarClasses as classes } from '@mui/material/AppBar';
import Paper from '@mui/material/Paper';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(Conformance?, () => ({
classes,
diff --git a/packages/mui-material/src/Autocomplete/Autocomplete.test.js b/packages/mui-material/src/Autocomplete/Autocomplete.test.js
index 5172761048aa95..26b9f892d58016 100644
--- a/packages/mui-material/src/Autocomplete/Autocomplete.test.js
+++ b/packages/mui-material/src/Autocomplete/Autocomplete.test.js
@@ -4,7 +4,7 @@ import { expect } from 'chai';
import {
describeConformance,
act,
- createClientRender,
+ createRenderer,
fireEvent,
screen,
strictModeDoubleLoggingSupressed,
@@ -34,7 +34,7 @@ function checkHighlightIs(listbox, expected) {
}
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(
} />,
diff --git a/packages/mui-material/src/Avatar/Avatar.test.js b/packages/mui-material/src/Avatar/Avatar.test.js
index 733c3ea747affb..eb00cf9630e239 100644
--- a/packages/mui-material/src/Avatar/Avatar.test.js
+++ b/packages/mui-material/src/Avatar/Avatar.test.js
@@ -1,12 +1,12 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, fireEvent, describeConformance } from 'test/utils';
+import { createRenderer, fireEvent, describeConformance } from 'test/utils';
import { spy } from 'sinon';
import Avatar, { avatarClasses as classes } from '@mui/material/Avatar';
import CancelIcon from '../internal/svg-icons/Cancel';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/AvatarGroup/AvatarGroup.test.js b/packages/mui-material/src/AvatarGroup/AvatarGroup.test.js
index ee26bf0809e438..8f2a57806dc7a7 100644
--- a/packages/mui-material/src/AvatarGroup/AvatarGroup.test.js
+++ b/packages/mui-material/src/AvatarGroup/AvatarGroup.test.js
@@ -1,11 +1,11 @@
import * as React from 'react';
import { expect } from 'chai';
-import { describeConformance, createClientRender } from 'test/utils';
+import { describeConformance, createRenderer } from 'test/utils';
import Avatar from '@mui/material/Avatar';
import AvatarGroup, { avatarGroupClasses as classes } from '@mui/material/AvatarGroup';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(
diff --git a/packages/mui-material/src/Backdrop/Backdrop.test.js b/packages/mui-material/src/Backdrop/Backdrop.test.js
index f442b5c997ec60..f4eb4f193353c1 100644
--- a/packages/mui-material/src/Backdrop/Backdrop.test.js
+++ b/packages/mui-material/src/Backdrop/Backdrop.test.js
@@ -1,12 +1,12 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy, useFakeTimers } from 'sinon';
-import { createClientRender, describeConformance, act } from 'test/utils';
+import { createRenderer, describeConformance, act } from 'test/utils';
import Backdrop, { backdropClasses as classes } from '@mui/material/Backdrop';
import Fade from '@mui/material/Fade';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/Badge/Badge.test.js b/packages/mui-material/src/Badge/Badge.test.js
index 233e9602d276a1..44f8bdcc9cbc52 100644
--- a/packages/mui-material/src/Badge/Badge.test.js
+++ b/packages/mui-material/src/Badge/Badge.test.js
@@ -1,7 +1,7 @@
import * as React from 'react';
import { expect } from 'chai';
import { BadgeUnstyled } from '@mui/core';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import Badge, { badgeClasses as classes } from '@mui/material/Badge';
function findBadge(container) {
@@ -9,7 +9,7 @@ function findBadge(container) {
}
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
const defaultProps = {
children: (
diff --git a/packages/mui-material/src/BottomNavigation/BottomNavigation.test.js b/packages/mui-material/src/BottomNavigation/BottomNavigation.test.js
index 4b5171301b7a17..b92cd86fab4cde 100755
--- a/packages/mui-material/src/BottomNavigation/BottomNavigation.test.js
+++ b/packages/mui-material/src/BottomNavigation/BottomNavigation.test.js
@@ -1,7 +1,7 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
-import { describeConformance, createClientRender, fireEvent } from 'test/utils';
+import { describeConformance, createRenderer, fireEvent } from 'test/utils';
import BottomNavigation, {
bottomNavigationClasses as classes,
} from '@mui/material/BottomNavigation';
@@ -11,7 +11,7 @@ import BottomNavigationAction, {
import Icon from '@mui/material/Icon';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
const icon = restore;
const getBottomNavigation = (container) => container.firstChild;
diff --git a/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.test.js b/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.test.js
index 8e5d048112f065..70ecd2b506c3e6 100644
--- a/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.test.js
+++ b/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.test.js
@@ -1,14 +1,14 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
-import { describeConformance, createClientRender, within } from 'test/utils';
+import { describeConformance, createRenderer, within } from 'test/utils';
import BottomNavigationAction, {
bottomNavigationActionClasses as classes,
} from '@mui/material/BottomNavigationAction';
import ButtonBase from '@mui/material/ButtonBase';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/Box/Box.test.js b/packages/mui-material/src/Box/Box.test.js
index 69fb9fbbcc34a9..54951bcbf12463 100644
--- a/packages/mui-material/src/Box/Box.test.js
+++ b/packages/mui-material/src/Box/Box.test.js
@@ -1,12 +1,12 @@
import * as React from 'react';
import { expect } from 'chai';
import { createTheme, ThemeProvider } from '@mui/material/styles';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import Box from '@mui/material/Box';
import { unstable_ClassNameGenerator as ClassNameGenerator } from '@mui/material/utils';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
render,
diff --git a/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.test.js b/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.test.js
index 8951243cb0da98..141b323a513aa5 100644
--- a/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.test.js
+++ b/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.test.js
@@ -1,11 +1,11 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
-import { fireEvent, createClientRender } from 'test/utils';
+import { fireEvent, createRenderer } from 'test/utils';
import BreadcrumbCollapsed from './BreadcrumbCollapsed';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
it('should render an icon', () => {
const { container } = render();
diff --git a/packages/mui-material/src/Breadcrumbs/Breadcrumbs.test.js b/packages/mui-material/src/Breadcrumbs/Breadcrumbs.test.js
index c9363aee07c048..ddac76038b7426 100644
--- a/packages/mui-material/src/Breadcrumbs/Breadcrumbs.test.js
+++ b/packages/mui-material/src/Breadcrumbs/Breadcrumbs.test.js
@@ -3,14 +3,14 @@ import { expect } from 'chai';
import {
act,
describeConformance,
- createClientRender,
+ createRenderer,
screen,
strictModeDoubleLoggingSupressed,
} from 'test/utils';
import Breadcrumbs, { breadcrumbsClasses as classes } from '@mui/material/Breadcrumbs';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(Conformance?, () => ({
classes,
diff --git a/packages/mui-material/src/Button/Button.test.js b/packages/mui-material/src/Button/Button.test.js
index b52d38b1d68236..622081a026a40b 100644
--- a/packages/mui-material/src/Button/Button.test.js
+++ b/packages/mui-material/src/Button/Button.test.js
@@ -3,7 +3,7 @@ import { expect } from 'chai';
import {
describeConformance,
act,
- createClientRender,
+ createRenderer,
fireEvent,
createServerRender,
} from 'test/utils';
@@ -11,7 +11,7 @@ import Button, { buttonClasses as classes } from '@mui/material/Button';
import ButtonBase from '@mui/material/ButtonBase';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/ButtonBase/ButtonBase.test.js b/packages/mui-material/src/ButtonBase/ButtonBase.test.js
index 93fb4b5b59b9a0..f66e57d82d4abd 100644
--- a/packages/mui-material/src/ButtonBase/ButtonBase.test.js
+++ b/packages/mui-material/src/ButtonBase/ButtonBase.test.js
@@ -5,7 +5,7 @@ import { spy, stub } from 'sinon';
import {
describeConformance,
act,
- createClientRender,
+ createRenderer,
fireEvent,
screen,
focusVisible,
@@ -17,7 +17,7 @@ import { ThemeProvider, createTheme } from '@mui/material/styles';
import ButtonBase, { buttonBaseClasses as classes } from '@mui/material/ButtonBase';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
// https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/14156632/
let canFireDragEvents = true;
diff --git a/packages/mui-material/src/ButtonBase/Ripple.test.js b/packages/mui-material/src/ButtonBase/Ripple.test.js
index 8a1ba50a2d2466..48b8c719085ec0 100644
--- a/packages/mui-material/src/ButtonBase/Ripple.test.js
+++ b/packages/mui-material/src/ButtonBase/Ripple.test.js
@@ -1,12 +1,12 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy, useFakeTimers } from 'sinon';
-import { createClientRender } from 'test/utils';
+import { createRenderer } from 'test/utils';
import Ripple from './Ripple';
import classes from './touchRippleClasses';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
it('should have the ripple className', () => {
const { container } = render(
diff --git a/packages/mui-material/src/ButtonBase/TouchRipple.test.js b/packages/mui-material/src/ButtonBase/TouchRipple.test.js
index 3a82f4a85374dd..8dc3ee8dd53872 100644
--- a/packages/mui-material/src/ButtonBase/TouchRipple.test.js
+++ b/packages/mui-material/src/ButtonBase/TouchRipple.test.js
@@ -1,13 +1,13 @@
import * as React from 'react';
import { useFakeTimers } from 'sinon';
import { expect } from 'chai';
-import { describeConformance, act, createClientRender } from 'test/utils';
+import { describeConformance, act, createRenderer } from 'test/utils';
import TouchRipple, { DELAY_RIPPLE } from './TouchRipple';
const cb = () => {};
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
/**
* @param {object} other props to spread to TouchRipple
diff --git a/packages/mui-material/src/ButtonGroup/ButtonGroup.test.js b/packages/mui-material/src/ButtonGroup/ButtonGroup.test.js
index ff725c54749b36..a071e0b9353d4d 100644
--- a/packages/mui-material/src/ButtonGroup/ButtonGroup.test.js
+++ b/packages/mui-material/src/ButtonGroup/ButtonGroup.test.js
@@ -1,12 +1,12 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import ButtonGroup, { buttonGroupClasses as classes } from '@mui/material/ButtonGroup';
import Button from '@mui/material/Button';
import ButtonGroupContext from './ButtonGroupContext';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(
diff --git a/packages/mui-material/src/Card/Card.test.tsx b/packages/mui-material/src/Card/Card.test.tsx
index d46330e7932f32..11d7bb2a21c93a 100644
--- a/packages/mui-material/src/Card/Card.test.tsx
+++ b/packages/mui-material/src/Card/Card.test.tsx
@@ -1,11 +1,11 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import Card, { cardClasses as classes } from '@mui/material/Card';
import Paper from '@mui/material/Paper';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/CardActionArea/CardActionArea.test.js b/packages/mui-material/src/CardActionArea/CardActionArea.test.js
index 0c538417b349b3..d3d9db7d1ce49c 100644
--- a/packages/mui-material/src/CardActionArea/CardActionArea.test.js
+++ b/packages/mui-material/src/CardActionArea/CardActionArea.test.js
@@ -1,10 +1,10 @@
import * as React from 'react';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import CardActionArea, { cardActionAreaClasses as classes } from '@mui/material/CardActionArea';
import ButtonBase from '@mui/material/ButtonBase';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/CardActions/CardActions.test.js b/packages/mui-material/src/CardActions/CardActions.test.js
index 17eebd3bf8af98..821827d7a516ff 100644
--- a/packages/mui-material/src/CardActions/CardActions.test.js
+++ b/packages/mui-material/src/CardActions/CardActions.test.js
@@ -1,9 +1,9 @@
import * as React from 'react';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import CardActions, { cardActionsClasses as classes } from '@mui/material/CardActions';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/CardContent/CardContent.test.js b/packages/mui-material/src/CardContent/CardContent.test.js
index 4cb804307e145c..d7c92860c2f9f4 100644
--- a/packages/mui-material/src/CardContent/CardContent.test.js
+++ b/packages/mui-material/src/CardContent/CardContent.test.js
@@ -1,9 +1,9 @@
import * as React from 'react';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import CardContent, { cardContentClasses as classes } from '@mui/material/CardContent';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/CardHeader/CardHeader.test.js b/packages/mui-material/src/CardHeader/CardHeader.test.js
index 3d4ed04c31d92d..59de5b89f0e2fe 100644
--- a/packages/mui-material/src/CardHeader/CardHeader.test.js
+++ b/packages/mui-material/src/CardHeader/CardHeader.test.js
@@ -1,11 +1,11 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import { typographyClasses } from '@mui/material/Typography';
import CardHeader, { cardHeaderClasses as classes } from '@mui/material/CardHeader';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/CardMedia/CardMedia.test.js b/packages/mui-material/src/CardMedia/CardMedia.test.js
index c42d49cdc9312a..294346fe273fc7 100644
--- a/packages/mui-material/src/CardMedia/CardMedia.test.js
+++ b/packages/mui-material/src/CardMedia/CardMedia.test.js
@@ -1,11 +1,11 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import { expect } from 'chai';
-import { createClientRender, describeConformance, screen } from 'test/utils';
+import { createRenderer, describeConformance, screen } from 'test/utils';
import CardMedia, { cardMediaClasses as classes } from '@mui/material/CardMedia';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/Checkbox/Checkbox.test.js b/packages/mui-material/src/Checkbox/Checkbox.test.js
index 26a3f6ac6fc09d..c078350acb38ed 100644
--- a/packages/mui-material/src/Checkbox/Checkbox.test.js
+++ b/packages/mui-material/src/Checkbox/Checkbox.test.js
@@ -1,13 +1,13 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
-import { describeConformance, act, createClientRender } from 'test/utils';
+import { describeConformance, act, createRenderer } from 'test/utils';
import Checkbox, { checkboxClasses as classes } from '@mui/material/Checkbox';
import FormControl from '@mui/material/FormControl';
import ButtonBase from '@mui/material/ButtonBase';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/Chip/Chip.test.js b/packages/mui-material/src/Chip/Chip.test.js
index 3da08622a2da25..318e7ae702a29a 100644
--- a/packages/mui-material/src/Chip/Chip.test.js
+++ b/packages/mui-material/src/Chip/Chip.test.js
@@ -4,7 +4,7 @@ import { spy, stub } from 'sinon';
import {
describeConformance,
act,
- createClientRender,
+ createRenderer,
fireEvent,
focusVisible,
simulatePointerDevice,
@@ -16,7 +16,7 @@ import { ThemeProvider, createTheme } from '@mui/material/styles';
import CheckBox from '../internal/svg-icons/CheckBox';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/CircularProgress/CircularProgress.test.js b/packages/mui-material/src/CircularProgress/CircularProgress.test.js
index ba2885d2e44f7c..9df1871fea0270 100644
--- a/packages/mui-material/src/CircularProgress/CircularProgress.test.js
+++ b/packages/mui-material/src/CircularProgress/CircularProgress.test.js
@@ -1,12 +1,12 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender, describeConformance } from 'test/utils';
+import { createRenderer, describeConformance } from 'test/utils';
import CircularProgress, {
circularProgressClasses as classes,
} from '@mui/material/CircularProgress';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(, () => ({
classes,
diff --git a/packages/mui-material/src/Collapse/Collapse.test.js b/packages/mui-material/src/Collapse/Collapse.test.js
index 1f919566e00728..d8d708f124d466 100644
--- a/packages/mui-material/src/Collapse/Collapse.test.js
+++ b/packages/mui-material/src/Collapse/Collapse.test.js
@@ -1,13 +1,13 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy, stub, useFakeTimers } from 'sinon';
-import { act, createClientRender, describeConformance } from 'test/utils';
+import { act, createRenderer, describeConformance } from 'test/utils';
import { ThemeProvider, createTheme } from '@mui/material/styles';
import { Transition } from 'react-transition-group';
import Collapse, { collapseClasses as classes } from '@mui/material/Collapse';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
const defaultProps = {
in: true,
diff --git a/packages/mui-material/src/Container/Container.test.js b/packages/mui-material/src/Container/Container.test.js
index a2d5021dec9e11..fa1b005a0f2c18 100644
--- a/packages/mui-material/src/Container/Container.test.js
+++ b/packages/mui-material/src/Container/Container.test.js
@@ -1,10 +1,10 @@
import * as React from 'react';
import { expect } from 'chai';
-import { describeConformance, createClientRender } from 'test/utils';
+import { describeConformance, createRenderer } from 'test/utils';
import Container, { containerClasses as classes } from '@mui/material/Container';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
const defaultProps = {
children: ,
diff --git a/packages/mui-material/src/CssBaseline/CssBaseline.test.js b/packages/mui-material/src/CssBaseline/CssBaseline.test.js
index 49deab5f4f5851..dd3490b71b940f 100644
--- a/packages/mui-material/src/CssBaseline/CssBaseline.test.js
+++ b/packages/mui-material/src/CssBaseline/CssBaseline.test.js
@@ -1,11 +1,11 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createClientRender } from 'test/utils';
+import { createRenderer } from 'test/utils';
import CssBaseline from '@mui/material/CssBaseline';
import { ThemeProvider, createTheme } from '@mui/material/styles';
describe('', () => {
- const render = createClientRender();
+ const { render } = createRenderer();
it('renders its children', () => {
const { container } = render(
diff --git a/packages/mui-material/src/Dialog/Dialog.test.js b/packages/mui-material/src/Dialog/Dialog.test.js
index 5f781c797da55a..85631bc3c3a5dc 100644
--- a/packages/mui-material/src/Dialog/Dialog.test.js
+++ b/packages/mui-material/src/Dialog/Dialog.test.js
@@ -1,7 +1,7 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy, useFakeTimers } from 'sinon';
-import { describeConformance, act, createClientRender, fireEvent, screen } from 'test/utils';
+import { describeConformance, act, createRenderer, fireEvent, screen } from 'test/utils';
import Modal from '@mui/material/Modal';
import Dialog, { dialogClasses as classes } from '@mui/material/Dialog';
@@ -41,7 +41,7 @@ describe('', () => {
clock.restore();
});
- const render = createClientRender();
+ const { render } = createRenderer();
describeConformance(