Skip to content

Commit 5118610

Browse files
committed
add more test cases
1 parent f274112 commit 5118610

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

lib/rules/forbid-prop-types.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ module.exports = {
6666
function isPropTypesPackage(node) {
6767
return (
6868
node.type === 'Identifier'
69-
&& node.name === propTypesPackageName
69+
&& (node.name === null || node.name === propTypesPackageName)
7070
) || (
7171
node.type === 'MemberExpression'
7272
&& node.property.name === 'PropTypes'
73-
&& node.object.name === reactPackageName
73+
&& (node.object.name === null || node.object.name === reactPackageName)
7474
);
7575
}
7676

@@ -218,7 +218,6 @@ module.exports = {
218218
node.callee.object
219219
&& !isPropTypesPackage(node.callee.object)
220220
&& !propsUtil.isPropTypesDeclaration(node.callee)
221-
&& node.callee.object.name !== 'PropTypes'
222221
) {
223222
return;
224223
}

tests/lib/rules/forbid-prop-types.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,27 @@ ruleTester.run('forbid-prop-types', rule, {
654654
})
655655
)
656656
`,
657+
},
658+
{
659+
code: `
660+
import CustomPropTypes from "prop-types";
661+
class Component extends React.Component {};
662+
Component.propTypes = {
663+
a: CustomPropTypes.shape({
664+
b: CustomPropTypes.String,
665+
c: CustomPropTypes.number.isRequired,
666+
})
667+
}
668+
`,
669+
},
670+
{
671+
code: `
672+
import CustomReact from "react"
673+
class Component extends React.Component {};
674+
Component.propTypes = {
675+
b: CustomReact.PropTypes.string,
676+
}
677+
`,
657678
}
658679
)),
659680

0 commit comments

Comments
 (0)