Skip to content

Commit 2ae431c

Browse files
committed
Rename to dispatchAndWaitForDiscrete.
1 parent c646280 commit 2ae431c

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

packages/internal-test-utils/ReactInternalTestUtils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ ${diff(expectedLog, actualLog)}
268268
// Simulates dispatching events, waiting for microtasks in between.
269269
// This matches the browser behavior, which will flush microtasks
270270
// between each event handler.
271-
export async function waitForEvents(
271+
export async function dispatchAndWaitForDiscrete(
272272
node: Node,
273273
eventType: string,
274274
): Promise<void> {

packages/internal-test-utils/__tests__/ReactInternalTestUtilsDOM-test.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,21 @@ let React;
1313
let act;
1414
let Scheduler;
1515
let ReactDOMClient;
16-
let waitForEvents;
16+
let dispatchAndWaitForDiscrete;
1717
let assertLog;
1818

1919
describe('ReactInternalTestUtilsDOM', () => {
2020
beforeEach(() => {
2121
jest.resetModules();
2222
act = require('internal-test-utils').act;
23-
waitForEvents = require('internal-test-utils').waitForEvents;
23+
dispatchAndWaitForDiscrete =
24+
require('internal-test-utils').dispatchAndWaitForDiscrete;
2425
Scheduler = require('scheduler/unstable_mock');
2526
ReactDOMClient = require('react-dom/client');
2627
React = require('react');
2728
assertLog = require('internal-test-utils').assertLog;
2829
});
29-
describe('waitForEvents', () => {
30+
describe('dispatchAndWaitForDiscrete', () => {
3031
test('should fire capture events (discrete)', async () => {
3132
let childRef;
3233
function Component() {
@@ -59,7 +60,7 @@ describe('ReactInternalTestUtilsDOM', () => {
5960
assertLog(['Render 0']);
6061

6162
await act(async () => {
62-
await waitForEvents(childRef, 'click');
63+
await dispatchAndWaitForDiscrete(childRef, 'click');
6364
});
6465

6566
// Capture runs on every event we dispatch,
@@ -110,7 +111,7 @@ describe('ReactInternalTestUtilsDOM', () => {
110111
assertLog(['Render 0']);
111112

112113
await act(async () => {
113-
await waitForEvents(childRef, 'click');
114+
await dispatchAndWaitForDiscrete(childRef, 'click');
114115
});
115116

116117
assertLog(['onClick child', 'onClick parent', 'Render 1']);
@@ -148,7 +149,7 @@ describe('ReactInternalTestUtilsDOM', () => {
148149
assertLog(['Render 0']);
149150

150151
await act(async () => {
151-
await waitForEvents(childRef, 'mouseout');
152+
await dispatchAndWaitForDiscrete(childRef, 'mouseout');
152153
});
153154

154155
// Capture runs on every event we dispatch,
@@ -198,7 +199,7 @@ describe('ReactInternalTestUtilsDOM', () => {
198199
assertLog(['Render 0']);
199200

200201
await act(async () => {
201-
await waitForEvents(childRef, 'mouseout');
202+
await dispatchAndWaitForDiscrete(childRef, 'mouseout');
202203
});
203204

204205
assertLog(['onMouseOut child', 'onMouseOut parent', 'Render 1']);

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99

1010
'use strict';
1111

12-
import {enableLegacyFBSupport} from 'shared/forks/ReactFeatureFlags.www-dynamic';
12+
import {dispatchAndWaitForDiscrete} from 'internal-test-utils';
1313

1414
describe('ReactDOMEventListener', () => {
1515
let React;
1616
let ReactDOM;
1717
let ReactDOMClient;
1818
let ReactDOMServer;
1919
let act;
20-
let waitForEvents;
20+
let dispatchAndWaitForDiscrete;
2121

2222
beforeEach(() => {
2323
jest.resetModules();
@@ -26,7 +26,8 @@ describe('ReactDOMEventListener', () => {
2626
ReactDOMClient = require('react-dom/client');
2727
ReactDOMServer = require('react-dom/server');
2828
act = require('internal-test-utils').act;
29-
waitForEvents = require('internal-test-utils').waitForEvents;
29+
dispatchAndWaitForDiscrete =
30+
require('internal-test-utils').dispatchAndWaitForDiscrete;
3031
});
3132

3233
describe('Propagation', () => {
@@ -190,7 +191,7 @@ describe('ReactDOMEventListener', () => {
190191

191192
try {
192193
await act(async () => {
193-
await waitForEvents(childNode, 'click');
194+
await dispatchAndWaitForDiscrete(childNode, 'click');
194195
});
195196

196197
// Child and parent should both call from event handlers.
@@ -270,7 +271,7 @@ describe('ReactDOMEventListener', () => {
270271

271272
try {
272273
await act(async () => {
273-
await waitForEvents(childNode, 'mouseout');
274+
await dispatchAndWaitForDiscrete(childNode, 'mouseout');
274275
});
275276

276277
// Child and parent should both call from event handlers.

0 commit comments

Comments
 (0)