fix: min was not invalid for non-numbers; neither min nor max were te…

…sting for that
jeffhandley · Dec 22, 2017 · 250bda3 · 250bda3
1 parent 2eb2eec
commit 250bda3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/packages/strickland/src/max.js b/packages/strickland/src/max.js
@@ -31,8 +31,10 @@ export default function max(maxProp, validatorProps) {
 
         if (isFalsyButNotZero(value)) {
             // Empty values are always valid except with the required validator
+
         } else if (typeof value !== 'number') {
             isValid = false;
+
         } else if (value > validationProps.max) {
             isValid = false;
         }

diff --git a/packages/strickland/src/min.js b/packages/strickland/src/min.js
@@ -32,6 +32,9 @@ export default function min(minProp, validatorProps) {
         if (isFalsyButNotZero(value)) {
             // Empty values are always valid except with the required validator
 
+        } else if (typeof value !== 'number') {
+            isValid = false;
+
         } else if (value < validationProps.min) {
             isValid = false;
         }

diff --git a/packages/strickland/test/max.spec.js b/packages/strickland/test/max.spec.js
@@ -112,6 +112,11 @@ describe('max', () => {
             const result = validate();
             expect(result.isValid).toBe(true);
         });
+
+        it('with a string value, it is not valid', () => {
+            const result = validate('A');
+            expect(result.isValid).toBe(false);
+        });
     });
 
     describe('with props passed into validation', () => {

diff --git a/packages/strickland/test/min.spec.js b/packages/strickland/test/min.spec.js
@@ -99,6 +99,11 @@ describe('min', () => {
             const result = validate();
             expect(result.isValid).toBe(true);
         });
+
+        it('with a string value, it is not valid', () => {
+            const result = validate('A');
+            expect(result.isValid).toBe(false);
+        });
     });
 
     describe('with props passed into validation', () => {