Proper validation of min and max

Tabcorp · Mar 18, 2015 · 7c48a60 · 7c48a60
1 parent 50aadc5
commit 7c48a60
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 4 deletions.
diff --git a/lib/matchers/number.js b/lib/matchers/number.js
@@ -1,4 +1,6 @@
-var s = require('../s');
+var s        = require('../s');
+var utils    = require('../utils');
+var hasValue = utils.hasValue;
 
 var parseFloatFromString = function (value) {
   if(/^(\-|\+)?([0-9]+(\.[0-9]+)?)$/.test(value))
@@ -21,13 +23,13 @@ module.exports = function (opts) {
     }
 
     if (opts) {
-      if (opts.min && opts.max && (value < opts.min || value > opts.max)) {
+      if (hasValue(opts.min) && hasValue(opts.max) && (value < opts.min || value > opts.max)) {
         return 'should be a number between ' + opts.min + ' and ' + opts.max;
       }
-      if (opts.min && value < opts.min) {
+      if (hasValue(opts.min) && value < opts.min) {
         return 'should be a number >= ' + opts.min;
       }
-      if (opts.max && value > opts.max) {
+      if (hasValue(opts.max) && value > opts.max) {
         return 'should be a number <= ' + opts.max;
       }
     }

diff --git a/lib/utils.js b/lib/utils.js
@@ -0,0 +1,7 @@
+var hasValue = function(val){
+  return (typeof val !== 'undefined') && (val !== null);
+}
+
+module.exports = {
+  hasValue: hasValue
+}
diff --git a/test/matchers/number.spec.js b/test/matchers/number.spec.js
@@ -16,6 +16,8 @@ describe('number matcher', function() {
 
   it('supports min and max', function() {
     number({min: 3})('', 0).should.have.error(/should be a number >= 3/);
+    number({min: 0})('', -10).should.have.error(/should be a number >= 0/);
+    number({max: 0})('', 12).should.have.error(/should be a number <= 0/);
     number({max: 3})('', 5).should.have.error(/should be a number <= 3/);
     number({min: 3, max: 5})('', 7).should.have.error(/should be a number between 3 and 5/);
   });

diff --git a/test/util.spec.js b/test/util.spec.js
@@ -0,0 +1,28 @@
+var utils    = require('../lib/utils');
+var hasValue = utils.hasValue;
+
+describe("hasValue() util function", function(){
+  it('Should return false when value is <null>', function(){
+    hasValue(null).should.be.false;
+  });
+
+  it('Should return false when value is <undefined>', function(){
+    hasValue(undefined).should.be.false;
+  });
+
+  it('Should return true when value is a number', function(){
+    hasValue(12).should.be.true;
+  });
+
+  it('Should return true when value is a string', function(){
+    hasValue('a').should.be.true;
+  });
+
+  it('Should return true when value is <{}>', function(){
+    hasValue({}).should.be.true;
+  });
+
+  it('Should return true when value is <"">', function(){
+    hasValue('').should.be.true;
+  });
+});