Skip to content

Commit 6b81279

Browse files
committed
Update tests configuration for ESLint 2.0.0
1 parent 481ecbb commit 6b81279

32 files changed

+672
-1008
lines changed

lib/rules/prop-types.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ module.exports = Components.detect(function(context, components, utils) {
367367
break;
368368
}
369369
}
370+
return void 0;
370371
}
371372

372373
/**

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": "5.0.0-beta4",
2727
"coveralls": "2.11.4",
28-
"eslint": "1.10.2",
28+
"eslint": "2.0.0-alpha-1",
2929
"istanbul": "0.4.1",
3030
"mocha": "2.3.4"
3131
},

tests/lib/rules/display-name.js

Lines changed: 21 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ var RuleTester = require('eslint').RuleTester;
1313

1414
require('babel-eslint');
1515

16+
var parserOptions = {
17+
ecmaVersion: 6,
18+
ecmaFeatures: {
19+
experimentalObjectRestSpread: true,
20+
jsx: true
21+
}
22+
};
23+
1624
// ------------------------------------------------------------------------------
1725
// Tests
1826
// ------------------------------------------------------------------------------
@@ -29,9 +37,7 @@ ruleTester.run('display-name', rule, {
2937
' }',
3038
'});'
3139
].join('\n'),
32-
ecmaFeatures: {
33-
jsx: true
34-
}
40+
parserOptions: parserOptions
3541
}, {
3642
code: [
3743
'class Hello extends React.Component {',
@@ -41,10 +47,7 @@ ruleTester.run('display-name', rule, {
4147
'}',
4248
'Hello.displayName = \'Hello\''
4349
].join('\n'),
44-
ecmaFeatures: {
45-
classes: true,
46-
jsx: true
47-
}
50+
parserOptions: parserOptions
4851
}, {
4952
code: [
5053
'class Hello {',
@@ -53,10 +56,7 @@ ruleTester.run('display-name', rule, {
5356
' }',
5457
'}'
5558
].join('\n'),
56-
ecmaFeatures: {
57-
classes: true,
58-
jsx: true
59-
}
59+
parserOptions: parserOptions
6060
}, {
6161
code: [
6262
'class Hello extends Greetings {',
@@ -74,10 +74,7 @@ ruleTester.run('display-name', rule, {
7474
'}'
7575
].join('\n'),
7676
parser: 'babel-eslint',
77-
ecmaFeatures: {
78-
classes: true,
79-
jsx: true
80-
}
77+
parserOptions: parserOptions
8178
}, {
8279
code: [
8380
'class Hello extends React.Component {',
@@ -89,10 +86,7 @@ ruleTester.run('display-name', rule, {
8986
' }',
9087
'}'
9188
].join('\n'),
92-
ecmaFeatures: {
93-
classes: true,
94-
jsx: true
95-
}
89+
parserOptions: parserOptions
9690
}, {
9791
code: [
9892
'class Hello extends React.Component {',
@@ -103,10 +97,7 @@ ruleTester.run('display-name', rule, {
10397
'}'
10498
].join('\n'),
10599
parser: 'babel-eslint',
106-
ecmaFeatures: {
107-
classes: true,
108-
jsx: true
109-
}
100+
parserOptions: parserOptions
110101
}, {
111102
code: [
112103
'var Hello = React.createClass({',
@@ -118,10 +109,7 @@ ruleTester.run('display-name', rule, {
118109
options: [{
119110
acceptTranspilerName: true
120111
}],
121-
ecmaFeatures: {
122-
classes: true,
123-
jsx: true
124-
}
112+
parserOptions: parserOptions
125113
}, {
126114
code: [
127115
'class Hello extends React.Component {',
@@ -158,9 +146,7 @@ ruleTester.run('display-name', rule, {
158146
options: [{
159147
acceptTranspilerName: true
160148
}],
161-
ecmaFeatures: {
162-
jsx: true
163-
}
149+
parserOptions: parserOptions
164150
}, {
165151
code: [
166152
'var Hello = React.createClass({',
@@ -172,13 +158,7 @@ ruleTester.run('display-name', rule, {
172158
' }',
173159
'});'
174160
].join('\n'),
175-
env: {
176-
es6: true
177-
},
178-
ecmaFeatures: {
179-
experimentalObjectRestSpread: true,
180-
jsx: true
181-
}
161+
parserOptions: parserOptions
182162
}, {
183163
code: [
184164
'export default class {',
@@ -350,9 +330,7 @@ ruleTester.run('display-name', rule, {
350330
' }',
351331
'});'
352332
].join('\n'),
353-
ecmaFeatures: {
354-
jsx: false
355-
},
333+
parserOptions: parserOptions,
356334
errors: [{
357335
message: 'Component definition is missing display name'
358336
}]
@@ -364,9 +342,7 @@ ruleTester.run('display-name', rule, {
364342
' }',
365343
'});'
366344
].join('\n'),
367-
ecmaFeatures: {
368-
jsx: true
369-
},
345+
parserOptions: parserOptions,
370346
errors: [{
371347
message: 'Component definition is missing display name'
372348
}]
@@ -378,10 +354,7 @@ ruleTester.run('display-name', rule, {
378354
' }',
379355
'}'
380356
].join('\n'),
381-
ecmaFeatures: {
382-
classes: true,
383-
jsx: true
384-
},
357+
parserOptions: parserOptions,
385358
errors: [{
386359
message: 'Component definition is missing display name'
387360
}]
@@ -399,10 +372,7 @@ ruleTester.run('display-name', rule, {
399372
options: [{
400373
acceptTranspilerName: true
401374
}],
402-
ecmaFeatures: {
403-
classes: true,
404-
jsx: true
405-
},
375+
parserOptions: parserOptions,
406376
errors: [{
407377
message: 'Component definition is missing display name'
408378
}]

0 commit comments

Comments
 (0)