Rename to dispatchAndWaitForDiscrete.

facebook · Jan 25, 2024 · 2ae431c · 2ae431c
1 parent c646280
commit 2ae431c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/packages/internal-test-utils/ReactInternalTestUtils.js b/packages/internal-test-utils/ReactInternalTestUtils.js
@@ -268,7 +268,7 @@ ${diff(expectedLog, actualLog)}
 // Simulates dispatching events, waiting for microtasks in between.
 // This matches the browser behavior, which will flush microtasks
 // between each event handler.
-export async function waitForEvents(
+export async function dispatchAndWaitForDiscrete(
   node: Node,
   eventType: string,
 ): Promise<void> {

diff --git a/packages/internal-test-utils/__tests__/ReactInternalTestUtilsDOM-test.js b/packages/internal-test-utils/__tests__/ReactInternalTestUtilsDOM-test.js
@@ -13,20 +13,21 @@ let React;
 let act;
 let Scheduler;
 let ReactDOMClient;
-let waitForEvents;
+let dispatchAndWaitForDiscrete;
 let assertLog;
 
 describe('ReactInternalTestUtilsDOM', () => {
   beforeEach(() => {
     jest.resetModules();
     act = require('internal-test-utils').act;
-    waitForEvents = require('internal-test-utils').waitForEvents;
+    dispatchAndWaitForDiscrete =
+      require('internal-test-utils').dispatchAndWaitForDiscrete;
     Scheduler = require('scheduler/unstable_mock');
     ReactDOMClient = require('react-dom/client');
     React = require('react');
     assertLog = require('internal-test-utils').assertLog;
   });
-  describe('waitForEvents', () => {
+  describe('dispatchAndWaitForDiscrete', () => {
     test('should fire capture events (discrete)', async () => {
       let childRef;
       function Component() {
@@ -59,7 +60,7 @@ describe('ReactInternalTestUtilsDOM', () => {
       assertLog(['Render 0']);
 
       await act(async () => {
-        await waitForEvents(childRef, 'click');
+        await dispatchAndWaitForDiscrete(childRef, 'click');
       });
 
       // Capture runs on every event we dispatch,
@@ -110,7 +111,7 @@ describe('ReactInternalTestUtilsDOM', () => {
       assertLog(['Render 0']);
 
       await act(async () => {
-        await waitForEvents(childRef, 'click');
+        await dispatchAndWaitForDiscrete(childRef, 'click');
       });
 
       assertLog(['onClick child', 'onClick parent', 'Render 1']);
@@ -148,7 +149,7 @@ describe('ReactInternalTestUtilsDOM', () => {
       assertLog(['Render 0']);
 
       await act(async () => {
-        await waitForEvents(childRef, 'mouseout');
+        await dispatchAndWaitForDiscrete(childRef, 'mouseout');
       });
 
       // Capture runs on every event we dispatch,
@@ -198,7 +199,7 @@ describe('ReactInternalTestUtilsDOM', () => {
       assertLog(['Render 0']);
 
       await act(async () => {
-        await waitForEvents(childRef, 'mouseout');
+        await dispatchAndWaitForDiscrete(childRef, 'mouseout');
       });
 
       assertLog(['onMouseOut child', 'onMouseOut parent', 'Render 1']);

diff --git a/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js b/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js
@@ -9,15 +9,15 @@
 
 'use strict';
 
-import {enableLegacyFBSupport} from 'shared/forks/ReactFeatureFlags.www-dynamic';
+import {dispatchAndWaitForDiscrete} from 'internal-test-utils';
 
 describe('ReactDOMEventListener', () => {
   let React;
   let ReactDOM;
   let ReactDOMClient;
   let ReactDOMServer;
   let act;
-  let waitForEvents;
+  let dispatchAndWaitForDiscrete;
 
   beforeEach(() => {
     jest.resetModules();
@@ -26,7 +26,8 @@ describe('ReactDOMEventListener', () => {
     ReactDOMClient = require('react-dom/client');
     ReactDOMServer = require('react-dom/server');
     act = require('internal-test-utils').act;
-    waitForEvents = require('internal-test-utils').waitForEvents;
+    dispatchAndWaitForDiscrete =
+      require('internal-test-utils').dispatchAndWaitForDiscrete;
   });
 
   describe('Propagation', () => {
@@ -190,7 +191,7 @@ describe('ReactDOMEventListener', () => {
 
       try {
         await act(async () => {
-          await waitForEvents(childNode, 'click');
+          await dispatchAndWaitForDiscrete(childNode, 'click');
         });
 
         // Child and parent should both call from event handlers.
@@ -270,7 +271,7 @@ describe('ReactDOMEventListener', () => {
 
       try {
         await act(async () => {
-          await waitForEvents(childNode, 'mouseout');
+          await dispatchAndWaitForDiscrete(childNode, 'mouseout');
         });
 
         // Child and parent should both call from event handlers.