Only concurrent render in RTR

Author: Jack Pope

packages/react-reconciler/src/__tests__/DebugTracing-test.internal.js

@@ -71,6 +71,8 @@ describe('DebugTracing', () => {
  <React.unstable_DebugTracingMode>
  <div />
  </React.unstable_DebugTracingMode>,
+ {unstable_isConcurrent: true},
+
  ),
  );
  expect(logs).toEqual([]);
@@ -180,6 +182,10 @@ describe('DebugTracing', () => {
  <Example />
  </React.Suspense>
  </React.unstable_DebugTracingMode>,
+<<<<<<< HEAD
+=======
+ {unstable_isConcurrent: true},
+>>>>>>> b81de30fc (Flip default to concurrent render in RTR)
  ),
  );
 
@@ -216,6 +222,7 @@ describe('DebugTracing', () => {
  </React.Suspense>
  </Wrapper>
  </React.unstable_DebugTracingMode>,
+ {unstable_isConcurrent: true},
  ),
  );
 
@@ -246,6 +253,7 @@ describe('DebugTracing', () => {
  <React.unstable_DebugTracingMode>
  <Example />
  </React.unstable_DebugTracingMode>,
+ {unstable_isConcurrent: true},
  ),
  );
 
@@ -276,11 +284,10 @@ describe('DebugTracing', () => {
  <React.unstable_DebugTracingMode>
  <Example />
  </React.unstable_DebugTracingMode>,
- );
- });
- }).toErrorDev(
- 'Warning: Cannot update during an existing state transition (such as within `render`). Render methods should be a pure function of props and state.',
- );
+ {unstable_isConcurrent: true},
+ ),
+ );
+ }).toErrorDev('Cannot update during an existing state transition');
 
  expect(logs).toEqual([
  `group: ⚛️ render (${DEFAULT_LANE_STRING})`,
@@ -304,6 +311,7 @@ describe('DebugTracing', () => {
  <React.unstable_DebugTracingMode>
  <Example />
  </React.unstable_DebugTracingMode>,
+ {unstable_isConcurrent: true},
  ),
  );
 
@@ -331,6 +339,7 @@ describe('DebugTracing', () => {
  <React.unstable_DebugTracingMode>
  <Example />
  </React.unstable_DebugTracingMode>,
+ {unstable_isConcurrent: true},
  );
  });
  expect(logs).toEqual([
@@ -355,6 +364,7 @@ describe('DebugTracing', () => {
  <React.unstable_DebugTracingMode>
  <Example />
  </React.unstable_DebugTracingMode>,
+ {unstable_isConcurrent: true},
  );
  });
 
@@ -377,6 +387,7 @@ describe('DebugTracing', () => {
  <React.unstable_DebugTracingMode>
  <Example />
  </React.unstable_DebugTracingMode>,
+ {unstable_isConcurrent: true},
  ),
  );
 

packages/react-reconciler/src/__tests__/ReactHooks-test.internal.js

@@ -1899,7 +1899,7 @@ describe('ReactHooks', () => {
  }).rejects.toThrow('Hello');
 
  if (__DEV__) {
- expect(console.error).toHaveBeenCalledTimes(2);
+ expect(jest.mocked(console.error)).toHaveBeenCalledTimes(2);
  expect(console.error.mock.calls[0][0]).toContain(
  'Warning: Cannot update a component (`%s`) while rendering ' +
  'a different component (`%s`).',

packages/react-test-renderer/src/ReactTestRenderer.js

@@ -55,6 +55,7 @@ import {ConcurrentRoot, LegacyRoot} from 'react-reconciler/src/ReactRootTags';
 import {
  allowConcurrentByDefault,
  enableReactTestRendererWarning,
+ enableReactTestRendererLegacyMode,
 } from 'shared/ReactFeatureFlags';
 
 const act = React.act;
@@ -482,16 +483,16 @@ function create(
  }
 
  let createNodeMock = defaultTestOptions.createNodeMock;
- let isConcurrent = false;
+ let isConcurrent = true;
  let isStrictMode = false;
  let concurrentUpdatesByDefault = null;
  if (typeof options === 'object' && options !== null) {
  if (typeof options.createNodeMock === 'function') {
  // $FlowFixMe[incompatible-type] found when upgrading Flow
  createNodeMock = options.createNodeMock;
  }
- if (options.unstable_isConcurrent === true) {
- isConcurrent = true;
+ if (enableReactTestRendererLegacyMode) {
+ isConcurrent = options.unstable_isConcurrent;
  }
  if (options.unstable_strictMode === true) {
  isStrictMode = true;