chore: update

vitest-dev · Jul 17, 2023 · 0b9528e · 0b9528e
1 parent dad7e65
commit 0b9528e
Show file tree

Hide file tree

Showing 25 changed files with 63 additions and 34 deletions.
diff --git a/src/rules/fixtures/class.ts 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
diff --git a/src/rules/fixtures/tsconfig.json 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"
+	]
+}
diff --git 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
@@ -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
@@ -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<TRuleModule extends TSESLint.RuleModule<string, unknown[]>> =

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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, () => {