Fix regression in .toImplement when dealing with falsy values.

JamieMason · Feb 4, 2016 · 8f5c98b · 8f5c98b
1 parent 0fe7909
commit 8f5c98b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/dist/jasmine-matchers.js b/dist/jasmine-matchers.js
@@ -1707,8 +1707,8 @@
     81: [function(require, module, exports) {
         'use strict';
 
-        var is = require('./lib/is');
         var toBeObject = require('./toBeObject');
+        var toHaveMember = require('./toHaveMember');
 
         module.exports = toImplement;
 
@@ -1720,16 +1720,16 @@
 
         function featuresAll(api, actual) {
             for (var key in api) {
-                if (!actual[key] || actual[key].constructor !== api[key]) {
+                if (!toHaveMember(key, actual) || actual[key].constructor !== api[key]) {
                     return false;
                 }
             }
             return true;
         }
 
     }, {
-        './lib/is': 8,
-        './toBeObject': 36
+        './toBeObject': 36,
+        './toHaveMember': 65
     }],
     82: [function(require, module, exports) {
         'use strict';

diff --git a/src/toImplement.js b/src/toImplement.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var is = require('./lib/is');
 var toBeObject = require('./toBeObject');
+var toHaveMember = require('./toHaveMember');
 
 module.exports = toImplement;
 
@@ -13,7 +13,7 @@ function toImplement(api, actual) {
 
 function featuresAll(api, actual) {
     for (var key in api) {
-        if (!actual[key] || actual[key].constructor !== api[key]) {
+        if (!toHaveMember(key, actual) || actual[key].constructor !== api[key]) {
             return false;
         }
     }

diff --git a/test/toImplement.spec.js b/test/toImplement.spec.js
@@ -7,14 +7,17 @@ describe('toImplement', function() {
                 it('should confirm', function() {
                     expect({
                         a: 1,
-                        b: 2
+                        b: 0,
+                        c: false
                     }).toImplement({
                         a: Number,
-                        b: Number
+                        b: Number,
+                        c: Boolean
                     });
                     expect({
                         a: 1,
-                        b: 2
+                        b: 0,
+                        c: false
                     }).toImplement({
                         a: Number
                     });