Fix for 5468: Validate proptype definitions sooner

Added typeCheckWarn() func and updated the oneOf/oneOfType tests Added __DEV__ warning for invalid oneOf/OneOfType args
facebook · Mar 22, 2016 · ff13701 · ff13701
1 parent c528732
commit ff13701
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/isomorphic/classic/types/ReactPropTypes.js b/src/isomorphic/classic/types/ReactPropTypes.js
@@ -16,6 +16,7 @@ var ReactPropTypeLocationNames = require('ReactPropTypeLocationNames');
 
 var emptyFunction = require('emptyFunction');
 var getIteratorFn = require('getIteratorFn');
+var warning = require('warning');
 
 /**
  * Collection of methods that allow declaration and validation of props that are
@@ -225,6 +226,9 @@ function createInstanceTypeChecker(expectedClass) {
 
 function createEnumTypeChecker(expectedValues) {
   if (!Array.isArray(expectedValues)) {
+    if (__DEV__) {
+      warning(false, 'Invalid argument supplied to oneOf, expected an instance of array.');
+    }
     return createChainableTypeChecker(function() {
       return new Error(
         `Invalid argument supplied to oneOf, expected an instance of array.`
@@ -287,6 +291,9 @@ function createObjectOfTypeChecker(typeChecker) {
 
 function createUnionTypeChecker(arrayOfTypeCheckers) {
   if (!Array.isArray(arrayOfTypeCheckers)) {
+    if (__DEV__) {
+      warning(false, 'Invalid argument supplied to oneOfType, expected an instance of array.');
+    }
     return createChainableTypeChecker(function() {
       return new Error(
         `Invalid argument supplied to oneOfType, expected an instance of array.`

diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
@@ -45,6 +45,13 @@ function typeCheckPass(declaration, value) {
   expect(error).toBe(null);
 }
 
+function typeCheckWarn(propTypeFunc, message) { 
+  spyOn(console, ['error']);
+  propTypeFunc();
+  expect(console.error).toHaveBeenCalled();
+  expect(console.error.argsForCall[0][0]).toContain(message);
+}
+
 describe('ReactPropTypes', function() {
   beforeEach(function() {
     PropTypes = require('ReactPropTypes');
@@ -569,6 +576,12 @@ describe('ReactPropTypes', function() {
 
   describe('OneOf Types', function() {
     it('should fail for invalid argument', function() {
+      typeCheckWarn(
+        function() { 
+          PropTypes.oneOf('red', 'blue');
+        },
+        'Invalid argument supplied to oneOf, expected an instance of array.'
+      );
       typeCheckFail(
         PropTypes.oneOf('red', 'blue'),
         'red',
@@ -630,6 +643,12 @@ describe('ReactPropTypes', function() {
 
   describe('Union Types', function() {
     it('should fail for invalid argument', function() {
+      typeCheckWarn(
+        function() { 
+          PropTypes.oneOfType(PropTypes.string, PropTypes.number);
+        },
+        'Invalid argument supplied to oneOfType, expected an instance of array.'
+      );
       typeCheckFail(
         PropTypes.oneOfType(PropTypes.string, PropTypes.number),
         'red',