From 303c15b6592059bce48a5e3b489df302f2bc7fbc Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Mon, 29 Mar 2021 02:42:02 -0400 Subject: [PATCH 1/3] Added mocha-avoid-only converter --- .../lintConfigs/rules/ruleConverters.ts | 2 ++ .../rules/ruleConverters/mocha-avoid-only.ts | 11 +++++++++++ .../ruleConverters/tests/await-promise.test.ts | 1 + .../tests/mocha-avoid-only.test.ts | 17 +++++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 src/converters/lintConfigs/rules/ruleConverters/mocha-avoid-only.ts create mode 100644 src/converters/lintConfigs/rules/ruleConverters/tests/mocha-avoid-only.test.ts diff --git a/src/converters/lintConfigs/rules/ruleConverters.ts b/src/converters/lintConfigs/rules/ruleConverters.ts index 82f53ff2d..ccdb8339e 100644 --- a/src/converters/lintConfigs/rules/ruleConverters.ts +++ b/src/converters/lintConfigs/rules/ruleConverters.ts @@ -31,6 +31,7 @@ import { convertMaxFileLineCount } from "./ruleConverters/max-file-line-count"; import { convertMaxLineLength } from "./ruleConverters/max-line-length"; import { convertMemberAccess } from "./ruleConverters/member-access"; import { convertMemberOrdering } from "./ruleConverters/member-ordering"; +import { convertMochaAvoidOnly } from "./ruleConverters/mocha-avoid-only"; import { convertNewlineBeforeReturn } from "./ruleConverters/newline-before-return"; import { convertNewlinePerChainedCall } from "./ruleConverters/newline-per-chained-call"; import { convertNewParens } from "./ruleConverters/new-parens"; @@ -272,6 +273,7 @@ export const ruleConverters = new Map([ ["max-line-length", convertMaxLineLength], ["member-access", convertMemberAccess], ["member-ordering", convertMemberOrdering], + ["mocha-avoid-only", convertMochaAvoidOnly], ["new-parens", convertNewParens], ["newline-before-return", convertNewlineBeforeReturn], ["newline-per-chained-call", convertNewlinePerChainedCall], diff --git a/src/converters/lintConfigs/rules/ruleConverters/mocha-avoid-only.ts b/src/converters/lintConfigs/rules/ruleConverters/mocha-avoid-only.ts new file mode 100644 index 000000000..115ad56f3 --- /dev/null +++ b/src/converters/lintConfigs/rules/ruleConverters/mocha-avoid-only.ts @@ -0,0 +1,11 @@ +import { RuleConverter } from "../ruleConverter"; + +export const convertMochaAvoidOnly: RuleConverter = () => { + return { + rules: [ + { + ruleName: "jest/no-focused-tests", + }, + ], + }; +}; diff --git a/src/converters/lintConfigs/rules/ruleConverters/tests/await-promise.test.ts b/src/converters/lintConfigs/rules/ruleConverters/tests/await-promise.test.ts index 5b626a7e7..9605f05c1 100644 --- a/src/converters/lintConfigs/rules/ruleConverters/tests/await-promise.test.ts +++ b/src/converters/lintConfigs/rules/ruleConverters/tests/await-promise.test.ts @@ -9,6 +9,7 @@ describe(convertAwaitPromise, () => { expect(result).toEqual({ rules: [ { + plugins: ["eslint-plugin-jest"], ruleName: "@typescript-eslint/await-thenable", }, ], diff --git a/src/converters/lintConfigs/rules/ruleConverters/tests/mocha-avoid-only.test.ts b/src/converters/lintConfigs/rules/ruleConverters/tests/mocha-avoid-only.test.ts new file mode 100644 index 000000000..e3eab56eb --- /dev/null +++ b/src/converters/lintConfigs/rules/ruleConverters/tests/mocha-avoid-only.test.ts @@ -0,0 +1,17 @@ +import { convertMochaAvoidOnly } from "../mocha-avoid-only"; + +describe(convertMochaAvoidOnly, () => { + test("conversion without arguments", () => { + const result = convertMochaAvoidOnly({ + ruleArguments: [], + }); + + expect(result).toEqual({ + rules: [ + { + ruleName: "jest/no-focused-tests", + }, + ], + }); + }); +}); From 3596868cfcba1f5602d9ab799f23f4b52b2c84bb Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Wed, 31 Mar 2021 09:53:21 -0400 Subject: [PATCH 2/3] Fix source to include plugins --- .../lintConfigs/rules/ruleConverters/mocha-avoid-only.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/converters/lintConfigs/rules/ruleConverters/mocha-avoid-only.ts b/src/converters/lintConfigs/rules/ruleConverters/mocha-avoid-only.ts index 115ad56f3..e43e35f63 100644 --- a/src/converters/lintConfigs/rules/ruleConverters/mocha-avoid-only.ts +++ b/src/converters/lintConfigs/rules/ruleConverters/mocha-avoid-only.ts @@ -2,6 +2,7 @@ import { RuleConverter } from "../ruleConverter"; export const convertMochaAvoidOnly: RuleConverter = () => { return { + plugins: ["eslint-plugin-jest"], rules: [ { ruleName: "jest/no-focused-tests", From c47a7a994c2f1ca2d36f8a25e3a035b7372980cc Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Wed, 31 Mar 2021 09:56:35 -0400 Subject: [PATCH 3/3] I had updated the wrong test file --- .../lintConfigs/rules/ruleConverters/tests/await-promise.test.ts | 1 - .../rules/ruleConverters/tests/mocha-avoid-only.test.ts | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/converters/lintConfigs/rules/ruleConverters/tests/await-promise.test.ts b/src/converters/lintConfigs/rules/ruleConverters/tests/await-promise.test.ts index 9605f05c1..5b626a7e7 100644 --- a/src/converters/lintConfigs/rules/ruleConverters/tests/await-promise.test.ts +++ b/src/converters/lintConfigs/rules/ruleConverters/tests/await-promise.test.ts @@ -9,7 +9,6 @@ describe(convertAwaitPromise, () => { expect(result).toEqual({ rules: [ { - plugins: ["eslint-plugin-jest"], ruleName: "@typescript-eslint/await-thenable", }, ], diff --git a/src/converters/lintConfigs/rules/ruleConverters/tests/mocha-avoid-only.test.ts b/src/converters/lintConfigs/rules/ruleConverters/tests/mocha-avoid-only.test.ts index e3eab56eb..4032a4717 100644 --- a/src/converters/lintConfigs/rules/ruleConverters/tests/mocha-avoid-only.test.ts +++ b/src/converters/lintConfigs/rules/ruleConverters/tests/mocha-avoid-only.test.ts @@ -7,6 +7,7 @@ describe(convertMochaAvoidOnly, () => { }); expect(result).toEqual({ + plugins: ["eslint-plugin-jest"], rules: [ { ruleName: "jest/no-focused-tests",