1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

util: make _extend() more robust

Browse Source 
Add a better 'is object?' check, the old one let values like true slip through.
This commit is contained in:
Ben Noordhuis 2012-05-10 16:49:35 +02:00
parent 5979f096d1
commit 928d28a7b3
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/util.js
View File

@ -509,7 +509,7 @@ exports.inherits = function(ctor, superCtor) {
exports._extend = function(origin, add) { exports._extend = function(origin, add) {
// Don't do anything if add isn't an object // Don't do anything if add isn't an object
if (!add) return origin; if (!add || typeof add !== 'object') return origin;
var keys = Object.keys(add); var keys = Object.keys(add);
var i = keys.length; var i = keys.length;

9
test/simple/test-util.js
View File

@ -69,3 +69,12 @@ assert.equal(false, util.isError({}));
assert.equal(false, util.isError({ name: 'Error', message: '' })); assert.equal(false, util.isError({ name: 'Error', message: '' }));
assert.equal(false, util.isError([])); assert.equal(false, util.isError([]));
assert.equal(false, util.isError(Object.create(Error.prototype))); assert.equal(false, util.isError(Object.create(Error.prototype)));
// _extend
assert.deepEqual(util._extend({a:1}), {a:1});
assert.deepEqual(util._extend({a:1}, []), {a:1});
assert.deepEqual(util._extend({a:1}, null), {a:1});
assert.deepEqual(util._extend({a:1}, true), {a:1});
assert.deepEqual(util._extend({a:1}, false), {a:1});
assert.deepEqual(util._extend({a:1}, {b:2}), {a:1, b:2});
assert.deepEqual(util._extend({a:1, b:2}, {b:3}), {a:1, b:3});