Merge pull request #8 from jaebradley/string-check

fix(validation): add string validation
jaebradley · Dec 7, 2017 · 27a6f4c · 27a6f4c
2 parents faea5b4 + 4d8ae80
commit 27a6f4c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/index.js b/src/index.js
@@ -3,7 +3,7 @@ import isEmail from 'isemail';
 const requiredEmailPropType = (props, propName, componentName) => {
   const value = props[propName];
 
-  if (value == null || !isEmail.validate(value)) {
+  if (value == null || typeof value !== 'string' || !isEmail.validate(value)) {
     return new TypeError(`Invalid Email Prop Value: ${value} for ${propName} in ${componentName}`);
   }
 

diff --git a/src/index.test.js b/src/index.test.js
@@ -24,6 +24,16 @@ describe('Email Prop Type Validation', () => {
       expect(isEmail.validate).toHaveBeenCalledWith(email);
     });
 
+    it('should throw an error if prop value is not a string', () => {
+      isEmail.validate = jest.fn().mockImplementation(() => false);
+      const props = {};
+      props[propName] = 1;
+
+      expect(emailPropType(props, propName, componentName))
+        .toEqual(new TypeError(`Invalid Email Prop Value: 1 for ${propName} in ${componentName}`));
+      expect(isEmail.validate).not.toHaveBeenCalled();
+    });
+
     it('should return null if prop is not defined', () => {
       const props = {};
 
@@ -54,6 +64,16 @@ describe('Email Prop Type Validation', () => {
       expect(isEmail.validate).toHaveBeenCalledWith(email);
     });
 
+    it('should throw an error if prop value is not a string', () => {
+      isEmail.validate = jest.fn().mockImplementation(() => false);
+      const props = {};
+      props[propName] = 1;
+
+      expect(emailPropType(props, propName, componentName))
+        .toEqual(new TypeError(`Invalid Email Prop Value: 1 for ${propName} in ${componentName}`));
+      expect(isEmail.validate).not.toHaveBeenCalled();
+    });
+
     it('should throw an error if prop is not defined', () => {
       const props = {};
       expect(emailPropType.isRequired(props, propName, componentName))