From d3d333a3c684ddf1f145c5ea868120eef9a6c13a Mon Sep 17 00:00:00 2001 From: Mike McCready <66998419+MikeMcC399@users.noreply.github.com> Date: Tue, 16 Apr 2024 09:49:59 +0200 Subject: [PATCH 1/2] fix: convert deprecated context calls --- lib/rules/no-async-before.js | 5 ++++- lib/rules/no-async-tests.js | 5 ++++- lib/rules/no-unnecessary-waiting.js | 6 +++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/rules/no-async-before.js b/lib/rules/no-async-before.js index 6b2012e6..ab16cb96 100644 --- a/lib/rules/no-async-before.js +++ b/lib/rules/no-async-before.js @@ -28,11 +28,14 @@ module.exports = { && node.arguments.length >= 2 && node.arguments[1].async === true } + const { sourceCode = { } } = context return { Identifier (node) { if (node.name === 'cy' || node.name === 'Cypress') { - const ancestors = context.getAncestors() + const ancestors = sourceCode.getAncestors + ? sourceCode.getAncestors(node) + : context.getAncestors() const asyncTestBlocks = ancestors .filter((n) => n.type === 'CallExpression') .filter(isBeforeBlock) diff --git a/lib/rules/no-async-tests.js b/lib/rules/no-async-tests.js index 560ac2bf..33601f04 100644 --- a/lib/rules/no-async-tests.js +++ b/lib/rules/no-async-tests.js @@ -28,11 +28,14 @@ module.exports = { && node.arguments.length >= 2 && node.arguments[1].async === true } + const { sourceCode = { } } = context return { Identifier (node) { if (node.name === 'cy' || node.name === 'Cypress') { - const ancestors = context.getAncestors() + const ancestors = sourceCode.getAncestors + ? sourceCode.getAncestors(node) + : context.getAncestors() const asyncTestBlocks = ancestors .filter((n) => n.type === 'CallExpression') .filter(isTestBlock) diff --git a/lib/rules/no-unnecessary-waiting.js b/lib/rules/no-unnecessary-waiting.js index 56bcc6c2..c08b5977 100644 --- a/lib/rules/no-unnecessary-waiting.js +++ b/lib/rules/no-unnecessary-waiting.js @@ -15,10 +15,14 @@ module.exports = { }, }, create (context) { + const { sourceCode = { } } = context + return { CallExpression (node) { if (isCallingCyWait(node)) { - const scope = context.getScope() + const scope = sourceCode.getScope + ? sourceCode.getScope(node) + : context.getScope() if (isIdentifierNumberConstArgument(node, scope) || isNumberArgument(node)) { context.report({ node, messageId: 'unexpected' }) From 534db691ffecdc642d1139ed7060cae44438ff1d Mon Sep 17 00:00:00 2001 From: Mike McCready <66998419+MikeMcC399@users.noreply.github.com> Date: Fri, 26 Apr 2024 10:02:27 +0200 Subject: [PATCH 2/2] use recommended backwards-compatible calls See https://eslint.org/blog/2023/09/preparing-custom-rules-eslint-v9/ --- lib/rules/no-async-before.js | 2 +- lib/rules/no-async-tests.js | 2 +- lib/rules/no-unnecessary-waiting.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/rules/no-async-before.js b/lib/rules/no-async-before.js index ab16cb96..aa428543 100644 --- a/lib/rules/no-async-before.js +++ b/lib/rules/no-async-before.js @@ -28,7 +28,7 @@ module.exports = { && node.arguments.length >= 2 && node.arguments[1].async === true } - const { sourceCode = { } } = context + const sourceCode = context.sourceCode ?? context.getSourceCode() return { Identifier (node) { diff --git a/lib/rules/no-async-tests.js b/lib/rules/no-async-tests.js index 33601f04..5d1ca284 100644 --- a/lib/rules/no-async-tests.js +++ b/lib/rules/no-async-tests.js @@ -28,7 +28,7 @@ module.exports = { && node.arguments.length >= 2 && node.arguments[1].async === true } - const { sourceCode = { } } = context + const sourceCode = context.sourceCode ?? context.getSourceCode() return { Identifier (node) { diff --git a/lib/rules/no-unnecessary-waiting.js b/lib/rules/no-unnecessary-waiting.js index c08b5977..1c1132e0 100644 --- a/lib/rules/no-unnecessary-waiting.js +++ b/lib/rules/no-unnecessary-waiting.js @@ -15,7 +15,7 @@ module.exports = { }, }, create (context) { - const { sourceCode = { } } = context + const sourceCode = context.sourceCode ?? context.getSourceCode() return { CallExpression (node) {