fix(expect): Fix to properly compare ObjectContaining

packages/utils/src/diff/index.ts

@@ -12,6 +12,7 @@ import {
   format as prettyFormat,
   plugins as prettyFormatPlugins,
 } from 'pretty-format'
+import { isObjectContaining } from '../helpers'
 import { getType } from './getType'
 import { DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT, Diff } from './cleanupSemantic'
 import { NO_DIFF_MESSAGE, SIMILAR_MESSAGE } from './constants'
@@ -185,6 +186,18 @@ function getFormatOptions(
   }
 }
 
+function replaceDiffData(a: any, b: any, expected?: string) {
+  if (isObjectContaining(expected)) {
+    Object.keys(b).forEach((key) => {
+      if (!Object.prototype.hasOwnProperty.call(a.sample, key)) {
+        a.sample[key] = b[key]
+      }
+    })
+  }
+
+  return { replacedA: a, replacedB: b }
+}
+
 function getObjectsDifference(
   a: Record<string, any>,
   b: Record<string, any>,
@@ -198,6 +211,19 @@ function getObjectsDifference(
   if (aCompare === bCompare) {
     return getCommonMessage(NO_DIFF_MESSAGE, options)
   }
+  else if (options?.expected) {
+    const { replacedA, replacedB } = replaceDiffData(a, b, options?.expected)
+    const aDisplay = prettyFormat(replacedA, formatOptions)
+    const bDisplay = prettyFormat(replacedB, formatOptions)
+
+    return diffLinesUnified2(
+      aDisplay.split('\n'),
+      bDisplay.split('\n'),
+      aCompare.split('\n'),
+      bCompare.split('\n'),
+      options,
+    )
+  }
   else {
     const aDisplay = prettyFormat(a, formatOptions)
     const bDisplay = prettyFormat(b, formatOptions)

packages/utils/src/diff/types.ts

@@ -23,6 +23,7 @@ export interface DiffOptions {
   contextLines?: number
   emptyFirstOrLastLinePlaceholder?: string
   expand?: boolean
+  expected?: string
   includeChangeCounts?: boolean
   omitAnnotationLines?: boolean
   patchColor?: DiffOptionsColor

packages/utils/src/error.ts

@@ -143,6 +143,7 @@ export function processError(
     err.diff = diff(replacedExpected, replacedActual, {
       ...diffOptions,
       ...err.diffOptions,
+      expected: err.expected,
     })
   }
 

packages/utils/src/helpers.ts

@@ -266,3 +266,9 @@ export function isNegativeNaN(val: number) {
 
   return isNegative
 }
+
+export function isObjectContaining(expected: any): boolean {
+  return typeof expected === 'object'
+    && typeof expected.asymmetricMatch === 'function'
+    && (expected.toString() === 'ObjectContaining' || expected.toString() === 'ObjectNotContaining')
+}

test/core/test/__snapshots__/jest-expect.test.ts.snap

@@ -163,8 +163,8 @@ exports[`asymmetric matcher error 12`] = `
 - ObjectContaining {
 + Object {
     "k": "v",
+    "k2": "v2",
 -   "k3": "v3",
-+   "k2": "v2",
   }",
   "expected": "ObjectContaining {
   "k": "v",