Change how Object casting happens to always return {} if type isn't o…

…bject.
domharrington · Aug 23, 2012 · 272d00d · 272d00d
1 parent 9d2707b
commit 272d00d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/schemata.js b/lib/schemata.js
@@ -191,7 +191,8 @@ module.exports = function(schema) {
         }
         return value.toString && value.toString();
       case Object:
-        return (value === '' || value === null || value === undefined) ? {} : value;
+        // typeof null === 'object', so the extra check is needed for null
+        return (typeof value !== 'object' || value === null) ? {} : value;
       case Date:
         return (value === '' || value === null || value === undefined) ? null : (value instanceof Date ? value : new Date(value));
       case Array:

diff --git a/test/schemata.test.js b/test/schemata.test.js
@@ -286,7 +286,7 @@ describe('schemata', function() {
 
     it('converts object correctly', function() {
       var schema = createArraySchema();
-      [null, ''].forEach(function(value) {
+      [null, '', 'hello', [], undefined].forEach(function(value) {
         Object.keys(schema.castProperty(Object, value)).should.have.lengthOf(0);
       });
       [{a:'b'}].forEach(function(value) {