Skip to content

Commit 61e1da6

Browse files
committed
fix: treat vitest and vi the same
1 parent 3250a9c commit 61e1da6

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

src/rules/consistent-vitest-vi.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { AST_NODE_TYPES, TSESTree } from '@typescript-eslint/utils'
2-
import { createEslintRule } from '../utils'
2+
import { createEslintRule, isSupportedAccessor } from '../utils'
33
import { UtilName } from '../utils/types'
44
import { parseVitestFnCall } from '../utils/parse-vitest-fn-call'
55

@@ -95,7 +95,12 @@ export default createEslintRule<[Partial<{ fn: UtilName }>], MESSAGE_ID>({
9595
},
9696
CallExpression(node: TSESTree.CallExpression) {
9797
const vitestFnCall = parseVitestFnCall(node, context)
98-
if (vitestFnCall?.type !== oppositeUtilKeyword) {
98+
99+
if (vitestFnCall?.type !== 'vi') {
100+
return
101+
}
102+
103+
if(!isSupportedAccessor(vitestFnCall.head.node, oppositeUtilKeyword)) {
99104
return
100105
}
101106

src/rules/unbound-method.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export default createEslintRule<Options, MESSAGE_IDS>({
7676
)
7777

7878
if (
79-
vitestFnCall?.type === 'vitest' &&
79+
vitestFnCall?.type === 'vi' &&
8080
vitestFnCall.members.length >= 1 &&
8181
isIdentifier(vitestFnCall.members[0], 'mocked')
8282
)

src/utils/parse-vitest-fn-call.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ export type VitestFnType =
2222
| 'unknown'
2323
| 'hook'
2424
| 'vi'
25-
| 'vitest'
2625
| 'expectTypeOf'
2726

2827
interface ResolvedVitestFn {
@@ -128,9 +127,7 @@ const determineVitestFnType = (name: string): VitestFnType => {
128127

129128
if (name === 'expectTypeOf') return 'expectTypeOf'
130129

131-
if (name === 'vi') return 'vi'
132-
133-
if (name === 'vitest') return 'vitest'
130+
if (name === 'vi' || name === 'vitest') return 'vi'
134131

135132
if (Object.prototype.hasOwnProperty.call(DescribeAlias, name))
136133
return 'describe'

0 commit comments

Comments
 (0)