Skip to content

Commit ac15f6c

Browse files
committed
Migrates tests to use internal module directly
Instead of the `unstable_concurrentAct` exports. Now we can drop those from the public builds. I put it in the jest-react package since that's where we put our other testing utilities (like `toFlushAndYield`). Not so much so it can be consumed publicly (nobody uses that package except us), but so it works with our build tests.
1 parent eba99ad commit ac15f6c

File tree

72 files changed

+562
-547
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+562
-547
lines changed

packages/jest-react/src/JestReact.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import {REACT_ELEMENT_TYPE, REACT_FRAGMENT_TYPE} from 'shared/ReactSymbols';
1010
import invariant from 'shared/invariant';
1111
import isArray from 'shared/isArray';
1212

13+
export {act} from './internalAct';
14+
1315
function captureAssertion(fn) {
1416
// Trick to use a Jest matcher inside another Jest matcher. `fn` contains an
1517
// assertion; if it throws, we capture the error and return it, so the stack

packages/shared/internalAct.js renamed to packages/jest-react/src/internalAct.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const {ReactCurrentActQueue} = ReactSharedInternals;
2424

2525
let actingUpdatesScopeDepth = 0;
2626

27-
function act(scope: () => Thenable<mixed> | void) {
27+
export function act(scope: () => Thenable<mixed> | void) {
2828
if (Scheduler.unstable_flushAllWithoutAsserting === undefined) {
2929
throw Error(
3030
'This version of `act` requires a special mock build of Scheduler.',
@@ -128,5 +128,3 @@ function flushActWork(resolve, reject) {
128128
}
129129
});
130130
}
131-
132-
export default act;

packages/react-client/src/__tests__/ReactFlight-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ describe('ReactFlight', () => {
2626
ReactNoop = require('react-noop-renderer');
2727
ReactNoopFlightServer = require('react-noop-renderer/flight-server');
2828
ReactNoopFlightClient = require('react-noop-renderer/flight-client');
29-
act = ReactNoop.act;
29+
act = require('jest-react').act;
3030

3131
ErrorBoundary = class extends React.Component {
3232
state = {hasError: false, error: null};

packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ describe('ReactHooksInspectionIntegration', () => {
2222
React = require('react');
2323
ReactTestRenderer = require('react-test-renderer');
2424
Scheduler = require('scheduler');
25-
act = ReactTestRenderer.unstable_concurrentAct;
25+
act = require('jest-react').act;
2626
ReactDebugTools = require('react-debug-tools');
2727
});
2828

packages/react-devtools-shared/src/__tests__/inspectedElement-test.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ describe('InspectedElement', () => {
2626
let InspectedElementContext;
2727
let InspectedElementContextController;
2828
let StoreContext;
29-
let TestUtils;
3029
let TreeContextController;
3130

3231
let TestUtilsAct;
@@ -45,10 +44,9 @@ describe('InspectedElement', () => {
4544
React = require('react');
4645
ReactDOM = require('react-dom');
4746
PropTypes = require('prop-types');
48-
TestUtils = require('react-dom/test-utils');
49-
TestUtilsAct = TestUtils.unstable_concurrentAct;
47+
TestUtilsAct = require('jest-react').act;
5048
TestRenderer = utils.requireTestRenderer();
51-
TestRendererAct = TestUtils.unstable_concurrentAct;
49+
TestRendererAct = require('jest-react').act;
5250

5351
BridgeContext = require('react-devtools-shared/src/devtools/views/context')
5452
.BridgeContext;

packages/react-devtools-shared/src/__tests__/storeComponentFilters-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ import type Store from 'react-devtools-shared/src/devtools/store';
1313
describe('Store component filters', () => {
1414
let React;
1515
let ReactDOM;
16-
let TestUtils;
1716
let Types;
1817
let bridge: FrontendBridge;
1918
let store: Store;
2019
let utils;
20+
let internalAct;
2121

2222
const act = (callback: Function) => {
23-
TestUtils.unstable_concurrentAct(() => {
23+
internalAct(() => {
2424
callback();
2525
});
2626
jest.runAllTimers(); // Flush Bridge operations
@@ -35,9 +35,9 @@ describe('Store component filters', () => {
3535

3636
React = require('react');
3737
ReactDOM = require('react-dom');
38-
TestUtils = require('react-dom/test-utils');
3938
Types = require('react-devtools-shared/src/types');
4039
utils = require('./utils');
40+
internalAct = require('jest-react').act;
4141
});
4242

4343
it('should throw if filters are updated while profiling', () => {

packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('ReactDOMFiberAsync', () => {
2828
container = document.createElement('div');
2929
React = require('react');
3030
ReactDOM = require('react-dom');
31-
act = require('react-dom/test-utils').unstable_concurrentAct;
31+
act = require('jest-react').act;
3232
Scheduler = require('scheduler');
3333

3434
document.body.appendChild(container);

packages/react-dom/src/__tests__/ReactDOMHooks-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe('ReactDOMHooks', () => {
2323
React = require('react');
2424
ReactDOM = require('react-dom');
2525
Scheduler = require('scheduler');
26-
act = require('react-dom/test-utils').unstable_concurrentAct;
26+
act = require('jest-react').act;
2727

2828
container = document.createElement('div');
2929
document.body.appendChild(container);

packages/react-dom/src/__tests__/ReactDOMNativeEventHeuristic-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe('ReactDOMNativeEventHeuristic-test', () => {
2424
React = require('react');
2525
ReactDOM = require('react-dom');
2626
Scheduler = require('scheduler');
27-
act = require('react-dom/test-utils').unstable_concurrentAct;
27+
act = require('jest-react').act;
2828

2929
document.body.appendChild(container);
3030
});

packages/react-dom/src/__tests__/ReactDOMNestedEvents-test.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ describe('ReactDOMNestedEvents', () => {
1313
let React;
1414
let ReactDOM;
1515
let Scheduler;
16-
let TestUtils;
1716
let act;
1817
let useState;
1918

@@ -22,8 +21,7 @@ describe('ReactDOMNestedEvents', () => {
2221
React = require('react');
2322
ReactDOM = require('react-dom');
2423
Scheduler = require('scheduler');
25-
TestUtils = require('react-dom/test-utils');
26-
act = TestUtils.unstable_concurrentAct;
24+
act = require('jest-react').act;
2725
useState = React.useState;
2826
});
2927

0 commit comments

Comments
 (0)