Object.toString() is [object Object] not ''

validatorjs · Feb 3, 2016 · a57f3c8 · a57f3c8
1 parent 995cf7a
commit a57f3c8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/test/validators.js b/test/validators.js
@@ -2455,11 +2455,16 @@ describe('Validators', function () {
     });
 
     it('should convert non-string input', function () {
-        var empty = [undefined, null, [], NaN, Object.create(null)];
+        var empty = [undefined, null, [], NaN];
         empty.forEach(function (item) {
             assert.equal(validator.toString(item), '');
             assert(validator.isNull(item));
         });
+
+        var objects = [{}, Object.create(null)];
+        objects.forEach(function (item) {
+            assert.equal(validator.toString(item), '[object Object]');
+        });
     });
 
 });
diff --git a/validator.js b/validator.js
@@ -127,13 +127,13 @@
     };
 
     validator.toString = function (input) {
-        if (typeof input === 'object') {
-            if (input !== null && typeof input.toString === 'function') {
+        if (typeof input === 'object' && input !== null) {
+            if (typeof input.toString === 'function') {
                 input = input.toString();
             } else {
-                input = '';
+                input = '[object Object]';
             }
-        } else if (typeof input === 'undefined' || (isNaN(input) && !input.length)) {
+        } else if (input === null || typeof input === 'undefined' || (isNaN(input) && !input.length)) {
             input = '';
         }
         return '' + input;