Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Refactor] no-render-return-value: reuse version test result #2264

Merged
merged 2 commits into from May 6, 2019
Merged

[Refactor] no-render-return-value: reuse version test result #2264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
935b0b0
[Refactor] `no-render-return-value`: reuse version test result
golopot May 6, 2019
a7c48dd
[Tests] `no-render-return-value`: add test cases
golopot May 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions lib/rules/no-render-return-value.js
View file
Open in desktop
Expand Up @@ -27,6 +27,15 @@ module.exports = {
// Public
// --------------------------------------------------------------------------

let calleeObjectName = /^ReactDOM$/;
if (versionUtil.testReactVersion(context, '15.0.0')) {
calleeObjectName = /^ReactDOM$/;
} else if (versionUtil.testReactVersion(context, '0.14.0')) {
calleeObjectName = /^React(DOM)?$/;
} else if (versionUtil.testReactVersion(context, '0.13.0')) {
calleeObjectName = /^React$/;
}

return {

CallExpression: function(node) {
Expand All @@ -36,15 +45,6 @@ module.exports = {
return;
}

let calleeObjectName = /^ReactDOM$/;
if (versionUtil.testReactVersion(context, '15.0.0')) {
calleeObjectName = /^ReactDOM$/;
} else if (versionUtil.testReactVersion(context, '0.14.0')) {
calleeObjectName = /^React(DOM)?$/;
} else if (versionUtil.testReactVersion(context, '0.13.0')) {
calleeObjectName = /^React$/;
}

if (
callee.object.type !== 'Identifier' ||
!calleeObjectName.test(callee.object.name) ||
Expand Down
11 changes: 11 additions & 0 deletions tests/lib/rules/no-render-return-value.js
View file
Open in desktop
Expand Up @@ -54,6 +54,17 @@ ruleTester.run('no-render-return-value', rule, {
version: '0.13.0'
}
}
}, {
code: 'var foo = React.render(<div />, root);',
settings: {
react: {
version: '0.0.1'
}
}
}, {
code: 'var foo = render(<div />, root)'
}, {
code: 'var foo = ReactDom.renderder(<div />, root)'
}],

invalid: [{
Expand Down