Upgrade to ESLint 7

Author: novemberborn

package.json

@@ -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",
@@ -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",
@@ -57,7 +57,7 @@
 		"xo": "^0.33.0"
 	},
 	"peerDependencies": {
-		"eslint": ">=6.2.0"
+		"eslint": ">=7.7.0"
 	},
 	"ava": {
 		"files": [

rules/assertion-arguments.js

@@ -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;
 	});
 }
 

test/assertion-arguments.js

@@ -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 {

test/hooks-order.js

@@ -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, {

test/max-asserts.js

@@ -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) {

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

@@ -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';
 
@@ -46,7 +45,6 @@ for (const options of ruleTesterOptions) {
 			{
 				code: `${header}test(async t => {});`,
 				errors: [{
-					ruleId,
 					message,
 					type: 'ArrowFunctionExpression',
 					line: 2,
@@ -56,7 +54,6 @@ for (const options of ruleTesterOptions) {
 			{
 				code: `${header}test(async function(t) {});`,
 				errors: [{
-					ruleId,
 					message,
 					type: 'FunctionExpression',
 					line: 2,
@@ -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,
@@ -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,
@@ -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,
@@ -102,7 +95,6 @@ for (const options of ruleTesterOptions) {
 			{
 				code: `${header}test('title', async t => {});`,
 				errors: [{
-					ruleId,
 					message,
 					type: 'ArrowFunctionExpression',
 					line: 2,

test/no-cb-test.js

@@ -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';
 
@@ -24,7 +23,6 @@ ruleTester.run('no-cb-test', rule, {
 		{
 			code: header + 'test.cb(t => { t.pass(); });',
 			errors: [{
-				ruleId,
 				message,
 				type: 'Identifier',
 				line: 2,
@@ -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,
@@ -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,

test/no-duplicate-modifiers.js

@@ -8,7 +8,6 @@ const ruleTester = avaRuleTester(test, {
 	}
 });
 
-const ruleId = 'no-duplicate-modifiers';
 const header = 'const test = require(\'ava\');\n';
 
 const modifiers = [
@@ -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,
@@ -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,

test/no-identical-title.js

@@ -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';
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,

test/no-incorrect-deep-equal.js

@@ -9,7 +9,6 @@ const ruleTester = avaRuleTester(test, {
 });
 
 const error = {
-	ruleId: 'no-incorrect-deep-equal',
 	messageId: 'no-deep-equal-with-primative'
 };