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.

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

Fix sort-comp ClassExpression #1082

Merged
merged 2 commits into from Jun 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions lib/rules/sort-comp.js
Expand Up @@ -291,6 +291,7 @@ module.exports = {
*/
function getComponentProperties(node) {
switch (node.type) {
case 'ClassExpression':
case 'ClassDeclaration':
return node.body.body;
case 'ObjectExpression':
Expand Down
42 changes: 42 additions & 0 deletions tests/lib/rules/sort-comp.js
Expand Up @@ -248,6 +248,34 @@ ruleTester.run('sort-comp', rule, {
'render'
]
}]
}, {
// Non-react classes should be ignored, even in expressions
code: [
'return class Hello {',
' render() {',
' return <div>{this.props.text}</div>;',
' }',
' props: { text: string };',
' constructor() {}',
' state: Object = {};',
'}'
].join('\n'),
parser: 'babel-eslint',
parserOptions: parserOptions
}, {
// Non-react classes should be ignored, even in expressions
code: [
'return class {',
' render() {',
' return <div>{this.props.text}</div>;',
' }',
' props: { text: string };',
' constructor() {}',
' state: Object = {};',
'}'
].join('\n'),
parser: 'babel-eslint',
parserOptions: parserOptions
}],

invalid: [{
Expand Down Expand Up @@ -286,6 +314,20 @@ ruleTester.run('sort-comp', rule, {
].join('\n'),
parserOptions: parserOptions,
errors: [{message: 'render should be placed after onClick'}]
}, {
// Must force a custom method to be placed before render, even in function
code: [
'var Hello = () => {',
' return class Test extends React.Component {',
' render () {',
' return <div>Hello</div>;',
' }',
' onClick () {}',
' }',
'};'
].join('\n'),
parserOptions: parserOptions,
errors: [{message: 'render should be placed after onClick'}]
}, {
// Must force a custom method to be placed after render if no 'everything-else' group is specified
code: [
Expand Down