[enzyme-adapter-react-16] [fix] revert of wrapping shallow renders in…

… TestUtils.act Partial revert of 35ec8fb / #2034.
enzymejs · Mar 14, 2019 · e5e2a1f · e5e2a1f
1 parent 989cb7e
commit e5e2a1f
Showing 1 changed file with 53 additions and 55 deletions.
diff --git a/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js b/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js
@@ -396,65 +396,63 @@ class ReactSixteenAdapter extends EnzymeAdapter {
     let cachedNode = null;
     return {
       render(el, unmaskedContext) {
-        return wrapAct(() => {
-          cachedNode = el;
-          /* eslint consistent-return: 0 */
-          if (typeof el.type === 'string') {
-            isDOM = true;
-          } else {
-            isDOM = false;
-            const { type: Component } = el;
-
-            const isStateful = Component.prototype && (
-              Component.prototype.isReactComponent
-              || Array.isArray(Component.__reactAutoBindPairs) // fallback for createClass components
+        cachedNode = el;
+        /* eslint consistent-return: 0 */
+        if (typeof el.type === 'string') {
+          isDOM = true;
+        } else {
+          isDOM = false;
+          const { type: Component } = el;
+
+          const isStateful = Component.prototype && (
+            Component.prototype.isReactComponent
+            || Array.isArray(Component.__reactAutoBindPairs) // fallback for createClass components
+          );
+
+          const context = getMaskedContext(Component.contextTypes, unmaskedContext);
+
+          if (!isStateful && isMemo(el.type)) {
+            const InnerComp = el.type.type;
+            const wrappedEl = Object.assign(
+              (...args) => InnerComp(...args), // eslint-disable-line new-cap
+              InnerComp,
             );
+            return withSetStateAllowed(() => renderer.render({ ...el, type: wrappedEl }, context));
+          }
 
-            const context = getMaskedContext(Component.contextTypes, unmaskedContext);
-
-            if (!isStateful && isMemo(el.type)) {
-              const InnerComp = el.type.type;
-              const wrappedEl = Object.assign(
-                (...args) => InnerComp(...args), // eslint-disable-line new-cap
-                InnerComp,
-              );
-              return withSetStateAllowed(() => renderer.render({ ...el, type: wrappedEl }, context));
-            }
-
-            if (!isStateful && typeof Component === 'function') {
-              const wrappedEl = Object.assign(
-                (...args) => Component(...args), // eslint-disable-line new-cap
-                Component,
-              );
-              return withSetStateAllowed(() => renderer.render({ ...el, type: wrappedEl }, context));
-            }
-            if (isStateful) {
-              // fix react bug; see implementation of `getEmptyStateValue`
-              const emptyStateValue = getEmptyStateValue();
-              if (emptyStateValue) {
-                Object.defineProperty(Component.prototype, 'state', {
-                  configurable: true,
-                  enumerable: true,
-                  get() {
-                    return null;
-                  },
-                  set(value) {
-                    if (value !== emptyStateValue) {
-                      Object.defineProperty(this, 'state', {
-                        configurable: true,
-                        enumerable: true,
-                        value,
-                        writable: true,
-                      });
-                    }
-                    return true;
-                  },
-                });
-              }
+          if (!isStateful && typeof Component === 'function') {
+            const wrappedEl = Object.assign(
+              (...args) => Component(...args), // eslint-disable-line new-cap
+              Component,
+            );
+            return withSetStateAllowed(() => renderer.render({ ...el, type: wrappedEl }, context));
+          }
+          if (isStateful) {
+            // fix react bug; see implementation of `getEmptyStateValue`
+            const emptyStateValue = getEmptyStateValue();
+            if (emptyStateValue) {
+              Object.defineProperty(Component.prototype, 'state', {
+                configurable: true,
+                enumerable: true,
+                get() {
+                  return null;
+                },
+                set(value) {
+                  if (value !== emptyStateValue) {
+                    Object.defineProperty(this, 'state', {
+                      configurable: true,
+                      enumerable: true,
+                      value,
+                      writable: true,
+                    });
+                  }
+                  return true;
+                },
+              });
             }
-            return withSetStateAllowed(() => renderer.render(el, context));
           }
-        });
+          return withSetStateAllowed(() => renderer.render(el, context));
+        }
       },
       unmount() {
         renderer.unmount();