diff --git a/jest-setup.ts b/jest-setup.ts
index 2d6dd3c1..462a0d4b 100644
--- a/jest-setup.ts
+++ b/jest-setup.ts
@@ -2,7 +2,4 @@ import { resetToDefaults, configure } from './src/pure';
beforeEach(() => {
resetToDefaults();
- if (process.env.CONCURRENT_MODE === '0') {
- configure({ concurrentRoot: false });
- }
});
diff --git a/src/__tests__/config.test.ts b/src/__tests__/config.test.ts
index dc454bea..fa18b9be 100644
--- a/src/__tests__/config.test.ts
+++ b/src/__tests__/config.test.ts
@@ -16,7 +16,6 @@ test('configure() overrides existing config values', () => {
asyncUtilTimeout: 5000,
defaultDebugOptions: { message: 'debug message' },
defaultIncludeHiddenElements: false,
- concurrentRoot: true,
});
});
diff --git a/src/__tests__/render-async.test.tsx b/src/__tests__/render-async.test.tsx
index ea3b7b13..fc6c657a 100644
--- a/src/__tests__/render-async.test.tsx
+++ b/src/__tests__/render-async.test.tsx
@@ -54,11 +54,6 @@ test('renderAsync with wrapper option', async () => {
expect(screen.getByTestId('inner')).toBeTruthy();
});
-test('renderAsync supports legacy rendering option', async () => {
- await renderAsync(, { concurrentRoot: false });
- expect(screen.root).toBeOnTheScreen();
-});
-
test('rerender function throws error when used with renderAsync', async () => {
await renderAsync();
diff --git a/src/__tests__/render-hook-async.test.tsx b/src/__tests__/render-hook-async.test.tsx
index 8cc398ee..f031bfbc 100644
--- a/src/__tests__/render-hook-async.test.tsx
+++ b/src/__tests__/render-hook-async.test.tsx
@@ -48,15 +48,6 @@ test('renderHookAsync with wrapper option', async () => {
expect(result.current).toEqual('provided');
});
-test('renderHookAsync supports legacy rendering option', async () => {
- function useTestHook() {
- return React.useState(42)[0];
- }
-
- const { result } = await renderHookAsync(useTestHook, { concurrentRoot: false });
- expect(result.current).toEqual(42);
-});
-
test('rerenderAsync function updates hook asynchronously', async () => {
function useTestHook(props: { value: number }) {
const [state, setState] = React.useState(props.value);
diff --git a/src/__tests__/render.test.tsx b/src/__tests__/render.test.tsx
index 48151662..1dd1e3d2 100644
--- a/src/__tests__/render.test.tsx
+++ b/src/__tests__/render.test.tsx
@@ -74,6 +74,11 @@ class Banana extends React.Component {
}
}
+test('supports basic rendering', () => {
+ render();
+ expect(screen.root).toBeOnTheScreen();
+});
+
test('UNSAFE_getAllByType, UNSAFE_queryAllByType', () => {
render();
const [text, status, button] = screen.UNSAFE_getAllByType(Text);
@@ -204,14 +209,6 @@ test('returns host root', () => {
expect(screen.root.props.testID).toBe('inner');
});
-test('returns composite UNSAFE_root', () => {
- render();
-
- expect(screen.UNSAFE_root).toBeDefined();
- expect(screen.UNSAFE_root.type).toBe(View);
- expect(screen.UNSAFE_root.props.testID).toBe('inner');
-});
-
test('container displays deprecation', () => {
render();
@@ -234,16 +231,6 @@ test('returned output can be spread using rest operator', () => {
expect(rest).toBeTruthy();
});
-test('supports legacy rendering', () => {
- render(, { concurrentRoot: false });
- expect(screen.root).toBeOnTheScreen();
-});
-
-test('supports concurrent rendering', () => {
- render(, { concurrentRoot: true });
- expect(screen.root).toBeOnTheScreen();
-});
-
test('rerenderAsync updates the component asynchronously', async () => {
const fn = jest.fn();
const result = render();
diff --git a/src/config.ts b/src/config.ts
index e861d0eb..121e33bc 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -13,12 +13,6 @@ export type Config = {
/** Default options for `debug` helper. */
defaultDebugOptions?: Partial;
-
- /**
- * Set to `false` to disable concurrent rendering.
- * Otherwise `render` will default to concurrent rendering.
- */
- concurrentRoot: boolean;
};
export type ConfigAliasOptions = {
@@ -29,7 +23,6 @@ export type ConfigAliasOptions = {
const defaultConfig: Config = {
asyncUtilTimeout: 1000,
defaultIncludeHiddenElements: false,
- concurrentRoot: true,
};
let config = { ...defaultConfig };
diff --git a/src/render-async.tsx b/src/render-async.tsx
index e4d1fe29..d312e5cb 100644
--- a/src/render-async.tsx
+++ b/src/render-async.tsx
@@ -20,13 +20,6 @@ export interface RenderAsyncOptions {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
wrapper?: React.ComponentType;
- /**
- * Set to `false` to disable concurrent rendering.
- * Otherwise `render` will default to concurrent rendering.
- */
- // TODO: should we assume concurrentRoot is true for react suspense?
- concurrentRoot?: boolean;
-
createNodeMock?: (element: React.ReactElement) => unknown;
}
@@ -40,12 +33,10 @@ export default async function renderAsync(
component: React.ReactElement,
options: RenderAsyncOptions = {},
) {
- const { wrapper: Wrapper, concurrentRoot, ...rest } = options || {};
+ const { wrapper: Wrapper, ...rest } = options || {};
const testRendererOptions: TestRendererOptions = {
...rest,
- // @ts-expect-error incomplete typing on RTR package
- unstable_isConcurrent: concurrentRoot ?? getConfig().concurrentRoot,
};
const wrap = (element: React.ReactElement) => (Wrapper ? {element} : element);
diff --git a/src/render-hook.tsx b/src/render-hook.tsx
index e49ec52f..dadeb171 100644
--- a/src/render-hook.tsx
+++ b/src/render-hook.tsx
@@ -28,12 +28,6 @@ export type RenderHookOptions = {
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
wrapper?: React.ComponentType;
-
- /**
- * Set to `false` to disable concurrent rendering.
- * Otherwise `renderHook` will default to concurrent rendering.
- */
- concurrentRoot?: boolean;
};
export function renderHook(
diff --git a/src/render.tsx b/src/render.tsx
index 0bc7c8a4..12a6e7e7 100644
--- a/src/render.tsx
+++ b/src/render.tsx
@@ -19,12 +19,6 @@ export interface RenderOptions {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
wrapper?: React.ComponentType;
- /**
- * Set to `false` to disable concurrent rendering.
- * Otherwise `render` will default to concurrent rendering.
- */
- concurrentRoot?: boolean;
-
createNodeMock?: (element: React.ReactElement) => unknown;
}
@@ -39,7 +33,7 @@ export default function render(component: React.ReactElement, options: Ren
}
export function renderInternal(component: React.ReactElement, options?: RenderOptions) {
- const { wrapper: Wrapper, concurrentRoot, ...rest } = options || {};
+ const { wrapper: Wrapper, ...rest } = options || {};
const testRendererOptions: RootOptions = {
...rest,