Skip to content

Commit

Permalink
Fix new indent errors found by ESLint
Browse files Browse the repository at this point in the history
  • Loading branch information
Yannick Croissant committed Nov 1, 2016
1 parent 8b4b0aa commit 37ded33
Show file tree
Hide file tree
Showing 9 changed files with 101 additions and 82 deletions.
7 changes: 3 additions & 4 deletions tests/lib/rules/display-name.js
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,7 @@ ruleTester.run('display-name', rule, {
')'
].join('\n'),
parser: 'babel-eslint'
}
],
}],

invalid: [{
code: [
Expand Down Expand Up @@ -549,5 +548,5 @@ ruleTester.run('display-name', rule, {
errors: [{
message: 'Component definition is missing display name'
}]
}
]});
}]
});
23 changes: 13 additions & 10 deletions tests/lib/rules/jsx-boolean-value.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,17 @@ ruleTester.run('jsx-boolean-value', rule, {
{code: '<App foo />;', parserOptions: parserOptions},
{code: '<App foo={true} />;', options: ['always'], parserOptions: parserOptions}
],
invalid: [
{code: '<App foo={true} />;', output: '<App foo />;', options: ['never'],
errors: [{message: 'Value must be omitted for boolean attributes'}], parserOptions: parserOptions},
{code: '<App foo={true} />;', output: '<App foo />;',
errors: [{message: 'Value must be omitted for boolean attributes'}], parserOptions: parserOptions},
{code: '<App foo = {true} />;', output: '<App foo />;',
errors: [{message: 'Value must be omitted for boolean attributes'}], parserOptions: parserOptions},
{code: '<App foo />;', output: '<App foo={true} />;', options: ['always'],
errors: [{message: 'Value must be set for boolean attributes'}], parserOptions: parserOptions}
]
invalid: [{
code: '<App foo={true} />;', output: '<App foo />;', options: ['never'],
errors: [{message: 'Value must be omitted for boolean attributes'}], parserOptions: parserOptions
}, {
code: '<App foo={true} />;', output: '<App foo />;',
errors: [{message: 'Value must be omitted for boolean attributes'}], parserOptions: parserOptions
}, {
code: '<App foo = {true} />;', output: '<App foo />;',
errors: [{message: 'Value must be omitted for boolean attributes'}], parserOptions: parserOptions
}, {
code: '<App foo />;', output: '<App foo={true} />;', options: ['always'],
errors: [{message: 'Value must be set for boolean attributes'}], parserOptions: parserOptions
}]
});
50 changes: 25 additions & 25 deletions tests/lib/rules/jsx-key.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,29 @@ ruleTester.run('jsx-key', rule, {
{code: '[1, 2, 3].map(function(x) { return; });', parserOptions: parserOptions},
{code: 'foo(() => <div />);', parserOptions: parserOptions}
],
invalid: [
{code: '[<App />];',
errors: [{message: 'Missing "key" prop for element in array'}],
parserOptions: parserOptions},

{code: '[<App {...key} />];',
errors: [{message: 'Missing "key" prop for element in array'}],
parserOptions: parserOptions},

{code: '[<App key={0}/>, <App />];',
errors: [{message: 'Missing "key" prop for element in array'}],
parserOptions: parserOptions},

{code: '[1, 2 ,3].map(function(x) { return <App /> });',
errors: [{message: 'Missing "key" prop for element in iterator'}],
parserOptions: parserOptions},

{code: '[1, 2 ,3].map(x => <App />);',
errors: [{message: 'Missing "key" prop for element in iterator'}],
parserOptions: parserOptions},

{code: '[1, 2 ,3].map(x => { return <App /> });',
errors: [{message: 'Missing "key" prop for element in iterator'}],
parserOptions: parserOptions}
]
invalid: [{
code: '[<App />];',
errors: [{message: 'Missing "key" prop for element in array'}],
parserOptions: parserOptions
}, {
code: '[<App {...key} />];',
errors: [{message: 'Missing "key" prop for element in array'}],
parserOptions: parserOptions
}, {
code: '[<App key={0}/>, <App />];',
errors: [{message: 'Missing "key" prop for element in array'}],
parserOptions: parserOptions
}, {
code: '[1, 2 ,3].map(function(x) { return <App /> });',
errors: [{message: 'Missing "key" prop for element in iterator'}],
parserOptions: parserOptions
}, {
code: '[1, 2 ,3].map(x => <App />);',
errors: [{message: 'Missing "key" prop for element in iterator'}],
parserOptions: parserOptions
}, {
code: '[1, 2 ,3].map(x => { return <App /> });',
errors: [{message: 'Missing "key" prop for element in iterator'}],
parserOptions: parserOptions
}]
});
37 changes: 24 additions & 13 deletions tests/lib/rules/jsx-no-target-blank.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,29 @@ ruleTester.run('jsx-no-target-blank', rule, {
{code: '<a target="_blank" rel={relValue}></a>', parserOptions: parserOptions},
{code: '<a target={targetValue} rel="noopener noreferrer"></a>', parserOptions: parserOptions}
],
invalid: [
{code: '<a target="_blank"></a>', parserOptions: parserOptions,
errors: [{message: 'Using target="_blank" without rel="noopener noreferrer" is a security risk:' +
' see https://mathiasbynens.github.io/rel-noopener'}]},
{code: '<a target="_blank" rel=""></a>', parserOptions: parserOptions,
errors: [{message: 'Using target="_blank" without rel="noopener noreferrer" is a security risk:' +
' see https://mathiasbynens.github.io/rel-noopener'}]},
{code: '<a target="_blank" rel="noopenernoreferrer"></a>', parserOptions: parserOptions,
errors: [{message: 'Using target="_blank" without rel="noopener noreferrer" is a security risk:' +
' see https://mathiasbynens.github.io/rel-noopener'}]},
{code: '<a target="_BLANK"></a>', parserOptions: parserOptions,
errors: [{message: 'Using target="_blank" without rel="noopener noreferrer" is a security risk:' +
' see https://mathiasbynens.github.io/rel-noopener'}]}
invalid: [{
code: '<a target="_blank"></a>', parserOptions: parserOptions,
errors: [{
message: 'Using target="_blank" without rel="noopener noreferrer" is a security risk:' +
' see https://mathiasbynens.github.io/rel-noopener'
}]
}, {
code: '<a target="_blank" rel=""></a>', parserOptions: parserOptions,
errors: [{
message: 'Using target="_blank" without rel="noopener noreferrer" is a security risk:' +
' see https://mathiasbynens.github.io/rel-noopener'
}]
}, {
code: '<a target="_blank" rel="noopenernoreferrer"></a>', parserOptions: parserOptions,
errors: [{
message: 'Using target="_blank" without rel="noopener noreferrer" is a security risk:' +
' see https://mathiasbynens.github.io/rel-noopener'
}]
}, {
code: '<a target="_BLANK"></a>', parserOptions: parserOptions,
errors: [{
message: 'Using target="_blank" without rel="noopener noreferrer" is a security risk:' +
' see https://mathiasbynens.github.io/rel-noopener'
}]}
]
});
18 changes: 10 additions & 8 deletions tests/lib/rules/jsx-uses-react.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,14 @@ ruleTester.run('no-unused-vars', rule, {
{code: '/*eslint jsx-uses-react:1*/ /** @jsx Foo */ var Foo; <div />;', parserOptions: parserOptions},
{code: '/*eslint jsx-uses-react:1*/ var Foo; <div />;', settings: settings, parserOptions: parserOptions}
],
invalid: [
{code: '/*eslint jsx-uses-react:1*/ var React;',
errors: [{message: '\'React\' is defined but never used.'}], parserOptions: parserOptions},
{code: '/*eslint jsx-uses-react:1*/ /** @jsx Foo */ var React; <div />;',
errors: [{message: '\'React\' is defined but never used.'}], parserOptions: parserOptions},
{code: '/*eslint jsx-uses-react:1*/ var React; <div />;',
errors: [{message: '\'React\' is defined but never used.'}], settings: settings, parserOptions: parserOptions}
]
invalid: [{
code: '/*eslint jsx-uses-react:1*/ var React;',
errors: [{message: '\'React\' is defined but never used.'}], parserOptions: parserOptions
}, {
code: '/*eslint jsx-uses-react:1*/ /** @jsx Foo */ var React; <div />;',
errors: [{message: '\'React\' is defined but never used.'}], parserOptions: parserOptions
}, {
code: '/*eslint jsx-uses-react:1*/ var React; <div />;',
errors: [{message: '\'React\' is defined but never used.'}], settings: settings, parserOptions: parserOptions
}]
});
4 changes: 2 additions & 2 deletions tests/lib/rules/no-string-refs.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,5 @@ ruleTester.run('no-refs', rule, {
}, {
message: 'Using string literals in ref attributes is deprecated.'
}]
}
]});
}]
});
4 changes: 2 additions & 2 deletions tests/lib/rules/prefer-es6-class.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,5 @@ ruleTester.run('prefer-es6-class', rule, {
errors: [{
message: 'Component should use createClass instead of es6 class'
}]
}
]});
}]
});
36 changes: 20 additions & 16 deletions tests/lib/rules/react-in-jsx-scope.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,26 @@ ruleTester.run('react-in-jsx-scope', rule, {
' }',
'});',
'export default Button;'
].join('\n'),
parserOptions: parserOptions},
].join('\n'), parserOptions: parserOptions},
{code: 'var Foo, App; <App />;', settings: settings, parserOptions: parserOptions}
],
invalid: [
{code: 'var App, a = <App />;',
errors: [{message: '\'React\' must be in scope when using JSX'}], parserOptions: parserOptions},
{code: 'var a = <App />;',
errors: [{message: '\'React\' must be in scope when using JSX'}], parserOptions: parserOptions},
{code: 'var a = <img />;',
errors: [{message: '\'React\' must be in scope when using JSX'}], parserOptions: parserOptions},
{code: '/** @jsx React.DOM */ var a = <img />;',
errors: [{message: '\'React\' must be in scope when using JSX'}], parserOptions: parserOptions},
{code: '/** @jsx Foo.bar */ var React, a = <img />;',
errors: [{message: '\'Foo\' must be in scope when using JSX'}], parserOptions: parserOptions},
{code: 'var React, a = <img />;',
errors: [{message: '\'Foo\' must be in scope when using JSX'}], settings: settings, parserOptions: parserOptions}
]
invalid: [{
code: 'var App, a = <App />;',
errors: [{message: '\'React\' must be in scope when using JSX'}], parserOptions: parserOptions
}, {
code: 'var a = <App />;',
errors: [{message: '\'React\' must be in scope when using JSX'}], parserOptions: parserOptions
}, {
code: 'var a = <img />;',
errors: [{message: '\'React\' must be in scope when using JSX'}], parserOptions: parserOptions
}, {
code: '/** @jsx React.DOM */ var a = <img />;',
errors: [{message: '\'React\' must be in scope when using JSX'}], parserOptions: parserOptions
}, {
code: '/** @jsx Foo.bar */ var React, a = <img />;',
errors: [{message: '\'Foo\' must be in scope when using JSX'}], parserOptions: parserOptions
}, {
code: 'var React, a = <img />;',
errors: [{message: '\'Foo\' must be in scope when using JSX'}], settings: settings, parserOptions: parserOptions
}]
});
4 changes: 2 additions & 2 deletions tests/lib/rules/require-render-return.js
Original file line number Diff line number Diff line change
Expand Up @@ -203,5 +203,5 @@ ruleTester.run('require-render-return', rule, {
errors: [{
message: 'Your render method should have return statement'
}]
}
]});
}]
});

0 comments on commit 37ded33

Please sign in to comment.