From 61a4a743a2d01357430af83c1a6f5eea4fa9d680 Mon Sep 17 00:00:00 2001
From: Dave Normington <david.normo@gmail.com>
Date: Fri, 21 Jan 2022 11:39:01 +0000
Subject: [PATCH] fix(matcher-utils): correct diff for expect asymmetric
 matchers

---
 .../__snapshots__/matchers.test.js.snap       | 19 +++++++++--
 .../__snapshots__/index.test.ts.snap          | 19 +++++++++++
 .../src/__tests__/index.test.ts               | 34 +++++++++++++++++++
 packages/jest-matcher-utils/src/index.ts      |  7 ----
 4 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/packages/expect/src/__tests__/__snapshots__/matchers.test.js.snap b/packages/expect/src/__tests__/__snapshots__/matchers.test.js.snap
index 16f85cccd725..5085d0b677e8 100644
--- a/packages/expect/src/__tests__/__snapshots__/matchers.test.js.snap
+++ b/packages/expect/src/__tests__/__snapshots__/matchers.test.js.snap
@@ -2175,8 +2175,15 @@ Received: <r>{"0": "a", "1": "b", "2": "c"}</>
 exports[`.toEqual() {pass: false} expect({"a": 1, "b": 2}).toEqual(ObjectContaining {"a": 2}) 1`] = `
 <d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
 
-Expected: <g>ObjectContaining {"a": 2}</>
-Received: <r>{"a": 1, "b": 2}</>
+<g>- Expected  - 2</>
+<r>+ Received  + 3</>
+
+<g>- ObjectContaining {</>
+<g>-   "a": 2,</>
+<r>+ Object {</>
+<r>+   "a": 1,</>
+<r>+   "b": 2,</>
+<d>  }</>
 `;
 
 exports[`.toEqual() {pass: false} expect({"a": 1}).toEqual({"a": 2}) 1`] = `
@@ -3560,6 +3567,14 @@ Expected path: <g>"memo"</>
 Expected value: not <g>[]</>
 `;
 
+exports[`.toHaveProperty() {pass: true} expect({"": 1}).toHaveProperty('', 1) 1`] = `
+<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>""</>
+
+Expected value: not <g>1</>
+`;
+
 exports[`.toHaveProperty() {pass: true} expect({"a": {"b": [[{"c": [{"d": 1}]}]]}}).toHaveProperty('a.b[0][0].c[0].d', 1) 1`] = `
 <d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
 
diff --git a/packages/jest-matcher-utils/src/__tests__/__snapshots__/index.test.ts.snap b/packages/jest-matcher-utils/src/__tests__/__snapshots__/index.test.ts.snap
index 449a8ac82a93..a89c3850194b 100644
--- a/packages/jest-matcher-utils/src/__tests__/__snapshots__/index.test.ts.snap
+++ b/packages/jest-matcher-utils/src/__tests__/__snapshots__/index.test.ts.snap
@@ -88,6 +88,25 @@ exports[`ensureNumbers() with options promise resolves isNot true expected 1`] =
 Expected has value: <g>null</>
 `;
 
+exports[`printDiffOrStringify expected asymmetric matchers should be diffable 1`] = `
+<g>- Expected  - 2</>
+<r>+ Received  + 2</>
+
+<g>- ObjectContaining {</>
+<r>+ Object {</>
+<d>    "array": Array [</>
+<d>      Object {</>
+<d>        "3": "three",</>
+<d>        "four": "4",</>
+<d>        "one": 1,</>
+<g>-       "two": 2,</>
+<r>+       "two": 1,</>
+<d>      },</>
+<d>    ],</>
+<d>    "foo": "bar",</>
+<d>  }</>
+`;
+
 exports[`stringify() toJSON errors when comparing two objects 1`] = `
 <d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
 
diff --git a/packages/jest-matcher-utils/src/__tests__/index.test.ts b/packages/jest-matcher-utils/src/__tests__/index.test.ts
index 668307405512..9ed9cc9e17e3 100644
--- a/packages/jest-matcher-utils/src/__tests__/index.test.ts
+++ b/packages/jest-matcher-utils/src/__tests__/index.test.ts
@@ -342,3 +342,37 @@ describe('matcherHint', () => {
     expect(received).toMatch(substringPositive);
   });
 });
+
+describe('printDiffOrStringify', () => {
+  test('expected asymmetric matchers should be diffable', () => {
+    jest.dontMock('jest-diff');
+    jest.resetModules();
+    const {printDiffOrStringify} = require('../');
+
+    const expected = expect.objectContaining({
+      array: [
+        {
+          3: 'three',
+          four: '4',
+          one: 1,
+          two: 2,
+        },
+      ],
+      foo: 'bar',
+    });
+    const received = {
+      array: [
+        {
+          3: 'three',
+          four: '4',
+          one: 1,
+          two: 1,
+        },
+      ],
+      foo: 'bar',
+    };
+    expect(
+      printDiffOrStringify(expected, received, 'Expected', 'Received', false),
+    ).toMatchSnapshot();
+  });
+});
diff --git a/packages/jest-matcher-utils/src/index.ts b/packages/jest-matcher-utils/src/index.ts
index 84aca72cd345..7210d37c624c 100644
--- a/packages/jest-matcher-utils/src/index.ts
+++ b/packages/jest-matcher-utils/src/index.ts
@@ -293,13 +293,6 @@ const isLineDiffable = (expected: unknown, received: unknown): boolean => {
     return false;
   }
 
-  if (
-    expectedType === 'object' &&
-    typeof (expected as any).asymmetricMatch === 'function'
-  ) {
-    return false;
-  }
-
   if (
     receivedType === 'object' &&
     typeof (received as any).asymmetricMatch === 'function'