fix: compare value of inherited getter on test failure (jestjs#10167)

BenceSzalai · Mar 14, 2023 · 7eeacae · 7eeacae
1 parent 94c06ef
commit 7eeacae
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/packages/jest-matcher-utils/src/__tests__/deepCyclicCopyReplaceable.test.ts b/packages/jest-matcher-utils/src/__tests__/deepCyclicCopyReplaceable.test.ts
@@ -43,7 +43,7 @@ test('convert accessor descriptor into value descriptor', () => {
   });
 });
 
-test('should not skips non-enumerables', () => {
+test('should not skip non-enumerables', () => {
   const obj = {};
   Object.defineProperty(obj, 'foo', {enumerable: false, value: 'bar'});
 
@@ -66,6 +66,18 @@ test('copies symbols', () => {
   expect(deepCyclicCopyReplaceable(obj)[symbol]).toBe(42);
 });
 
+test('copies value of inherited getters', () => {
+  class Foo {
+    #foo = 42;
+    get foo() {
+      return this.#foo;
+    }
+  }
+  const obj = new Foo();
+
+  expect(deepCyclicCopyReplaceable(obj).foo).toBe(42);
+});
+
 test('copies arrays as array objects', () => {
   const array = [null, 42, 'foo', 'bar', [], {}];
 

diff --git a/packages/jest-matcher-utils/src/deepCyclicCopyReplaceable.ts b/packages/jest-matcher-utils/src/deepCyclicCopyReplaceable.ts
@@ -57,9 +57,11 @@ export default function deepCyclicCopyReplaceable<T>(
 
 function deepCyclicCopyObject<T>(object: T, cycles: WeakMap<any, unknown>): T {
   const newObject = Object.create(Object.getPrototypeOf(object));
-  const descriptors: {
-    [x: string]: PropertyDescriptor;
-  } = Object.getOwnPropertyDescriptors(object);
+  let descriptors: Record<string, PropertyDescriptor> = {};
+  let obj = object;
+  do {
+    descriptors = Object.assign({}, Object.getOwnPropertyDescriptors(obj), descriptors)
+  } while ( (obj = Object.getPrototypeOf( obj )) && obj !== Object.getPrototypeOf({}) );
 
   cycles.set(object, newObject);