facebook
diff --git a/‎packages/react-dom/src/events/plugins/__tests__/SimpleEventPlugin-test.js
Lines changed: 19 additions & 9 deletions b/‎packages/react-dom/src/events/plugins/__tests__/SimpleEventPlugin-test.js
Lines changed: 19 additions & 9 deletions
@@ -18,6 +18,8 @@ describe('SimpleEventPlugin', function () {
 
   let onClick;
   let container;
+  let assertLog;
+  let waitForAll;
 
   function expectClickThru(element) {
     element.click();
@@ -43,6 +45,10 @@ describe('SimpleEventPlugin', function () {
     ReactDOMClient = require('react-dom/client');
     Scheduler = require('scheduler');
 
+    const InternalTestUtils = require('internal-test-utils');
+    assertLog = InternalTestUtils.assertLog;
+    waitForAll = InternalTestUtils.waitForAll;
+
     onClick = jest.fn();
   });
 
@@ -222,12 +228,12 @@ describe('SimpleEventPlugin', function () {
 
     ReactDOM.render(<Button />, container);
     expect(button.textContent).toEqual('Count: 0');
-    expect(Scheduler).toHaveYielded([]);
+    assertLog([]);
 
     click();
 
     // There should be exactly one update.
-    expect(Scheduler).toHaveYielded(['didUpdate - Count: 3']);
+    assertLog(['didUpdate - Count: 3']);
     expect(button.textContent).toEqual('Count: 3');
   });
 
@@ -240,6 +246,10 @@ describe('SimpleEventPlugin', function () {
       ReactDOMClient = require('react-dom/client');
       Scheduler = require('scheduler');
 
+      const InternalTestUtils = require('internal-test-utils');
+      assertLog = InternalTestUtils.assertLog;
+      waitForAll = InternalTestUtils.waitForAll;
+
       act = require('jest-react').act;
     });
 
@@ -274,10 +284,10 @@ describe('SimpleEventPlugin', function () {
       // Initial mount
       root.render(<Button />);
       // Should not have flushed yet because it's async
-      expect(Scheduler).toHaveYielded([]);
+      assertLog([]);
       expect(button).toBe(undefined);
       // Flush async work
-      expect(Scheduler).toFlushAndYield(['render button: enabled']);
+      await waitForAll(['render button: enabled']);
 
       function click() {
         const event = new MouseEvent('click', {
@@ -292,7 +302,7 @@ describe('SimpleEventPlugin', function () {
 
       // Click the button to trigger the side-effect
       await act(async () => click());
-      expect(Scheduler).toHaveYielded([
+      assertLog([
         // The handler fired
         'Side-effect',
         // The component re-rendered synchronously, even in concurrent mode.
@@ -301,7 +311,7 @@ describe('SimpleEventPlugin', function () {
 
       // Click the button again
       click();
-      expect(Scheduler).toHaveYielded([
+      assertLog([
         // The event handler was removed from the button, so there's no effect.
       ]);
 
@@ -312,7 +322,7 @@ describe('SimpleEventPlugin', function () {
       click();
       click();
       click();
-      expect(Scheduler).toFlushAndYield([]);
+      await waitForAll([]);
     });
 
     // NOTE: This test was written for the old behavior of discrete updates,
@@ -345,7 +355,7 @@ describe('SimpleEventPlugin', function () {
       // Should not have flushed yet because it's async
       expect(button).toBe(undefined);
       // Flush async work
-      Scheduler.unstable_flushAll();
+      await waitForAll([]);
       expect(button.textContent).toEqual('Count: 0');
 
       function click() {
@@ -373,7 +383,7 @@ describe('SimpleEventPlugin', function () {
       await act(async () => click());
 
       // Flush the remaining work
-      Scheduler.unstable_flushAll();
+      await waitForAll([]);
       // The counter should equal the total number of clicks
       expect(button.textContent).toEqual('Count: 7');
     });