diff --git a/packages/jest-matchers/src/__tests__/__snapshots__/matchers.test.js.snap b/packages/jest-matchers/src/__tests__/__snapshots__/matchers.test.js.snap index f9ddb5314793..69632c8a590c 100644 --- a/packages/jest-matchers/src/__tests__/__snapshots__/matchers.test.js.snap +++ b/packages/jest-matchers/src/__tests__/__snapshots__/matchers.test.js.snap @@ -2914,6 +2914,21 @@ Difference: ]" `; +exports[`toMatchObject() {pass: false} expect([Error: foo]).toMatchObject([Error: bar]) 1`] = ` +"expect(received).toMatchObject(expected) + +Expected value to match object: + [Error: bar] +Received: + [Error: foo] +Difference: +- Expected ++ Received + +-[Error: bar] ++[Error: foo]" +`; + exports[`toMatchObject() {pass: false} expect({"a": "a", "c": "d"}).toMatchObject({"a": Any}) 1`] = ` "expect(received).toMatchObject(expected) @@ -3295,6 +3310,15 @@ Received: [1, 2]" `; +exports[`toMatchObject() {pass: true} expect([Error: foo]).toMatchObject([Error: foo]) 1`] = ` +"expect(received).not.toMatchObject(expected) + +Expected value not to match object: + [Error: foo] +Received: + [Error: foo]" +`; + exports[`toMatchObject() {pass: true} expect({"a": "b", "c": "d"}).toMatchObject({"a": "b", "c": "d"}) 1`] = ` "expect(received).not.toMatchObject(expected) diff --git a/packages/jest-matchers/src/__tests__/matchers.test.js b/packages/jest-matchers/src/__tests__/matchers.test.js index e5616c312b06..22ad6db509d0 100644 --- a/packages/jest-matchers/src/__tests__/matchers.test.js +++ b/packages/jest-matchers/src/__tests__/matchers.test.js @@ -848,6 +848,7 @@ describe('toMatchObject()', () => { [[1, 2], [1, 2]], [{a: undefined}, {a: undefined}], [[], []], + [new Error('foo'), new Error('foo')], ].forEach(([n1, n2]) => { it(`{pass: true} expect(${stringify(n1)}).toMatchObject(${stringify( n2, @@ -883,6 +884,7 @@ describe('toMatchObject()', () => { [{}, {a: undefined}], [[1, 2, 3], [2, 3, 1]], [[1, 2, 3], [1, 2, 2]], + [new Error('foo'), new Error('bar')], ].forEach(([n1, n2]) => { it(`{pass: false} expect(${stringify(n1)}).toMatchObject(${stringify( n2, diff --git a/packages/jest-matchers/src/matchers.js b/packages/jest-matchers/src/matchers.js index 6ea550dfad63..c2bd907d67be 100644 --- a/packages/jest-matchers/src/matchers.js +++ b/packages/jest-matchers/src/matchers.js @@ -29,6 +29,7 @@ import { getPath, hasOwnProperty, iterableEquality, + subsetEquality, } from './utils'; import {equals} from './jasmine_utils'; @@ -39,22 +40,6 @@ type ContainIterable = | DOMTokenList | HTMLCollection; -const isObjectWithKeys = a => - a !== null && - typeof a === 'object' && - !(a instanceof Array) && - !(a instanceof Date); -const subsetEquality = (object, subset) => { - if (!isObjectWithKeys(object) || !isObjectWithKeys(subset)) { - return undefined; - } - return Object.keys(subset).every( - key => - hasOwnProperty(object, key) && - equals(object[key], subset[key], [iterableEquality, subsetEquality]), - ); -}; - const matchers: MatchersObject = { toBe(received: any, expected: number) { const pass = received === expected; diff --git a/packages/jest-matchers/src/utils.js b/packages/jest-matchers/src/utils.js index 53ff7e59dd58..750d26861cfc 100644 --- a/packages/jest-matchers/src/utils.js +++ b/packages/jest-matchers/src/utils.js @@ -143,6 +143,25 @@ export const iterableEquality = (a: any, b: any) => { return true; }; +const isObjectWithKeys = a => + a !== null && + typeof a === 'object' && + !(a instanceof Error) && + !(a instanceof Array) && + !(a instanceof Date); + +export const subsetEquality = (object: Object, subset: Object) => { + if (!isObjectWithKeys(object) || !isObjectWithKeys(subset)) { + return undefined; + } + + return Object.keys(subset).every( + key => + hasOwnProperty(object, key) && + equals(object[key], subset[key], [iterableEquality, subsetEquality]), + ); +}; + export const partition = ( items: Array, predicate: T => boolean,