From 0b9528e01e8e4c866281cf2e1c4806172e7f5c64 Mon Sep 17 00:00:00 2001 From: Verite Mugabo Date: Mon, 17 Jul 2023 20:31:34 +0200 Subject: [PATCH] chore: update --- src/rules/fixtures/class.ts | 1 + src/rules/fixtures/file.ts | 0 src/rules/fixtures/tsconfig.json | 19 +++++++++++ src/rules/prefer-comparison-matcher.test.ts | 2 +- src/rules/prefer-each.test.ts | 2 +- src/rules/prefer-equality-matcher.test.ts | 2 +- src/rules/prefer-expect-resolves.test.ts | 2 +- src/rules/prefer-hooks-in-order.test.ts | 2 +- src/rules/prefer-hooks-on-top.test.ts | 2 +- .../prefer-mock-promise-shorthand.test.ts | 4 +-- src/rules/prefer-snapshot-hint.test.ts | 2 +- src/rules/prefer-spy-on.test.ts | 2 +- src/rules/prefer-strict-equal.test.ts | 2 +- src/rules/prefer-to-be-falsy.test.ts | 2 +- src/rules/prefer-to-be-object.test.ts | 2 +- src/rules/prefer-to-be-truthy.test.ts | 2 +- src/rules/prefer-to-contain.test.ts | 2 +- src/rules/prefer-to-have-length.test.ts | 2 +- src/rules/prefer-todo.test.ts | 2 +- src/rules/require-hook.test.ts | 2 +- src/rules/require-to-throw-message.test.ts | 2 +- src/rules/require-top-level-describe.test.ts | 2 +- src/rules/unbound-method.test.ts | 33 ++++++++++++------- src/rules/valid-describe-callback.test.ts | 2 +- src/rules/valid-title.test.ts | 2 +- 25 files changed, 63 insertions(+), 34 deletions(-) create mode 100644 src/rules/fixtures/class.ts create mode 100644 src/rules/fixtures/file.ts create mode 100644 src/rules/fixtures/tsconfig.json diff --git a/src/rules/fixtures/class.ts b/src/rules/fixtures/class.ts new file mode 100644 index 0000000..543507d --- /dev/null +++ b/src/rules/fixtures/class.ts @@ -0,0 +1 @@ +export class Function {} diff --git a/src/rules/fixtures/file.ts b/src/rules/fixtures/file.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/rules/fixtures/tsconfig.json b/src/rules/fixtures/tsconfig.json new file mode 100644 index 0000000..00065f4 --- /dev/null +++ b/src/rules/fixtures/tsconfig.json @@ -0,0 +1,19 @@ +{ + "compilerOptions": { + "jsx": "preserve", + "target": "es5", + "module": "commonjs", + "strict": true, + "esModuleInterop": true, + "lib": [ + "es2015", + "es2017", + "esnext" + ], + "experimentalDecorators": true + }, + "include": [ + "file.ts", + "class.ts" + ] +} \ No newline at end of file diff --git a/src/rules/prefer-comparison-matcher.test.ts b/src/rules/prefer-comparison-matcher.test.ts index 2e29cd2..41b9c87 100644 --- a/src/rules/prefer-comparison-matcher.test.ts +++ b/src/rules/prefer-comparison-matcher.test.ts @@ -1,5 +1,5 @@ import { describe, test } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-comparison-matcher' describe(RULE_NAME, () => { diff --git a/src/rules/prefer-each.test.ts b/src/rules/prefer-each.test.ts index 96612a0..2accf60 100644 --- a/src/rules/prefer-each.test.ts +++ b/src/rules/prefer-each.test.ts @@ -1,5 +1,5 @@ import { describe, test } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-each' describe(RULE_NAME, () => { diff --git a/src/rules/prefer-equality-matcher.test.ts b/src/rules/prefer-equality-matcher.test.ts index a1e4261..d00514b 100644 --- a/src/rules/prefer-equality-matcher.test.ts +++ b/src/rules/prefer-equality-matcher.test.ts @@ -1,6 +1,6 @@ import { TSESLint } from '@typescript-eslint/utils' import { test, describe } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-equality-matcher' type RuleMessages> = diff --git a/src/rules/prefer-expect-resolves.test.ts b/src/rules/prefer-expect-resolves.test.ts index 05ecb7a..1c71899 100644 --- a/src/rules/prefer-expect-resolves.test.ts +++ b/src/rules/prefer-expect-resolves.test.ts @@ -1,5 +1,5 @@ import { it, describe } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-expect-resolves' const messageId = 'expectResolves' diff --git a/src/rules/prefer-hooks-in-order.test.ts b/src/rules/prefer-hooks-in-order.test.ts index a5ecda4..9c36094 100644 --- a/src/rules/prefer-hooks-in-order.test.ts +++ b/src/rules/prefer-hooks-in-order.test.ts @@ -1,5 +1,5 @@ import { describe, it } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-hooks-in-order' describe(RULE_NAME, () => { diff --git a/src/rules/prefer-hooks-on-top.test.ts b/src/rules/prefer-hooks-on-top.test.ts index 11070cc..27d0dd1 100644 --- a/src/rules/prefer-hooks-on-top.test.ts +++ b/src/rules/prefer-hooks-on-top.test.ts @@ -1,5 +1,5 @@ import { describe, test } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-hooks-on-top' describe(RULE_NAME, () => { diff --git a/src/rules/prefer-mock-promise-shorthand.test.ts b/src/rules/prefer-mock-promise-shorthand.test.ts index 4192c0c..ae90fb5 100644 --- a/src/rules/prefer-mock-promise-shorthand.test.ts +++ b/src/rules/prefer-mock-promise-shorthand.test.ts @@ -1,10 +1,10 @@ import { describe, test } from 'vitest' -import tester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-mock-promise-shorthand' describe(RULE_NAME, () => { test(RULE_NAME, () => { - tester.run(RULE_NAME, rule, { + ruleTester.run(RULE_NAME, rule, { valid: [ 'describe()', 'it()', diff --git a/src/rules/prefer-snapshot-hint.test.ts b/src/rules/prefer-snapshot-hint.test.ts index 77b9d85..41381fc 100644 --- a/src/rules/prefer-snapshot-hint.test.ts +++ b/src/rules/prefer-snapshot-hint.test.ts @@ -1,5 +1,5 @@ import { describe, it } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-snapshot-hint' describe(RULE_NAME, () => { diff --git a/src/rules/prefer-spy-on.test.ts b/src/rules/prefer-spy-on.test.ts index b25eb27..437a4b0 100644 --- a/src/rules/prefer-spy-on.test.ts +++ b/src/rules/prefer-spy-on.test.ts @@ -1,6 +1,6 @@ import { describe, test } from 'vitest' import { AST_NODE_TYPES } from '@typescript-eslint/utils' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-spy-on' describe(RULE_NAME, () => { diff --git a/src/rules/prefer-strict-equal.test.ts b/src/rules/prefer-strict-equal.test.ts index e7be216..499796a 100644 --- a/src/rules/prefer-strict-equal.test.ts +++ b/src/rules/prefer-strict-equal.test.ts @@ -1,5 +1,5 @@ import { describe, it } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-strict-equal' describe(RULE_NAME, () => { diff --git a/src/rules/prefer-to-be-falsy.test.ts b/src/rules/prefer-to-be-falsy.test.ts index 8ce8585..f657fbc 100644 --- a/src/rules/prefer-to-be-falsy.test.ts +++ b/src/rules/prefer-to-be-falsy.test.ts @@ -1,5 +1,5 @@ import { describe, it } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-to-be-falsy' const messageId = 'preferToBeFalsy' diff --git a/src/rules/prefer-to-be-object.test.ts b/src/rules/prefer-to-be-object.test.ts index 10a0b77..ee81213 100644 --- a/src/rules/prefer-to-be-object.test.ts +++ b/src/rules/prefer-to-be-object.test.ts @@ -1,5 +1,5 @@ import { test, describe } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-to-be-object' const messageId = 'preferToBeObject' diff --git a/src/rules/prefer-to-be-truthy.test.ts b/src/rules/prefer-to-be-truthy.test.ts index fa9edaa..fa02626 100644 --- a/src/rules/prefer-to-be-truthy.test.ts +++ b/src/rules/prefer-to-be-truthy.test.ts @@ -1,5 +1,5 @@ import { describe, it } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-to-be-truthy' const messageId = 'preferToBeTruthy' diff --git a/src/rules/prefer-to-contain.test.ts b/src/rules/prefer-to-contain.test.ts index 03b62ae..eaa1bdf 100644 --- a/src/rules/prefer-to-contain.test.ts +++ b/src/rules/prefer-to-contain.test.ts @@ -1,5 +1,5 @@ import { describe, test } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-to-contain' describe(RULE_NAME, () => { diff --git a/src/rules/prefer-to-have-length.test.ts b/src/rules/prefer-to-have-length.test.ts index 64eace5..b970307 100644 --- a/src/rules/prefer-to-have-length.test.ts +++ b/src/rules/prefer-to-have-length.test.ts @@ -1,5 +1,5 @@ import { test, describe } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-to-have-length' const messageId = 'preferToHaveLength' diff --git a/src/rules/prefer-todo.test.ts b/src/rules/prefer-todo.test.ts index 266e4da..9743e11 100644 --- a/src/rules/prefer-todo.test.ts +++ b/src/rules/prefer-todo.test.ts @@ -1,5 +1,5 @@ import { describe, test } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './prefer-todo' describe(RULE_NAME, () => { diff --git a/src/rules/require-hook.test.ts b/src/rules/require-hook.test.ts index 207def3..706d5e8 100644 --- a/src/rules/require-hook.test.ts +++ b/src/rules/require-hook.test.ts @@ -1,5 +1,5 @@ import { describe, test } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './require-hook' describe(RULE_NAME, () => { diff --git a/src/rules/require-to-throw-message.test.ts b/src/rules/require-to-throw-message.test.ts index 9518eec..9c6385b 100644 --- a/src/rules/require-to-throw-message.test.ts +++ b/src/rules/require-to-throw-message.test.ts @@ -1,5 +1,5 @@ import { describe, test } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './require-to-throw-message' describe(RULE_NAME, () => { diff --git a/src/rules/require-top-level-describe.test.ts b/src/rules/require-top-level-describe.test.ts index 6728a9b..02a2af9 100644 --- a/src/rules/require-top-level-describe.test.ts +++ b/src/rules/require-top-level-describe.test.ts @@ -1,5 +1,5 @@ import { describe, test } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './require-top-level-describe' describe(RULE_NAME, () => { diff --git a/src/rules/unbound-method.test.ts b/src/rules/unbound-method.test.ts index b13c9bc..5d9efb1 100644 --- a/src/rules/unbound-method.test.ts +++ b/src/rules/unbound-method.test.ts @@ -1,15 +1,24 @@ -import { ESLintUtils } from "@typescript-eslint/utils"; -import unboundMethod from "./unbound-method"; +import path from 'node:path' +import { RuleTester } from '@typescript-eslint/rule-tester' +import { afterAll, describe, it } from 'vitest' +import unboundMethod from './unbound-method' -const ruleTester = new ESLintUtils.RuleTester({ - parser: "@typescript-eslint/parser", +RuleTester.afterAll = afterAll +RuleTester.describe = describe +RuleTester.it = it + +const rootPath = path.join(__dirname, 'fixtures') + +const ruleTester = new RuleTester({ + parser: '@typescript-eslint/parser', parserOptions: { - sourceType: "module", - project: "./tsconfig.json", - }, -}); + tsconfigRootDir: rootPath, + project: './tsconfig.json', + sourceType: 'module' + } +}) -ruleTester.run("unbound-method", unboundMethod, { +ruleTester.run('unbound-method', unboundMethod, { valid: [ `class MyClass { public logArrowBound = (): void => { @@ -26,7 +35,7 @@ ruleTester.run("unbound-method", unboundMethod, { const logManualBind = instance.logManualBind.bind(instance); logArrowBound(); - logManualBind();`, + logManualBind();` ], - invalid: [], -}); + invalid: [] +}) diff --git a/src/rules/valid-describe-callback.test.ts b/src/rules/valid-describe-callback.test.ts index 32c4c14..213b8ea 100644 --- a/src/rules/valid-describe-callback.test.ts +++ b/src/rules/valid-describe-callback.test.ts @@ -1,5 +1,5 @@ import { describe, it } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './valid-describe-callback' describe(RULE_NAME, () => { diff --git a/src/rules/valid-title.test.ts b/src/rules/valid-title.test.ts index b836b99..a796d79 100644 --- a/src/rules/valid-title.test.ts +++ b/src/rules/valid-title.test.ts @@ -1,5 +1,5 @@ import { describe, it } from 'vitest' -import ruleTester from '../utils/tester' +import { ruleTester } from '../utils/test' import rule, { RULE_NAME } from './valid-title' describe(RULE_NAME, () => {