Skip to content

Commit

Permalink
Upgrade to ESLint 7
Browse files Browse the repository at this point in the history
  • Loading branch information
@novemberborn
novemberborn committed Aug 16, 2020
1 parent 0a2883f commit dcba649
Show file tree
Hide file tree
Showing 31 changed files with 17 additions and 82 deletions.
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"deep-strict-equal": "^0.2.0",
"enhance-visitors": "^1.0.0",
"eslint-utils": "^2.1.0",
"espree": "^7.1.0",
"espree": "^7.2.0",
"espurify": "^2.0.1",
"import-modules": "^2.0.0",
"micro-spelling-correcter": "^1.1.1",
Expand All @@ -46,7 +46,7 @@
"c8": "^7.3.0",
"chalk": "^4.1.0",
"del": "^5.1.0",
"eslint": "6.2.0",
"eslint": "7.7.0",
"eslint-ava-rule-tester": "^4.0.0",
"eslint-plugin-eslint-plugin": "^2.3.0",
"execa": "^4.0.3",
Expand All @@ -57,7 +57,7 @@
"xo": "^0.33.0"
},
"peerDependencies": {
"eslint": ">=6.2.0"
"eslint": ">=7.7.0"
},
"ava": {
"files": [
Expand Down
3 changes: 1 addition & 2 deletions rules/assertion-arguments.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,7 @@ function sourceOfBinaryExpressionComponents(sourceCode, node) {

function noComments(sourceCode, ...nodes) {
return nodes.every(node => {
const {leading, trailing} = sourceCode.getComments(node);
return leading.length === 0 && trailing.length === 0;
return sourceCode.getCommentsBefore(node).length === 0 && sourceCode.getCommentsAfter(node).length === 0;
});
}

Expand Down
1 change: 0 additions & 1 deletion test/assertion-arguments.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ function testCase(message, content, errors = [], {

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

return {
Expand Down
2 changes: 1 addition & 1 deletion test/hooks-order.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const ruleTester = avaRuleTester(test, {
}
});

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

ruleTester.run('no-todo-test', rule, {
Expand Down
2 changes: 1 addition & 1 deletion test/max-asserts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const ruleTester = avaRuleTester(test, {
}
});

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

function nbAssertions(n) {
Expand Down
8 changes: 0 additions & 8 deletions test/no-async-fn-without-await.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ const test = require('ava');
const avaRuleTester = require('eslint-ava-rule-tester');
const rule = require('../rules/no-async-fn-without-await');

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

Expand Down Expand Up @@ -46,7 +45,6 @@ for (const options of ruleTesterOptions) {
{
code: `${header}test(async t => {});`,
errors: [{
ruleId,
message,
type: 'ArrowFunctionExpression',
line: 2,
Expand All @@ -56,7 +54,6 @@ for (const options of ruleTesterOptions) {
{
code: `${header}test(async function(t) {});`,
errors: [{
ruleId,
message,
type: 'FunctionExpression',
line: 2,
Expand All @@ -66,13 +63,11 @@ for (const options of ruleTesterOptions) {
{
code: `${header}test(async t => {}); test(async t => {});`,
errors: [{
ruleId,
message,
type: 'ArrowFunctionExpression',
line: 2,
column: 6
}, {
ruleId,
message,
type: 'ArrowFunctionExpression',
line: 2,
Expand All @@ -82,7 +77,6 @@ for (const options of ruleTesterOptions) {
{
code: `${header}test(async t => {}); test(async t => { await foo(); });`,
errors: [{
ruleId,
message,
type: 'ArrowFunctionExpression',
line: 2,
Expand All @@ -92,7 +86,6 @@ for (const options of ruleTesterOptions) {
{
code: `${header}test(async t => { await foo(); }); test(async t => {});`,
errors: [{
ruleId,
message,
type: 'ArrowFunctionExpression',
line: 2,
Expand All @@ -102,7 +95,6 @@ for (const options of ruleTesterOptions) {
{
code: `${header}test('title', async t => {});`,
errors: [{
ruleId,
message,
type: 'ArrowFunctionExpression',
line: 2,
Expand Down
4 changes: 0 additions & 4 deletions test/no-cb-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const ruleTester = avaRuleTester(test, {
}
});

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

Expand All @@ -24,7 +23,6 @@ ruleTester.run('no-cb-test', rule, {
{
code: header + 'test.cb(t => { t.pass(); });',
errors: [{
ruleId,
message,
type: 'Identifier',
line: 2,
Expand All @@ -34,7 +32,6 @@ ruleTester.run('no-cb-test', rule, {
{
code: header + 'test.cb.skip(t => { t.pass(); t.end(); });',
errors: [{
ruleId,
message,
type: 'Identifier',
line: 2,
Expand All @@ -44,7 +41,6 @@ ruleTester.run('no-cb-test', rule, {
{
code: header + 'test.skip.cb(t => { t.pass(); t.end(); });',
errors: [{
ruleId,
message,
type: 'Identifier',
line: 2,
Expand Down
3 changes: 0 additions & 3 deletions test/no-duplicate-modifiers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const ruleTester = avaRuleTester(test, {
}
});

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

const modifiers = [
Expand All @@ -30,7 +29,6 @@ const invalid = modifiers.map(modifier => ({
code: `${header}test.${modifier}.${modifier}(t => {});`,
errors: [
{
ruleId,
message: `Duplicate test modifier \`.${modifier}\`.`,
type: 'Identifier',
line: 2,
Expand All @@ -54,7 +52,6 @@ ruleTester.run('no-duplicate-modifiers', rule, {
code: `${header}test.serial.cb.only.serial(t => {});`,
errors: [
{
ruleId,
message: 'Duplicate test modifier `.serial`.',
type: 'Identifier',
line: 2,
Expand Down
9 changes: 0 additions & 9 deletions test/no-identical-title.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const ruleTester = avaRuleTester(test, {
}
});

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

const header = 'const test = require(\'ava\');\n';
Expand Down Expand Up @@ -51,7 +50,6 @@ ruleTester.run('no-identical-title', rule, {
{
code: header + 'test("a", t => {}); test("a", t => {});',
errors: [{
ruleId,
message,
type: 'Literal',
line: 2,
Expand All @@ -61,7 +59,6 @@ ruleTester.run('no-identical-title', rule, {
{
code: header + 'test(`a`, t => {}); test(`a`, t => {});',
errors: [{
ruleId,
message,
type: 'TemplateLiteral',
line: 2,
Expand All @@ -71,7 +68,6 @@ ruleTester.run('no-identical-title', rule, {
{
code: header + 'test("a", t => {}); test.cb("a", t => {});',
errors: [{
ruleId,
message,
type: 'Literal',
line: 2,
Expand All @@ -81,7 +77,6 @@ ruleTester.run('no-identical-title', rule, {
{
code: header + 'test(`a`, t => {}); test.cb(`a`, t => {});',
errors: [{
ruleId,
message,
type: 'TemplateLiteral',
line: 2,
Expand All @@ -91,7 +86,6 @@ ruleTester.run('no-identical-title', rule, {
{
code: header + 'test("a", t => {}); test.cb.skip("a", t => {});',
errors: [{
ruleId,
message,
type: 'Literal',
line: 2,
Expand All @@ -101,7 +95,6 @@ ruleTester.run('no-identical-title', rule, {
{
code: header + 'test("foo" + 1, t => {}); test("foo" + 1, t => {});',
errors: [{
ruleId,
message,
type: 'BinaryExpression',
line: 2,
Expand All @@ -112,7 +105,6 @@ ruleTester.run('no-identical-title', rule, {
// eslint-disable-next-line no-template-curly-in-string
code: header + 'test(`${"foo" + 1}`, t => {}); test(`${"foo" + 1}`, t => {});',
errors: [{
ruleId,
message,
type: 'TemplateLiteral',
line: 2,
Expand All @@ -122,7 +114,6 @@ ruleTester.run('no-identical-title', rule, {
{
code: header + 'test.todo("a"); test.todo("a");',
errors: [{
ruleId,
message,
type: 'Literal',
line: 2,
Expand Down
1 change: 0 additions & 1 deletion test/no-incorrect-deep-equal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ const ruleTester = avaRuleTester(test, {
});

const error = {
ruleId: 'no-incorrect-deep-equal',
messageId: 'no-deep-equal-with-primative'
};

Expand Down
2 changes: 1 addition & 1 deletion test/no-inline-assertions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const ruleTester = avaRuleTester(test, {
}
});

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

ruleTester.run('no-todo-test', rule, {
Expand Down
2 changes: 1 addition & 1 deletion test/no-invalid-end.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const ruleTester = avaRuleTester(test, {
}
});

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

ruleTester.run('no-invalid-end', rule, {
Expand Down
1 change: 0 additions & 1 deletion test/no-nested-tests.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ const ruleTester = avaRuleTester(test, {

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

Expand Down
10 changes: 0 additions & 10 deletions test/no-only-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ const ruleTester = avaRuleTester(test, {
}
});

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

Expand All @@ -29,7 +28,6 @@ ruleTester.run('no-only-test', rule, {
code: header + 'test\n\t.only(t => { t.pass(); });',
output: header + 'test\n\t(t => { t.pass(); });',
errors: [{
ruleId,
message,
type: 'Identifier',
line: 3,
Expand All @@ -40,7 +38,6 @@ ruleTester.run('no-only-test', rule, {
code: header + 'test\n .only(t => { t.pass(); });',
output: header + 'test\n (t => { t.pass(); });',
errors: [{
ruleId,
message,
type: 'Identifier',
line: 3,
Expand All @@ -51,7 +48,6 @@ ruleTester.run('no-only-test', rule, {
code: header + 'test\t.only(t => { t.pass(); });',
output: header + 'test\t(t => { t.pass(); });',
errors: [{
ruleId,
message,
type: 'Identifier',
line: 2,
Expand All @@ -62,7 +58,6 @@ ruleTester.run('no-only-test', rule, {
code: header + 'test .only(t => { t.pass(); });',
output: header + 'test (t => { t.pass(); });',
errors: [{
ruleId,
message,
type: 'Identifier',
line: 2,
Expand All @@ -73,7 +68,6 @@ ruleTester.run('no-only-test', rule, {
code: header + 'test.\n\tonly(t => { t.pass(); });',
output: header + 'test\n\t(t => { t.pass(); });',
errors: [{
ruleId,
message,
type: 'Identifier',
line: 3,
Expand All @@ -84,7 +78,6 @@ ruleTester.run('no-only-test', rule, {
code: header + 'test.\n only(t => { t.pass(); });',
output: header + 'test\n (t => { t.pass(); });',
errors: [{
ruleId,
message,
type: 'Identifier',
line: 3,
Expand All @@ -95,7 +88,6 @@ ruleTester.run('no-only-test', rule, {
code: header + 'test.only(t => { t.pass(); });',
output: header + 'test(t => { t.pass(); });',
errors: [{
ruleId,
message,
type: 'Identifier',
line: 2,
Expand All @@ -106,7 +98,6 @@ ruleTester.run('no-only-test', rule, {
code: header + 'test.cb.only(t => { t.pass(); t.end(); });',
output: header + 'test.cb(t => { t.pass(); t.end(); });',
errors: [{
ruleId,
message,
type: 'Identifier',
line: 2,
Expand All @@ -117,7 +108,6 @@ ruleTester.run('no-only-test', rule, {
code: header + 'test.only.cb(t => { t.pass(); t.end(); });',
output: header + 'test.cb(t => { t.pass(); t.end(); });',
errors: [{
ruleId,
message,
type: 'Identifier',
line: 2,
Expand Down
2 changes: 1 addition & 1 deletion test/no-skip-assert.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const ruleTester = avaRuleTester(test, {
}
});

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

ruleTester.run('no-skip-assert', rule, {
Expand Down
Loading

0 comments on commit dcba649

Please sign in to comment.