Skip to content

Commit dcba649

Browse files
novemberbornnovemberborn
committed
Upgrade to ESLint 7
1 parent 0a2883f commit dcba649

31 files changed

+17
-82
lines changed

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"deep-strict-equal": "^0.2.0",
3434
"enhance-visitors": "^1.0.0",
3535
"eslint-utils": "^2.1.0",
36-
"espree": "^7.1.0",
36+
"espree": "^7.2.0",
3737
"espurify": "^2.0.1",
3838
"import-modules": "^2.0.0",
3939
"micro-spelling-correcter": "^1.1.1",
@@ -46,7 +46,7 @@
4646
"c8": "^7.3.0",
4747
"chalk": "^4.1.0",
4848
"del": "^5.1.0",
49-
"eslint": "6.2.0",
49+
"eslint": "7.7.0",
5050
"eslint-ava-rule-tester": "^4.0.0",
5151
"eslint-plugin-eslint-plugin": "^2.3.0",
5252
"execa": "^4.0.3",
@@ -57,7 +57,7 @@
5757
"xo": "^0.33.0"
5858
},
5959
"peerDependencies": {
60-
"eslint": ">=6.2.0"
60+
"eslint": ">=7.7.0"
6161
},
6262
"ava": {
6363
"files": [

‎rules/assertion-arguments.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,7 @@ function sourceOfBinaryExpressionComponents(sourceCode, node) {
199199

200200
function noComments(sourceCode, ...nodes) {
201201
return nodes.every(node => {
202-
const {leading, trailing} = sourceCode.getComments(node);
203-
return leading.length === 0 && trailing.length === 0;
202+
return sourceCode.getCommentsBefore(node).length === 0 && sourceCode.getCommentsAfter(node).length === 0;
204203
});
205204
}
206205

‎test/assertion-arguments.js

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ function testCase(message, content, errors = [], {
6565

6666
errors = errors
6767
.map(error => typeof error === 'string' ? {message: error} : error)
68-
.map(error => ({ruleId: 'assertion-arguments', ...error}))
6968
.map(error => offsetError(error, ...offset));
7069

7170
return {

‎test/hooks-order.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const ruleTester = avaRuleTester(test, {
99
}
1010
});
1111

12-
const errors = [{ruleId: 'no-todo-test'}];
12+
const errors = [{}];
1313
const header = 'const test = require(\'ava\');';
1414

1515
ruleTester.run('no-todo-test', rule, {

‎test/max-asserts.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const ruleTester = avaRuleTester(test, {
88
}
99
});
1010

11-
const errors = [{ruleId: 'max-asserts'}];
11+
const errors = [{}];
1212
const header = 'const test = require(\'ava\');\n';
1313

1414
function nbAssertions(n) {

‎test/no-async-fn-without-await.js

-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ const test = require('ava');
22
const avaRuleTester = require('eslint-ava-rule-tester');
33
const rule = require('../rules/no-async-fn-without-await');
44

5-
const ruleId = 'no-async-fn-without-await';
65
const message = 'Function was declared as `async` but doesn\'t use `await`.';
76
const header = 'const test = require(\'ava\');\n';
87

@@ -46,7 +45,6 @@ for (const options of ruleTesterOptions) {
4645
{
4746
code: `${header}test(async t => {});`,
4847
errors: [{
49-
ruleId,
5048
message,
5149
type: 'ArrowFunctionExpression',
5250
line: 2,
@@ -56,7 +54,6 @@ for (const options of ruleTesterOptions) {
5654
{
5755
code: `${header}test(async function(t) {});`,
5856
errors: [{
59-
ruleId,
6057
message,
6158
type: 'FunctionExpression',
6259
line: 2,
@@ -66,13 +63,11 @@ for (const options of ruleTesterOptions) {
6663
{
6764
code: `${header}test(async t => {}); test(async t => {});`,
6865
errors: [{
69-
ruleId,
7066
message,
7167
type: 'ArrowFunctionExpression',
7268
line: 2,
7369
column: 6
7470
}, {
75-
ruleId,
7671
message,
7772
type: 'ArrowFunctionExpression',
7873
line: 2,
@@ -82,7 +77,6 @@ for (const options of ruleTesterOptions) {
8277
{
8378
code: `${header}test(async t => {}); test(async t => { await foo(); });`,
8479
errors: [{
85-
ruleId,
8680
message,
8781
type: 'ArrowFunctionExpression',
8882
line: 2,
@@ -92,7 +86,6 @@ for (const options of ruleTesterOptions) {
9286
{
9387
code: `${header}test(async t => { await foo(); }); test(async t => {});`,
9488
errors: [{
95-
ruleId,
9689
message,
9790
type: 'ArrowFunctionExpression',
9891
line: 2,
@@ -102,7 +95,6 @@ for (const options of ruleTesterOptions) {
10295
{
10396
code: `${header}test('title', async t => {});`,
10497
errors: [{
105-
ruleId,
10698
message,
10799
type: 'ArrowFunctionExpression',
108100
line: 2,

‎test/no-cb-test.js

-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ const ruleTester = avaRuleTester(test, {
88
}
99
});
1010

11-
const ruleId = 'no-cb-test';
1211
const message = '`test.cb()` should not be used.';
1312
const header = 'const test = require(\'ava\');\n';
1413

@@ -24,7 +23,6 @@ ruleTester.run('no-cb-test', rule, {
2423
{
2524
code: header + 'test.cb(t => { t.pass(); });',
2625
errors: [{
27-
ruleId,
2826
message,
2927
type: 'Identifier',
3028
line: 2,
@@ -34,7 +32,6 @@ ruleTester.run('no-cb-test', rule, {
3432
{
3533
code: header + 'test.cb.skip(t => { t.pass(); t.end(); });',
3634
errors: [{
37-
ruleId,
3835
message,
3936
type: 'Identifier',
4037
line: 2,
@@ -44,7 +41,6 @@ ruleTester.run('no-cb-test', rule, {
4441
{
4542
code: header + 'test.skip.cb(t => { t.pass(); t.end(); });',
4643
errors: [{
47-
ruleId,
4844
message,
4945
type: 'Identifier',
5046
line: 2,

‎test/no-duplicate-modifiers.js

-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ const ruleTester = avaRuleTester(test, {
88
}
99
});
1010

11-
const ruleId = 'no-duplicate-modifiers';
1211
const header = 'const test = require(\'ava\');\n';
1312

1413
const modifiers = [
@@ -30,7 +29,6 @@ const invalid = modifiers.map(modifier => ({
3029
code: `${header}test.${modifier}.${modifier}(t => {});`,
3130
errors: [
3231
{
33-
ruleId,
3432
message: `Duplicate test modifier \`.${modifier}\`.`,
3533
type: 'Identifier',
3634
line: 2,
@@ -54,7 +52,6 @@ ruleTester.run('no-duplicate-modifiers', rule, {
5452
code: `${header}test.serial.cb.only.serial(t => {});`,
5553
errors: [
5654
{
57-
ruleId,
5855
message: 'Duplicate test modifier `.serial`.',
5956
type: 'Identifier',
6057
line: 2,

‎test/no-identical-title.js

-9
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ const ruleTester = avaRuleTester(test, {
88
}
99
});
1010

11-
const ruleId = 'no-identical-title';
1211
const message = 'Test title is used multiple times in the same file.';
1312

1413
const header = 'const test = require(\'ava\');\n';
@@ -51,7 +50,6 @@ ruleTester.run('no-identical-title', rule, {
5150
{
5251
code: header + 'test("a", t => {}); test("a", t => {});',
5352
errors: [{
54-
ruleId,
5553
message,
5654
type: 'Literal',
5755
line: 2,
@@ -61,7 +59,6 @@ ruleTester.run('no-identical-title', rule, {
6159
{
6260
code: header + 'test(`a`, t => {}); test(`a`, t => {});',
6361
errors: [{
64-
ruleId,
6562
message,
6663
type: 'TemplateLiteral',
6764
line: 2,
@@ -71,7 +68,6 @@ ruleTester.run('no-identical-title', rule, {
7168
{
7269
code: header + 'test("a", t => {}); test.cb("a", t => {});',
7370
errors: [{
74-
ruleId,
7571
message,
7672
type: 'Literal',
7773
line: 2,
@@ -81,7 +77,6 @@ ruleTester.run('no-identical-title', rule, {
8177
{
8278
code: header + 'test(`a`, t => {}); test.cb(`a`, t => {});',
8379
errors: [{
84-
ruleId,
8580
message,
8681
type: 'TemplateLiteral',
8782
line: 2,
@@ -91,7 +86,6 @@ ruleTester.run('no-identical-title', rule, {
9186
{
9287
code: header + 'test("a", t => {}); test.cb.skip("a", t => {});',
9388
errors: [{
94-
ruleId,
9589
message,
9690
type: 'Literal',
9791
line: 2,
@@ -101,7 +95,6 @@ ruleTester.run('no-identical-title', rule, {
10195
{
10296
code: header + 'test("foo" + 1, t => {}); test("foo" + 1, t => {});',
10397
errors: [{
104-
ruleId,
10598
message,
10699
type: 'BinaryExpression',
107100
line: 2,
@@ -112,7 +105,6 @@ ruleTester.run('no-identical-title', rule, {
112105
// eslint-disable-next-line no-template-curly-in-string
113106
code: header + 'test(`${"foo" + 1}`, t => {}); test(`${"foo" + 1}`, t => {});',
114107
errors: [{
115-
ruleId,
116108
message,
117109
type: 'TemplateLiteral',
118110
line: 2,
@@ -122,7 +114,6 @@ ruleTester.run('no-identical-title', rule, {
122114
{
123115
code: header + 'test.todo("a"); test.todo("a");',
124116
errors: [{
125-
ruleId,
126117
message,
127118
type: 'Literal',
128119
line: 2,

‎test/no-incorrect-deep-equal.js

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ const ruleTester = avaRuleTester(test, {
99
});
1010

1111
const error = {
12-
ruleId: 'no-incorrect-deep-equal',
1312
messageId: 'no-deep-equal-with-primative'
1413
};
1514

‎test/no-inline-assertions.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const ruleTester = avaRuleTester(test, {
88
}
99
});
1010

11-
const errors = [{ruleId: 'no-inline-assertions'}];
11+
const errors = [{}];
1212
const header = 'const test = require(\'ava\');\n';
1313

1414
ruleTester.run('no-todo-test', rule, {

‎test/no-invalid-end.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const ruleTester = avaRuleTester(test, {
88
}
99
});
1010

11-
const errors = [{ruleId: 'no-invalid-end'}];
11+
const errors = [{}];
1212
const header = 'const test = require(\'ava\');\n';
1313

1414
ruleTester.run('no-invalid-end', rule, {

‎test/no-nested-tests.js

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ const ruleTester = avaRuleTester(test, {
1010

1111
const header = 'const test = require(\'ava\');\n';
1212
const error = {
13-
ruleId: 'no-nested-tests',
1413
message: 'Tests should not be nested.'
1514
};
1615

‎test/no-only-test.js

-10
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ const ruleTester = avaRuleTester(test, {
1111
}
1212
});
1313

14-
const ruleId = 'no-only-test';
1514
const message = '`test.only()` should not be used.';
1615
const header = 'const test = require(\'ava\');\n';
1716

@@ -29,7 +28,6 @@ ruleTester.run('no-only-test', rule, {
2928
code: header + 'test\n\t.only(t => { t.pass(); });',
3029
output: header + 'test\n\t(t => { t.pass(); });',
3130
errors: [{
32-
ruleId,
3331
message,
3432
type: 'Identifier',
3533
line: 3,
@@ -40,7 +38,6 @@ ruleTester.run('no-only-test', rule, {
4038
code: header + 'test\n .only(t => { t.pass(); });',
4139
output: header + 'test\n (t => { t.pass(); });',
4240
errors: [{
43-
ruleId,
4441
message,
4542
type: 'Identifier',
4643
line: 3,
@@ -51,7 +48,6 @@ ruleTester.run('no-only-test', rule, {
5148
code: header + 'test\t.only(t => { t.pass(); });',
5249
output: header + 'test\t(t => { t.pass(); });',
5350
errors: [{
54-
ruleId,
5551
message,
5652
type: 'Identifier',
5753
line: 2,
@@ -62,7 +58,6 @@ ruleTester.run('no-only-test', rule, {
6258
code: header + 'test .only(t => { t.pass(); });',
6359
output: header + 'test (t => { t.pass(); });',
6460
errors: [{
65-
ruleId,
6661
message,
6762
type: 'Identifier',
6863
line: 2,
@@ -73,7 +68,6 @@ ruleTester.run('no-only-test', rule, {
7368
code: header + 'test.\n\tonly(t => { t.pass(); });',
7469
output: header + 'test\n\t(t => { t.pass(); });',
7570
errors: [{
76-
ruleId,
7771
message,
7872
type: 'Identifier',
7973
line: 3,
@@ -84,7 +78,6 @@ ruleTester.run('no-only-test', rule, {
8478
code: header + 'test.\n only(t => { t.pass(); });',
8579
output: header + 'test\n (t => { t.pass(); });',
8680
errors: [{
87-
ruleId,
8881
message,
8982
type: 'Identifier',
9083
line: 3,
@@ -95,7 +88,6 @@ ruleTester.run('no-only-test', rule, {
9588
code: header + 'test.only(t => { t.pass(); });',
9689
output: header + 'test(t => { t.pass(); });',
9790
errors: [{
98-
ruleId,
9991
message,
10092
type: 'Identifier',
10193
line: 2,
@@ -106,7 +98,6 @@ ruleTester.run('no-only-test', rule, {
10698
code: header + 'test.cb.only(t => { t.pass(); t.end(); });',
10799
output: header + 'test.cb(t => { t.pass(); t.end(); });',
108100
errors: [{
109-
ruleId,
110101
message,
111102
type: 'Identifier',
112103
line: 2,
@@ -117,7 +108,6 @@ ruleTester.run('no-only-test', rule, {
117108
code: header + 'test.only.cb(t => { t.pass(); t.end(); });',
118109
output: header + 'test.cb(t => { t.pass(); t.end(); });',
119110
errors: [{
120-
ruleId,
121111
message,
122112
type: 'Identifier',
123113
line: 2,

‎test/no-skip-assert.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const ruleTester = avaRuleTester(test, {
88
}
99
});
1010

11-
const errors = [{ruleId: 'no-skip-assert'}];
11+
const errors = [{}];
1212
const header = 'const test = require(\'ava\');\n';
1313

1414
ruleTester.run('no-skip-assert', rule, {

0 commit comments

Comments
 (0)