From 8280f851048887edc059d1a940c7d522c8a2a777 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuel.susla@gmail.com>
Date: Fri, 12 Aug 2022 11:19:42 +0100
Subject: [PATCH] Use gate pragma in ReacetOffscreenStrictMode test

---
 .../ReactOffscreenStrictMode-test.js          | 34 ++++----
 .../src/__tests__/ReactStrictMode-test.js     | 79 +++++++------------
 2 files changed, 44 insertions(+), 69 deletions(-)

diff --git a/packages/react-reconciler/src/__tests__/ReactOffscreenStrictMode-test.js b/packages/react-reconciler/src/__tests__/ReactOffscreenStrictMode-test.js
index 5f179e94aa666..f750a9b7ef0d6 100644
--- a/packages/react-reconciler/src/__tests__/ReactOffscreenStrictMode-test.js
+++ b/packages/react-reconciler/src/__tests__/ReactOffscreenStrictMode-test.js
@@ -13,10 +13,6 @@ describe('ReactOffscreenStrictMode', () => {
     Offscreen = React.unstable_Offscreen;
     ReactNoop = require('react-noop-renderer');
     act = require('jest-react').act;
-
-    const ReactFeatureFlags = require('shared/ReactFeatureFlags');
-    ReactFeatureFlags.enableStrictEffects = __DEV__;
-    ReactFeatureFlags.createRootStrictEffectsByDefault = __DEV__;
   });
 
   function Component({label}) {
@@ -35,14 +31,15 @@ describe('ReactOffscreenStrictMode', () => {
     return <span>label</span>;
   }
 
-  // @gate enableOffscreen
-  // @gate __DEV__
+  // @gate __DEV__ && enableStrictEffects && enableOffscreen
   it('should trigger strict effects when offscreen is visible', () => {
     act(() => {
       ReactNoop.render(
-        <Offscreen mode="visible">
-          <Component label="A" />
-        </Offscreen>,
+        <React.StrictMode>
+          <Offscreen mode="visible">
+            <Component label="A" />
+          </Offscreen>
+        </React.StrictMode>,
       );
     });
 
@@ -58,14 +55,15 @@ describe('ReactOffscreenStrictMode', () => {
     ]);
   });
 
-  // @gate enableOffscreen
-  // @gate __DEV__
+  // @gate __DEV__ && enableStrictEffects && enableOffscreen
   it('should not trigger strict effects when offscreen is hidden', () => {
     act(() => {
       ReactNoop.render(
-        <Offscreen mode="hidden">
-          <Component label="A" />
-        </Offscreen>,
+        <React.StrictMode>
+          <Offscreen mode="hidden">
+            <Component label="A" />
+          </Offscreen>
+        </React.StrictMode>,
       );
     });
 
@@ -75,9 +73,11 @@ describe('ReactOffscreenStrictMode', () => {
 
     act(() => {
       ReactNoop.render(
-        <Offscreen mode="visible">
-          <Component label="A" />
-        </Offscreen>,
+        <React.StrictMode>
+          <Offscreen mode="visible">
+            <Component label="A" />
+          </Offscreen>
+        </React.StrictMode>,
       );
     });
 
diff --git a/packages/react/src/__tests__/ReactStrictMode-test.js b/packages/react/src/__tests__/ReactStrictMode-test.js
index 6fcd88831da6a..0a4bae19c3ab5 100644
--- a/packages/react/src/__tests__/ReactStrictMode-test.js
+++ b/packages/react/src/__tests__/ReactStrictMode-test.js
@@ -67,7 +67,7 @@ describe('ReactStrictMode', () => {
     );
   });
 
-  // @gate enableStrictEffects
+  // @gate __DEV__
   it('should invoke precommit lifecycle methods twice', () => {
     let log = [];
     let shouldComponentUpdate = false;
@@ -108,26 +108,17 @@ describe('ReactStrictMode', () => {
       container,
     );
 
-    if (__DEV__) {
-      expect(log).toEqual([
-        'constructor',
-        'constructor',
-        'getDerivedStateFromProps',
-        'getDerivedStateFromProps',
-        'render',
-        'render',
-        'componentDidMount',
-        'componentWillUnmount',
-        'componentDidMount',
-      ]);
-    } else {
-      expect(log).toEqual([
-        'constructor',
-        'getDerivedStateFromProps',
-        'render',
-        'componentDidMount',
-      ]);
-    }
+    expect(log).toEqual([
+      'constructor',
+      'constructor',
+      'getDerivedStateFromProps',
+      'getDerivedStateFromProps',
+      'render',
+      'render',
+      'componentDidMount',
+      'componentWillUnmount',
+      'componentDidMount',
+    ]);
 
     log = [];
     shouldComponentUpdate = true;
@@ -138,24 +129,15 @@ describe('ReactStrictMode', () => {
       </React.StrictMode>,
       container,
     );
-    if (__DEV__) {
-      expect(log).toEqual([
-        'getDerivedStateFromProps',
-        'getDerivedStateFromProps',
-        'shouldComponentUpdate',
-        'shouldComponentUpdate',
-        'render',
-        'render',
-        'componentDidUpdate',
-      ]);
-    } else {
-      expect(log).toEqual([
-        'getDerivedStateFromProps',
-        'shouldComponentUpdate',
-        'render',
-        'componentDidUpdate',
-      ]);
-    }
+    expect(log).toEqual([
+      'getDerivedStateFromProps',
+      'getDerivedStateFromProps',
+      'shouldComponentUpdate',
+      'shouldComponentUpdate',
+      'render',
+      'render',
+      'componentDidUpdate',
+    ]);
 
     log = [];
     shouldComponentUpdate = false;
@@ -167,19 +149,12 @@ describe('ReactStrictMode', () => {
       container,
     );
 
-    if (__DEV__) {
-      expect(log).toEqual([
-        'getDerivedStateFromProps',
-        'getDerivedStateFromProps',
-        'shouldComponentUpdate',
-        'shouldComponentUpdate',
-      ]);
-    } else {
-      expect(log).toEqual([
-        'getDerivedStateFromProps',
-        'shouldComponentUpdate',
-      ]);
-    }
+    expect(log).toEqual([
+      'getDerivedStateFromProps',
+      'getDerivedStateFromProps',
+      'shouldComponentUpdate',
+      'shouldComponentUpdate',
+    ]);
   });
 
   it('should invoke setState callbacks twice', () => {