Merge pull request #2 from livechat/API-4316/fix-non-negative-validation

Fix nonNegative validation rule
livechat · Sep 23, 2019 · 0c55173 · 0c55173
2 parents 9093c8c + 5d60284
commit 0c55173
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 10 deletions.
diff --git a/index.js b/index.js
diff --git a/lib/express-validate.js b/lib/express-validate.js
diff --git a/lib/parser.js b/lib/parser.js
diff --git a/lib/validator.js b/lib/validator.js
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
 			"email": "[email protected]"
 		}
 	],
-	"version": "0.1.15",
+	"version": "0.1.16",
 	"homepage": "https://github.com/livechat/express-validate",
 	"repository": {
 		"type": "git",

diff --git a/src/validator.coffee b/src/validator.coffee
@@ -180,7 +180,7 @@ Validator.addRule 'lowerThan',
 Validator.addRule 'nonNegative',
 	message: "%s must be non-negative"
 	test: (str) ->
-		return @rules.between.test str, {low: -1, high: Infinity}
+		return @rules.between.test str, {low: 0, high: Infinity}
 
 Validator.addRule 'positive',
 	message: "%s must be positive"

diff --git a/test/test_validator.coffee b/test/test_validator.coffee
@@ -38,6 +38,18 @@ describe "Validator", ()->
 			validator.testInternal({key: "1"}, "integer", "key").should.be.false
 			validator.testInternal({key: "0"}, "integer", "key").should.be.false
 
+		it "non-negative rule", () ->
+			validator.testInternal({key: "-1"}, "nonNegative", "key").should.not.be.false
+			validator.testInternal({key: -1}, "nonNegative", "key").should.not.be.false
+			validator.testInternal({key: -2}, "nonNegative", "key").should.not.be.false
+			validator.testInternal({key: -223572357235}, "nonNegative", "key").should.not.be.false
+
+			validator.testInternal({key: "0"}, "nonNegative", "key").should.be.false
+			validator.testInternal({key: 0}, "nonNegative", "key").should.be.false
+			validator.testInternal({key: 1}, "nonNegative", "key").should.be.false
+			validator.testInternal({key: 2}, "nonNegative", "key").should.be.false
+			validator.testInternal({key: 9235472346}, "nonNegative", "key").should.be.false
+
 	describe "validate", ->
 		it "should validate simple object", () ->
 			validator.validate({key: "value"}, {key: "required"}).length.should.equal 0