Fix forbid-prop-types for arrayOf and instanceOf (fixes #230)

jsx-eslint · Sep 30, 2015 · 00f716a · 00f716a
1 parent a2d9faa
commit 00f716a
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/lib/rules/forbid-prop-types.js b/lib/rules/forbid-prop-types.js
@@ -61,6 +61,12 @@ module.exports = function(context) {
       ) {
         declaration.value = declaration.value.object;
       }
+      if (
+        declaration.value.type === 'CallExpression' &&
+        declaration.value.callee.type === 'MemberExpression'
+      ) {
+        declaration.value = declaration.value.callee;
+      }
 
       if (isForbidden(declaration.value.property.name)) {
         context.report(declaration, 'Prop type `' + declaration.value.property.name + '` is forbidden');

diff --git a/tests/lib/rules/forbid-prop-types.js b/tests/lib/rules/forbid-prop-types.js
@@ -176,6 +176,21 @@ ruleTester.run('forbid-prop-types', rule, {
       experimentalObjectRestSpread: true,
       jsx: true
     }
+  }, {
+    code: [
+      'var Hello = React.createClass({',
+      '  propTypes: {',
+      '    retailer: PropTypes.instanceOf(Map).isRequired,',
+      '    requestRetailer: PropTypes.func.isRequired',
+      '  },',
+      '  render: function() {',
+      '    return <div />;',
+      '  }',
+      '});'
+    ].join('\n'),
+    ecmaFeatures: {
+      jsx: true
+    }
   }],
 
   invalid: [{
@@ -421,5 +436,24 @@ ruleTester.run('forbid-prop-types', rule, {
       jsx: true
     },
     errors: 2
+  }, {
+    code: [
+      'var Hello = React.createClass({',
+      '  propTypes: {',
+      '    retailer: PropTypes.instanceOf(Map).isRequired,',
+      '    requestRetailer: PropTypes.func.isRequired',
+      '  },',
+      '  render: function() {',
+      '    return <div />;',
+      '  }',
+      '});'
+    ].join('\n'),
+    ecmaFeatures: {
+      jsx: true
+    },
+    options: [{
+      forbid: ['instanceOf']
+    }],
+    errors: 1
   }]
 });