modify toInclude

modules/TestUtils.js

@@ -20,13 +20,6 @@ export const isArray = (object) =>
 export const isObject = (object) =>
   object && !isArray(object) && typeof object === 'object'
 
-/**
- * Returns true if the given object is an empty object.
- */
-export const isEmptyObject = (object) =>
-  isObject(object)
-  && ownKeys(object).length === 0
-
 /**
  * Returns true if the given object is an instanceof value
  * or its typeof is the given value.
@@ -95,11 +88,8 @@ export const objectContains = (object, value, compareValues) => {
   if (compareValues == null)
     compareValues = isEqual
 
-  if (isEmptyObject(value))
-    return true
-
   return ownKeys(value).every(k => {
-    if (isObject(object[k]) && !isEmptyObject(value[k])) {
+    if (isObject(object[k]) && isObject(value[k])) {
       return objectContains(object[k], value[k], compareValues)
     }
 

modules/__tests__/toInclude-test.js

@@ -38,10 +38,6 @@ describe('toInclude', () => {
     expect(() => {
       expect({ a: 1, b: 2, c: 3 }).toInclude({ b: 4 })
     }).toThrow(/to include/)
-
-    expect(() => {
-      expect({ a: { b: 2 } }).toInclude({ a: {} })
-    }).toThrow(/to include/)
   })
 
   it('does not throw when an object contains an expected object in a deep key', () => {
@@ -64,6 +60,27 @@ describe('toInclude', () => {
     }).toThrow(/to include/)
   })
 
+  it('compares partial object only when both expected and actual properties are object', () => {
+    expect(() => {
+      expect({ a: { b: 2 } }).toInclude({ a: {} })
+    }).toNotThrow()
+
+    expect(() => {
+      expect({ a: 1 }).toInclude({ a: {} })
+    }).toThrow(/to include/)
+
+    expect(() => {
+      expect({ a: [] }).toInclude({ a: {} })
+    }).toThrow(/to include/)
+
+    expect(() => {
+      expect({ a: '1' }).toInclude({ a: {} })
+    }).toThrow(/to include/)
+
+    expect(() => {
+      expect({ a: () => {} }).toInclude({ a: {} })
+    }).toThrow(/to include/)
+  })
 
   if (typeof Object.create === 'function') {
     it('ignores nonenumerable properties of an expected object', () => {