Merge pull request #15 from eps1lon/devtools-inline-warnings-flush-passive-after-delay-test-explicit

Make timing explicit in test

Author: Brian Vaughn

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

@@ -1088,16 +1088,20 @@ describe('Store', () => {
       withErrorsOrWarningsIgnored(['test-only:'], () => {
         act(() => {
           ReactDOM.render(<Example />, container);
+          // flush bridge operations
+          jest.runOnlyPendingTimers();
+        }, false);
+      });
 
-          // Flush commit
-          jest.advanceTimersByTime(1);
+      expect(store).toMatchInlineSnapshot(`
+        [root]
+            <Example>
+      `);
 
-          expect(store).toMatchInlineSnapshot(`
-            [root]
-                <Example>
-          `);
-        });
-      });
+      // flush count after delay
+      act(() => {
+        jest.advanceTimersByTime(1000);
+      }, false);
 
       // After a delay, passive effects should be committed as well
       expect(store).toMatchInlineSnapshot(`

packages/react-devtools-shared/src/__tests__/utils.js

@@ -14,7 +14,10 @@ import type Store from 'react-devtools-shared/src/devtools/store';
 import type {ProfilingDataFrontend} from 'react-devtools-shared/src/devtools/views/Profiler/types';
 import type {ElementType} from 'react-devtools-shared/src/types';
 
-export function act(callback: Function): void {
+export function act(
+  callback: Function,
+  recursivelyFlush: boolean = true,
+): void {
   const {act: actTestRenderer} = require('react-test-renderer');
   const {act: actDOM} = require('react-dom/test-utils');
 
@@ -24,13 +27,15 @@ export function act(callback: Function): void {
     });
   });
 
-  // Flush Bridge operations
-  while (jest.getTimerCount() > 0) {
-    actDOM(() => {
-      actTestRenderer(() => {
-        jest.runAllTimers();
+  if (recursivelyFlush) {
+    // Flush Bridge operations
+    while (jest.getTimerCount() > 0) {
+      actDOM(() => {
+        actTestRenderer(() => {
+          jest.runAllTimers();
+        });
       });
-    });
+    }
   }
 }