fix: add Profiler support for adapter-react-16

enzymejs · Sep 7, 2019 · 49fccc8 · 49fccc8
1 parent d26ccd4
commit 49fccc8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/packages/enzyme-adapter-react-16/src/detectFiberTags.js b/packages/enzyme-adapter-react-16/src/detectFiberTags.js
@@ -44,7 +44,7 @@ module.exports = function detectFiberTags() {
   const supportsContext = typeof React.createContext !== 'undefined';
   const supportsForwardRef = typeof React.forwardRef !== 'undefined';
   const supportsMemo = typeof React.memo !== 'undefined';
-  const supportsProfiler = typeof React.unstable_Profiler !== 'undefined';
+  const supportsProfiler = typeof React.unstable_Profiler !== 'undefined' || typeof React.Profiler !== 'undefined';
   const supportsSuspense = typeof React.Suspense !== 'undefined';
   const supportsLazy = typeof React.lazy !== 'undefined';
 
@@ -99,7 +99,7 @@ module.exports = function detectFiberTags() {
       ? getFiber(React.createElement(FwdRef)).tag
       : -1,
     Profiler: supportsProfiler
-      ? getFiber(React.createElement(React.unstable_Profiler, { id: 'mock', onRender() {} })).tag
+      ? getFiber(React.createElement((React.Profiler || React.unstable_Profiler), { id: 'mock', onRender() {} })).tag
       : -1,
     Suspense: supportsSuspense
       ? getFiber(React.createElement(React.Suspense, { fallback: false })).tag

diff --git a/packages/enzyme-test-suite/test/Adapter-spec.jsx b/packages/enzyme-test-suite/test/Adapter-spec.jsx
@@ -1048,7 +1048,7 @@ describe('Adapter', () => {
       expect(getDisplayName(<Profiler />)).to.equal('Profiler');
     });
 
-    itIf(is('>= 16.6'), 'supports ConcurrentMode', () => {
+    itIf((is('>= 16.6') && is('<16.9')), 'supports ConcurrentMode', () => {
       expect(getDisplayName(<ConcurrentMode />)).to.equal('ConcurrentMode');
     });
 

diff --git a/packages/enzyme-test-suite/test/_helpers/react-compat.js b/packages/enzyme-test-suite/test/_helpers/react-compat.js
@@ -83,15 +83,23 @@ if (is('^16.3.0-0')) {
   AsyncMode = null;
 }
 
-if (is('^16.4.0-0')) {
+if (is('^16.9.0-0')) {
+  ({ Profiler } = require('react'));
+} else if (is('^16.4.0-0')) {
   ({
     unstable_Profiler: Profiler,
   } = require('react'));
 } else {
   Profiler = null;
 }
 
-if (is('^16.6.0-0')) {
+if (is('^16.9.0-0')) {
+  ({
+    Suspense,
+    lazy,
+    memo,
+  } = require('react'));
+} else if (is('^16.6.0-0')) {
   ({
     unstable_ConcurrentMode: ConcurrentMode,
     Suspense,