From 374fd68a50f00237555cdeb60ad01cba171328f9 Mon Sep 17 00:00:00 2001 From: Ruslan Lesiutin Date: Fri, 9 Feb 2024 19:03:40 +0000 Subject: [PATCH] fix: define IS_ACT_ENVIRONMENT global for tests with concurrent mode and synchronous act (#28296) --- .../src/__tests__/FastRefreshDevToolsIntegration-test.js | 2 ++ .../src/__tests__/profilerStore-test.js | 2 ++ .../react-devtools-shared/src/__tests__/store-test.js | 2 ++ .../src/__tests__/storeStressTestConcurrent-test.js | 8 ++------ .../src/__tests__/treeContext-test.js | 2 ++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/react-devtools-shared/src/__tests__/FastRefreshDevToolsIntegration-test.js b/packages/react-devtools-shared/src/__tests__/FastRefreshDevToolsIntegration-test.js index 2ef5ae8d02393..ff07f0ef16f8a 100644 --- a/packages/react-devtools-shared/src/__tests__/FastRefreshDevToolsIntegration-test.js +++ b/packages/react-devtools-shared/src/__tests__/FastRefreshDevToolsIntegration-test.js @@ -20,6 +20,8 @@ describe('Fast Refresh', () => { let withErrorsOrWarningsIgnored; beforeEach(() => { + global.IS_REACT_ACT_ENVIRONMENT = true; + exportsObj = undefined; babel = require('@babel/core'); diff --git a/packages/react-devtools-shared/src/__tests__/profilerStore-test.js b/packages/react-devtools-shared/src/__tests__/profilerStore-test.js index 3b375c5d9832f..8a73b7ae4ad6a 100644 --- a/packages/react-devtools-shared/src/__tests__/profilerStore-test.js +++ b/packages/react-devtools-shared/src/__tests__/profilerStore-test.js @@ -17,6 +17,8 @@ describe('ProfilerStore', () => { let utils; beforeEach(() => { + global.IS_REACT_ACT_ENVIRONMENT = true; + utils = require('./utils'); utils.beforeEachProfiling(); diff --git a/packages/react-devtools-shared/src/__tests__/store-test.js b/packages/react-devtools-shared/src/__tests__/store-test.js index dec3c41c8f1b6..a28641ae3594d 100644 --- a/packages/react-devtools-shared/src/__tests__/store-test.js +++ b/packages/react-devtools-shared/src/__tests__/store-test.js @@ -23,6 +23,8 @@ describe('Store', () => { let withErrorsOrWarningsIgnored; beforeEach(() => { + global.IS_REACT_ACT_ENVIRONMENT = true; + agent = global.agent; bridge = global.bridge; store = global.store; diff --git a/packages/react-devtools-shared/src/__tests__/storeStressTestConcurrent-test.js b/packages/react-devtools-shared/src/__tests__/storeStressTestConcurrent-test.js index 7d366bd9ac6e9..472ad31671a76 100644 --- a/packages/react-devtools-shared/src/__tests__/storeStressTestConcurrent-test.js +++ b/packages/react-devtools-shared/src/__tests__/storeStressTestConcurrent-test.js @@ -17,6 +17,8 @@ describe('StoreStressConcurrent', () => { let print; beforeEach(() => { + global.IS_REACT_ACT_ENVIRONMENT = true; + bridge = global.bridge; store = global.store; store.collapseNodesByDefault = false; @@ -31,12 +33,6 @@ describe('StoreStressConcurrent', () => { print = require('./__serializers__/storeSerializer').print; }); - // TODO: Remove this in favor of @gate pragma - if (!__EXPERIMENTAL__) { - it("empty test so Jest doesn't complain", () => {}); - return; - } - // This is a stress test for the tree mount/update/unmount traversal. // It renders different trees that should produce the same output. // @reactVersion >= 18.0 diff --git a/packages/react-devtools-shared/src/__tests__/treeContext-test.js b/packages/react-devtools-shared/src/__tests__/treeContext-test.js index 894524762ac88..185e11461bfe4 100644 --- a/packages/react-devtools-shared/src/__tests__/treeContext-test.js +++ b/packages/react-devtools-shared/src/__tests__/treeContext-test.js @@ -33,6 +33,8 @@ describe('TreeListContext', () => { let state: StateContext; beforeEach(() => { + global.IS_REACT_ACT_ENVIRONMENT = true; + utils = require('./utils'); utils.beforeEachProfiling();