Browse Source

JSUtil: Return result quicker for isValidJSON and add additional tests.

patch-2
Braydon Fuller 10 years ago
parent
commit
a1ee393dce
  1. 5
      lib/util/js.js
  2. 6
      test/util/js.js

5
lib/util/js.js

@ -32,13 +32,12 @@ module.exports = {
try { try {
parsed = JSON.parse(arg); parsed = JSON.parse(arg);
} catch (e) { } catch (e) {
parsed = false; return false;
} }
if (typeof(parsed) === 'object') { if (typeof(parsed) === 'object') {
return true; return true;
} else {
return false;
} }
return false;
}, },
isHexa: isHexa, isHexa: isHexa,
isHexaString: isHexa, isHexaString: isHexa,

6
test/util/js.js

@ -13,6 +13,7 @@ describe('js utils', function() {
var hexa = '8080808080808080808080808080808080808080808080808080808080808080'; var hexa = '8080808080808080808080808080808080808080808080808080808080808080';
var json = '{"key": ["value", "value2"]}'; var json = '{"key": ["value", "value2"]}';
var json2 = '["value", "value2", {"key": "value"}]';
it('does not mistake an integer as valid json object', function() { it('does not mistake an integer as valid json object', function() {
var valid = JSUtil.isValidJSON(hexa); var valid = JSUtil.isValidJSON(hexa);
@ -24,6 +25,11 @@ describe('js utils', function() {
valid.should.equal(true); valid.should.equal(true);
}); });
it('correctly validates an array json object', function() {
var valid = JSUtil.isValidJSON(json);
valid.should.equal(true);
});
}); });
}); });

Loading…
Cancel
Save