Skip to content

Commit 5db93d7

Browse files
yannickcryannickcr
committed
Update to ESLint v1.0.0
1 parent d3af335 commit 5db93d7

25 files changed

+172
-171
lines changed

‎.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
"no-use-before-define": 2,
101101
// Stylistic Issues
102102
"indent": [2, 2, {
103-
"indentSwitchCase": true
103+
"SwitchCase": 1
104104
}],
105105
"brace-style": 2,
106106
"camelcase": 0,

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"devDependencies": {
2626
"babel-eslint": "4.0.5",
2727
"coveralls": "2.11.3",
28-
"eslint": "1.0.0-rc-3",
28+
"eslint": "1.0.0",
2929
"istanbul": "0.3.17",
3030
"mocha": "2.2.5"
3131
},

‎tests/lib/rules/display-name.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@
88
// Requirements
99
// ------------------------------------------------------------------------------
1010

11-
var eslint = require('eslint').linter;
12-
var ESLintTester = require('eslint').ESLintTester;
13-
11+
var rule = require('../../../lib/rules/display-name');
12+
var RuleTester = require('eslint').RuleTester;
1413

1514
require('babel-eslint');
1615

1716
// ------------------------------------------------------------------------------
1817
// Tests
1918
// ------------------------------------------------------------------------------
2019

21-
var eslintTester = new ESLintTester(eslint);
22-
eslintTester.addRuleTest('lib/rules/display-name', {
20+
var ruleTester = new RuleTester();
21+
ruleTester.run('display-name', rule, {
2322

2423
valid: [{
2524
code: [
@@ -106,7 +105,7 @@ eslintTester.addRuleTest('lib/rules/display-name', {
106105
' }',
107106
'});'
108107
].join('\n'),
109-
args: [1, {
108+
options: [{
110109
acceptTranspilerName: true
111110
}],
112111
ecmaFeatures: {
@@ -122,7 +121,7 @@ eslintTester.addRuleTest('lib/rules/display-name', {
122121
'}'
123122
].join('\n'),
124123
parser: 'babel-eslint',
125-
args: [1, {
124+
options: [{
126125
acceptTranspilerName: true
127126
}]
128127
}, {
@@ -134,7 +133,7 @@ eslintTester.addRuleTest('lib/rules/display-name', {
134133
'}'
135134
].join('\n'),
136135
parser: 'babel-eslint',
137-
args: [1, {
136+
options: [{
138137
acceptTranspilerName: true
139138
}]
140139
}, {
@@ -146,7 +145,7 @@ eslintTester.addRuleTest('lib/rules/display-name', {
146145
' }',
147146
'});'
148147
].join('\n'),
149-
args: [1, {
148+
options: [{
150149
acceptTranspilerName: true
151150
}],
152151
ecmaFeatures: {
@@ -208,7 +207,7 @@ eslintTester.addRuleTest('lib/rules/display-name', {
208207
'}',
209208
'module.exports = HelloComponent();'
210209
].join('\n'),
211-
args: [1, {
210+
options: [{
212211
acceptTranspilerName: true
213212
}],
214213
ecmaFeatures: {
@@ -227,7 +226,7 @@ eslintTester.addRuleTest('lib/rules/display-name', {
227226
'}'
228227
].join('\n'),
229228
parser: 'babel-eslint',
230-
args: [1, {
229+
options: [{
231230
acceptTranspilerName: true
232231
}],
233232
errors: [{

‎tests/lib/rules/jsx-boolean-value.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
// Requirements
99
// ------------------------------------------------------------------------------
1010

11-
var eslint = require('eslint').linter;
12-
var ESLintTester = require('eslint').ESLintTester;
11+
var rule = require('../../../lib/rules/jsx-boolean-value');
12+
var RuleTester = require('eslint').RuleTester;
1313

1414
// ------------------------------------------------------------------------------
1515
// Tests
1616
// ------------------------------------------------------------------------------
1717

18-
var eslintTester = new ESLintTester(eslint);
19-
eslintTester.addRuleTest('lib/rules/jsx-boolean-value', {
18+
var ruleTester = new RuleTester();
19+
ruleTester.run('jsx-boolean-value', rule, {
2020
valid: [
21-
{code: '<App foo />;', args: [1, 'never'], ecmaFeatures: {jsx: true}},
22-
{code: '<App foo={true} />;', args: [1, 'always'], ecmaFeatures: {jsx: true}}
21+
{code: '<App foo />;', options: ['never'], ecmaFeatures: {jsx: true}},
22+
{code: '<App foo={true} />;', options: ['always'], ecmaFeatures: {jsx: true}}
2323
],
2424
invalid: [
25-
{code: '<App foo={true} />;', args: [1, 'never'],
25+
{code: '<App foo={true} />;', options: ['never'],
2626
errors: [{message: 'Value must be omitted for boolean attributes'}], ecmaFeatures: {jsx: true}},
27-
{code: '<App foo />;', args: [1, 'always'],
27+
{code: '<App foo />;', options: ['always'],
2828
errors: [{message: 'Value must be set for boolean attributes'}], ecmaFeatures: {jsx: true}}
2929
]
3030
});

‎tests/lib/rules/jsx-curly-spacing.js

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,74 +8,73 @@
88
// Requirements
99
// ------------------------------------------------------------------------------
1010

11-
var eslint = require('eslint').linter;
12-
var ESLintTester = require('eslint').ESLintTester;
11+
var rule = require('../../../lib/rules/jsx-curly-spacing');
12+
var RuleTester = require('eslint').RuleTester;
1313

1414
// ------------------------------------------------------------------------------
1515
// Tests
1616
// ------------------------------------------------------------------------------
1717

18-
var eslintTester = new ESLintTester(eslint);
19-
eslintTester.addRuleTest('lib/rules/jsx-curly-spacing', {
18+
var ruleTester = new RuleTester();
19+
ruleTester.run('jsx-curly-spacing', rule, {
2020
valid: [{
2121
code: '<App foo={bar} />;',
22-
args: 1,
2322
ecmaFeatures: {jsx: true}
2423
}, {
2524
code: '<App foo={bar} />;',
26-
args: [1, 'never'],
25+
options: ['never'],
2726
ecmaFeatures: {jsx: true}
2827
}, {
2928
code: '<App foo={ bar } />;',
30-
args: [1, 'always'],
29+
options: ['always'],
3130
ecmaFeatures: {jsx: true}
3231
}, {
3332
code: '<App foo={ bar } />;',
34-
args: [1, 'always', {allowMultiline: false}],
33+
options: ['always', {allowMultiline: false}],
3534
ecmaFeatures: {jsx: true}
3635
}, {
3736
code: '<App foo={{ bar:baz }} />;',
38-
args: [1, 'never'],
37+
options: ['never'],
3938
ecmaFeatures: {jsx: true}
4039
}, {
4140
code: '<App foo={ {bar:baz} } />;',
42-
args: [1, 'always'],
41+
options: ['always'],
4342
ecmaFeatures: {jsx: true}
4443
}, {
4544
code: [
4645
'<App foo={',
4746
'bar',
4847
'} />;'
4948
].join('\n'),
50-
args: [1, 'always'],
49+
options: ['always'],
5150
ecmaFeatures: {jsx: true}
5251
}, {
5352
code: [
5453
'<App foo={',
5554
'bar',
5655
'} />;'
5756
].join('\n'),
58-
args: [1, 'always'],
57+
options: ['always'],
5958
ecmaFeatures: {jsx: true}
6059
}, {
6160
code: [
6261
'<App foo={',
6362
'bar',
6463
'} />;'
6564
].join('\n'),
66-
args: [1, 'never'],
65+
options: ['never'],
6766
ecmaFeatures: {jsx: true}
6867
}, {
6968
code: [
7069
'<div>{/* comment */}</div>;'
7170
].join('\n'),
72-
args: [1, 'never'],
71+
options: ['never'],
7372
ecmaFeatures: {jsx: true}
7473
}],
7574

7675
invalid: [{
7776
code: '<App foo={ bar } />;',
78-
args: [1, 'never'],
77+
options: ['never'],
7978
errors: [{
8079
message: 'There should be no space after \'{\''
8180
}, {
@@ -84,7 +83,7 @@ eslintTester.addRuleTest('lib/rules/jsx-curly-spacing', {
8483
ecmaFeatures: {jsx: true}
8584
}, {
8685
code: '<App foo={ bar } />;',
87-
args: [1, 'never', {allowMultiline: false}],
86+
options: ['never', {allowMultiline: false}],
8887
errors: [{
8988
message: 'There should be no space after \'{\''
9089
}, {
@@ -93,7 +92,7 @@ eslintTester.addRuleTest('lib/rules/jsx-curly-spacing', {
9392
ecmaFeatures: {jsx: true}
9493
}, {
9594
code: '<App foo={bar} />;',
96-
args: [1, 'always'],
95+
options: ['always'],
9796
errors: [{
9897
message: 'A space is required after \'{\''
9998
}, {
@@ -102,7 +101,7 @@ eslintTester.addRuleTest('lib/rules/jsx-curly-spacing', {
102101
ecmaFeatures: {jsx: true}
103102
}, {
104103
code: '<App foo={bar} />;',
105-
args: [1, 'always', {allowMultiline: false}],
104+
options: ['always', {allowMultiline: false}],
106105
errors: [{
107106
message: 'A space is required after \'{\''
108107
}, {
@@ -111,28 +110,28 @@ eslintTester.addRuleTest('lib/rules/jsx-curly-spacing', {
111110
ecmaFeatures: {jsx: true}
112111
}, {
113112
code: '<App foo={ bar} />;',
114-
args: [1, 'always'],
113+
options: ['always'],
115114
errors: [{
116115
message: 'A space is required before \'}\''
117116
}],
118117
ecmaFeatures: {jsx: true}
119118
}, {
120119
code: '<App foo={bar } />;',
121-
args: [1, 'always'],
120+
options: ['always'],
122121
errors: [{
123122
message: 'A space is required after \'{\''
124123
}],
125124
ecmaFeatures: {jsx: true}
126125
}, {
127126
code: '<App foo={ bar} />;',
128-
args: [1, 'never'],
127+
options: ['never'],
129128
errors: [{
130129
message: 'There should be no space after \'{\''
131130
}],
132131
ecmaFeatures: {jsx: true}
133132
}, {
134133
code: '<App foo={bar } />;',
135-
args: [1, 'never'],
134+
options: ['never'],
136135
errors: [{
137136
message: 'There should be no space before \'}\''
138137
}],
@@ -143,7 +142,7 @@ eslintTester.addRuleTest('lib/rules/jsx-curly-spacing', {
143142
'bar',
144143
'} />;'
145144
].join('\n'),
146-
args: [1, 'never', {allowMultiline: false}],
145+
options: ['never', {allowMultiline: false}],
147146
errors: [{
148147
message: 'There should be no space after \'{\''
149148
}, {
@@ -156,7 +155,7 @@ eslintTester.addRuleTest('lib/rules/jsx-curly-spacing', {
156155
'bar',
157156
'} />;'
158157
].join('\n'),
159-
args: [1, 'always', {allowMultiline: false}],
158+
options: ['always', {allowMultiline: false}],
160159
errors: [{
161160
message: 'There should be no newline after \'{\''
162161
}, {

‎tests/lib/rules/jsx-max-props-per-line.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
// Requirements
99
// ------------------------------------------------------------------------------
1010

11-
var eslint = require('eslint').linter;
12-
var ESLintTester = require('eslint').ESLintTester;
11+
var rule = require('../../../lib/rules/jsx-max-props-per-line');
12+
var RuleTester = require('eslint').RuleTester;
1313

1414
// ------------------------------------------------------------------------------
1515
// Tests
1616
// ------------------------------------------------------------------------------
1717

18-
var eslintTester = new ESLintTester(eslint);
19-
eslintTester.addRuleTest('lib/rules/jsx-max-props-per-line', {
18+
var ruleTester = new RuleTester();
19+
ruleTester.run('jsx-max-props-per-line', rule, {
2020
valid: [{
2121
code: '<App foo />',
2222
ecmaFeatures: {jsx: true}

‎tests/lib/rules/jsx-no-duplicate-props.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,29 @@
99
// Requirements
1010
// -----------------------------------------------------------------------------
1111

12-
var eslint = require('eslint').linter;
13-
var ESLintTester = require('eslint').ESLintTester;
12+
var rule = require('../../../lib/rules/jsx-no-duplicate-props');
13+
var RuleTester = require('eslint').RuleTester;
1414

1515
// -----------------------------------------------------------------------------
1616
// Tests
1717
// -----------------------------------------------------------------------------
1818

19-
var eslintTester = new ESLintTester(eslint);
19+
var ruleTester = new RuleTester();
2020

2121
var expectedError = {
2222
message: 'No duplicate props allowed',
2323
type: 'JSXAttribute'
2424
};
2525

26-
var ignoreCaseArgs = [1, {
26+
var ignoreCaseArgs = [{
2727
ignoreCase: true
2828
}];
2929

3030
var features = {
3131
jsx: true
3232
};
3333

34-
eslintTester.addRuleTest('lib/rules/jsx-no-duplicate-props', {
34+
ruleTester.run('jsx-no-duplicate-props', rule, {
3535
valid: [
3636
{code: '<App />;', ecmaFeatures: features},
3737
{code: '<App {...this.props} />;', ecmaFeatures: features},
@@ -50,8 +50,8 @@ eslintTester.addRuleTest('lib/rules/jsx-no-duplicate-props', {
5050
{code: '<App a a />;', errors: [expectedError], ecmaFeatures: features},
5151
{code: '<App A b c A />;', errors: [expectedError], ecmaFeatures: features},
5252
{code: '<App a="a" b="b" a="a" />;', errors: [expectedError], ecmaFeatures: features},
53-
{code: '<App A a />;', args: ignoreCaseArgs, errors: [expectedError], ecmaFeatures: features},
54-
{code: '<App a b c A />;', args: ignoreCaseArgs, errors: [expectedError], ecmaFeatures: features},
55-
{code: '<App A="a" b="b" B="B" />;', args: ignoreCaseArgs, errors: [expectedError], ecmaFeatures: features}
53+
{code: '<App A a />;', options: ignoreCaseArgs, errors: [expectedError], ecmaFeatures: features},
54+
{code: '<App a b c A />;', options: ignoreCaseArgs, errors: [expectedError], ecmaFeatures: features},
55+
{code: '<App A="a" b="b" B="B" />;', options: ignoreCaseArgs, errors: [expectedError], ecmaFeatures: features}
5656
]
5757
});

‎tests/lib/rules/jsx-no-literals.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
// Requirements
99
// ------------------------------------------------------------------------------
1010

11-
var eslint = require('eslint').linter;
12-
var ESLintTester = require('eslint').ESLintTester;
11+
var rule = require('../../../lib/rules/jsx-no-literals');
12+
var RuleTester = require('eslint').RuleTester;
1313

1414
// ------------------------------------------------------------------------------
1515
// Tests
1616
// ------------------------------------------------------------------------------
1717

18-
var eslintTester = new ESLintTester(eslint);
19-
eslintTester.addRuleTest('lib/rules/jsx-no-literals', {
18+
var ruleTester = new RuleTester();
19+
ruleTester.run('jsx-no-literals', rule, {
2020

2121
valid: [
2222
{

0 commit comments

Comments
 (0)