From e0719ad2d488a2fb1d994549f0ceb8bdb95ff7c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Norte?= <rubennorte@fb.com>
Date: Wed, 23 Jan 2019 14:18:01 +0000
Subject: [PATCH] Fix toHaveProperty matcher for inherited properties

---
 CHANGELOG.md                                |  1 +
 packages/expect/src/__tests__/utils.test.js | 12 ++++++++++++
 packages/expect/src/utils.js                |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea4aa16aaf57..1cd60cd8b786 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
 
 ### Fixes
 
+- `[expect]` Accept inherited properties in `toHaveProperty` matcher ([#7686](https://github.com/facebook/jest/pull/7686))
 - `[jest-diff]` Do not claim that `-0` and `0` have no visual difference ([#7605](https://github.com/facebook/jest/pull/7605))
 - `[jest-mock]` Fix automock for numeric function names ([#7653](https://github.com/facebook/jest/pull/7653))
 - `[jest-config]` Ensure `existsSync` is only called with a string parameter ([#7607](https://github.com/facebook/jest/pull/7607))
diff --git a/packages/expect/src/__tests__/utils.test.js b/packages/expect/src/__tests__/utils.test.js
index a56bd5fee2ee..180b514a1a77 100644
--- a/packages/expect/src/__tests__/utils.test.js
+++ b/packages/expect/src/__tests__/utils.test.js
@@ -76,6 +76,18 @@ describe('getPath()', () => {
     });
   });
 
+  test('property is inherited', () => {
+    class A {}
+    A.prototype.a = 'a';
+
+    expect(getPath(new A(), 'a')).toEqual({
+      hasEndProp: true,
+      lastTraversedObject: new A(),
+      traversedPath: ['a'],
+      value: 'a',
+    });
+  });
+
   test('path breaks', () => {
     expect(getPath({a: {}}, 'a.b.c')).toEqual({
       hasEndProp: false,
diff --git a/packages/expect/src/utils.js b/packages/expect/src/utils.js
index f99a5fdde95f..680c5faa0c1b 100644
--- a/packages/expect/src/utils.js
+++ b/packages/expect/src/utils.js
@@ -81,7 +81,7 @@ export const getPath = (
     result.traversedPath.unshift(prop);
 
     if (lastProp) {
-      result.hasEndProp = hasOwnProperty(object, prop);
+      result.hasEndProp = prop in object;
       if (!result.hasEndProp) {
         result.traversedPath.shift();
       }