[Refactor] use ShallowTraversal’s nodeHasProperty inside MountedTra…

…versal’s `instHasProperty`.
enzymejs · Aug 26, 2016 · 2d9712a · 2d9712a
1 parent f76bc53
commit 2d9712a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/src/MountedTraversal.js b/src/MountedTraversal.js
@@ -2,7 +2,6 @@ import isEmpty from 'lodash/isEmpty';
 import isSubset from 'is-subset';
 import {
   internalInstance,
-  coercePropValue,
   nodeEqual,
   propsOfNode,
   isFunctionalComponent,
@@ -13,6 +12,9 @@ import {
   SELECTOR,
   nodeHasType,
 } from './Utils';
+import {
+  nodeHasProperty,
+} from './ShallowTraversal';
 import {
   isDOMComponent,
   isCompositeComponent,
@@ -85,26 +87,10 @@ export function instHasType(inst, type) {
 
 export function instHasProperty(inst, propKey, stringifiedPropValue) {
   if (!isDOMComponent(inst)) return false;
-  const node = getNode(inst);
-  const nodeProps = propsOfNode(node);
-  const descriptor = Object.getOwnPropertyDescriptor(nodeProps, propKey);
-  if (descriptor && descriptor.get) {
-    return false;
-  }
-  const nodePropValue = nodeProps[propKey];
-
-  const propValue = coercePropValue(propKey, stringifiedPropValue);
 
-  // intentionally not matching node props that are undefined
-  if (nodePropValue === undefined) {
-    return false;
-  }
-
-  if (propValue || propValue === 0) {
-    return nodePropValue === propValue;
-  }
+  const node = getNode(inst);
 
-  return Object.prototype.hasOwnProperty.call(nodeProps, propKey);
+  return nodeHasProperty(node, propKey, stringifiedPropValue);
 }
 
 // called with private inst

diff --git a/src/ShallowTraversal.js b/src/ShallowTraversal.js
@@ -86,13 +86,14 @@ export function nodeHasId(node, id) {
 
 export function nodeHasProperty(node, propKey, stringifiedPropValue) {
   const nodeProps = propsOfNode(node);
-  const propValue = coercePropValue(propKey, stringifiedPropValue);
   const descriptor = Object.getOwnPropertyDescriptor(nodeProps, propKey);
   if (descriptor && descriptor.get) {
     return false;
   }
   const nodePropValue = nodeProps[propKey];
 
+  const propValue = coercePropValue(propKey, stringifiedPropValue);
+
   if (nodePropValue === undefined) {
     return false;
   }