From eb8ab6ed768e486d2fe30423c2db67226eb00904 Mon Sep 17 00:00:00 2001 From: Wonsuk Choi Date: Fri, 25 Sep 2026 17:00:34 +0900 Subject: [PATCH] test(vue-query): replace mock type casts with 'vi.mocked' and remove unused 'getCurrentInstance' mocks (#11630) --- .../src/__tests__/useIsFetching.test.ts | 5 +---- .../src/__tests__/useIsMutating.test.ts | 5 +---- .../src/__tests__/useMutation.test.ts | 5 +---- .../src/__tests__/useQueries.test.ts | 5 +---- .../vue-query/src/__tests__/useQuery.test.ts | 21 +------------------ .../src/__tests__/vueQueryPlugin.test.ts | 14 ++++++------- 6 files changed, 12 insertions(+), 43 deletions(-) diff --git a/packages/vue-query/src/__tests__/useIsFetching.test.ts b/packages/vue-query/src/__tests__/useIsFetching.test.ts index 850ffb54f2..29688106b7 100644 --- a/packages/vue-query/src/__tests__/useIsFetching.test.ts +++ b/packages/vue-query/src/__tests__/useIsFetching.test.ts @@ -3,7 +3,6 @@ import { onScopeDispose, reactive, ref } from 'vue-demi' import { queryKey, sleep } from '@tanstack/query-test-utils' import { useQuery } from '../useQuery' import { useIsFetching } from '../useIsFetching' -import type { MockedFunction } from 'vitest' vi.mock('../useQueryClient') @@ -40,9 +39,7 @@ describe('useIsFetching', () => { it('should stop listening to changes on onScopeDispose', async () => { const key = queryKey() - const onScopeDisposeMock = onScopeDispose as MockedFunction< - typeof onScopeDispose - > + const onScopeDisposeMock = vi.mocked(onScopeDispose) onScopeDisposeMock.mockImplementation((fn) => fn()) const { status } = useQuery({ diff --git a/packages/vue-query/src/__tests__/useIsMutating.test.ts b/packages/vue-query/src/__tests__/useIsMutating.test.ts index d639f68823..4eb80ce16a 100644 --- a/packages/vue-query/src/__tests__/useIsMutating.test.ts +++ b/packages/vue-query/src/__tests__/useIsMutating.test.ts @@ -5,7 +5,6 @@ import { useMutation } from '../useMutation' import { useIsMutating } from '../useMutationState' import { useQueryClient } from '../useQueryClient' import { QueryClient } from '../queryClient' -import type { MockedFunction } from 'vitest' vi.mock('../useQueryClient') @@ -42,9 +41,7 @@ describe('useIsMutating', () => { }) it('should stop listening to changes on onScopeDispose', async () => { - const onScopeDisposeMock = onScopeDispose as MockedFunction< - typeof onScopeDispose - > + const onScopeDisposeMock = vi.mocked(onScopeDispose) onScopeDisposeMock.mockImplementation((fn) => fn()) const key = queryKey() diff --git a/packages/vue-query/src/__tests__/useMutation.test.ts b/packages/vue-query/src/__tests__/useMutation.test.ts index 1164ea7a69..4d5f18bd46 100644 --- a/packages/vue-query/src/__tests__/useMutation.test.ts +++ b/packages/vue-query/src/__tests__/useMutation.test.ts @@ -12,7 +12,6 @@ import { noop } from '@tanstack/query-core' import { queryKey, sleep } from '@tanstack/query-test-utils' import { useMutation } from '../useMutation' import { useQueryClient } from '../useQueryClient' -import type { MockedFunction } from 'vitest' import type { MutationFunctionContext } from '@tanstack/query-core' vi.mock('../useQueryClient') @@ -530,9 +529,7 @@ describe('useMutation', () => { it('should stop listening to changes on onScopeDispose', async () => { const key = queryKey() const queryClient = useQueryClient() - const onScopeDisposeMock = onScopeDispose as MockedFunction< - typeof onScopeDispose - > + const onScopeDisposeMock = vi.mocked(onScopeDispose) onScopeDisposeMock.mockImplementationOnce((fn) => fn()) const mutation = useMutation({ diff --git a/packages/vue-query/src/__tests__/useQueries.test.ts b/packages/vue-query/src/__tests__/useQueries.test.ts index 22e814371b..7e5dadff1d 100644 --- a/packages/vue-query/src/__tests__/useQueries.test.ts +++ b/packages/vue-query/src/__tests__/useQueries.test.ts @@ -5,7 +5,6 @@ import { queryKey, sleep } from '@tanstack/query-test-utils' import { useQueries } from '../useQueries' import { useQueryClient } from '../useQueryClient' import { QueryClient } from '../queryClient' -import type { MockedFunction } from 'vitest' vi.mock('../useQueryClient') @@ -179,9 +178,7 @@ describe('useQueries', () => { const key1 = queryKey() const key2 = queryKey() const queryClient = useQueryClient() - const onScopeDisposeMock = onScopeDispose as MockedFunction< - typeof onScopeDispose - > + const onScopeDisposeMock = vi.mocked(onScopeDispose) onScopeDisposeMock.mockImplementationOnce((fn) => fn()) const queries = [ diff --git a/packages/vue-query/src/__tests__/useQuery.test.ts b/packages/vue-query/src/__tests__/useQuery.test.ts index cac151a9ea..99d80d955f 100644 --- a/packages/vue-query/src/__tests__/useQuery.test.ts +++ b/packages/vue-query/src/__tests__/useQuery.test.ts @@ -1,7 +1,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { computed, - getCurrentInstance, isReactive, isReadonly, isVue3, @@ -20,7 +19,6 @@ import { keepPreviousData } from '..' import { useQuery } from '../useQuery' import { useBaseQuery } from '../useBaseQuery' import { useQueryClient } from '../useQueryClient' -import type { Mock, MockedFunction } from 'vitest' vi.mock('../useQueryClient') vi.mock('../useBaseQuery') @@ -309,9 +307,7 @@ describe('useQuery', () => { it('should stop listening to changes on onScopeDispose', async () => { const key = queryKey() const queryClient = useQueryClient() - const onScopeDisposeMock = onScopeDispose as MockedFunction< - typeof onScopeDispose - > + const onScopeDisposeMock = vi.mocked(onScopeDispose) onScopeDisposeMock.mockImplementationOnce((fn) => fn()) const { status } = useQuery({ @@ -707,9 +703,6 @@ describe('useQuery', () => { describe('suspense', () => { it('should return a Promise', () => { const key = queryKey() - const getCurrentInstanceSpy = getCurrentInstance as Mock - getCurrentInstanceSpy.mockImplementation(() => ({ suspense: {} })) - const query = useQuery({ queryKey: key, queryFn: () => sleep(0).then(() => 'Some data'), @@ -721,9 +714,6 @@ describe('useQuery', () => { it('should resolve after being enabled', async () => { const key = queryKey() - const getCurrentInstanceSpy = getCurrentInstance as Mock - getCurrentInstanceSpy.mockImplementation(() => ({ suspense: {} })) - const queryFn = vi.fn(() => sleep(10).then(() => 'Some data')) const onResolve = vi.fn() const isEnabled = ref(false) @@ -749,9 +739,6 @@ describe('useQuery', () => { it('should resolve immediately without refetching when the data is fresh', () => { const key = queryKey() - const getCurrentInstanceSpy = getCurrentInstance as Mock - getCurrentInstanceSpy.mockImplementation(() => ({ suspense: {} })) - const queryFn = vi.fn(() => sleep(10).then(() => 'Some data')) const query = useQuery({ @@ -768,9 +755,6 @@ describe('useQuery', () => { it('should not throw from suspense by default', async () => { const key = queryKey() - const getCurrentInstanceSpy = getCurrentInstance as Mock - getCurrentInstanceSpy.mockImplementation(() => ({ suspense: {} })) - const query = useQuery({ queryKey: key, queryFn: () => @@ -790,9 +774,6 @@ describe('useQuery', () => { onTestFinished, }) => { const key = queryKey() - const getCurrentInstanceSpy = getCurrentInstance as Mock - getCurrentInstanceSpy.mockImplementation(() => ({ suspense: {} })) - const throwOnError = vi.fn().mockReturnValue(true) const query = useQuery({ queryKey: key, diff --git a/packages/vue-query/src/__tests__/vueQueryPlugin.test.ts b/packages/vue-query/src/__tests__/vueQueryPlugin.test.ts index a77ac72dbe..c6e3cafa5e 100644 --- a/packages/vue-query/src/__tests__/vueQueryPlugin.test.ts +++ b/packages/vue-query/src/__tests__/vueQueryPlugin.test.ts @@ -8,7 +8,6 @@ import { setupDevtools } from '../devtools/devtools' import { useQuery } from '../useQuery' import { useQueries } from '../useQueries' import type { App, ComponentOptions } from 'vue' -import type { Mock } from 'vitest' vi.mock('../devtools/devtools') vi.mock('../useQueryClient') @@ -54,7 +53,7 @@ describe('VueQueryPlugin', () => { describe('devtools', () => { it('should NOT setup devtools', () => { - const setupDevtoolsMock = setupDevtools as Mock + const setupDevtoolsMock = vi.mocked(setupDevtools) const appMock = getAppMock() VueQueryPlugin.install(appMock) @@ -64,7 +63,7 @@ describe('VueQueryPlugin', () => { itIf(isVue2)('should NOT setup devtools by default', () => { const envCopy = process.env.NODE_ENV process.env.NODE_ENV = 'development' - const setupDevtoolsMock = setupDevtools as Mock + const setupDevtoolsMock = vi.mocked(setupDevtools) const appMock = getAppMock() VueQueryPlugin.install(appMock) @@ -78,7 +77,7 @@ describe('VueQueryPlugin', () => { itIf(isVue2)('should setup devtools', () => { const envCopy = process.env.NODE_ENV process.env.NODE_ENV = 'development' - const setupDevtoolsMock = setupDevtools as Mock + const setupDevtoolsMock = vi.mocked(setupDevtools) const appMock = getAppMock() VueQueryPlugin.install(appMock, { enableDevtoolsV6Plugin: true }) @@ -92,7 +91,7 @@ describe('VueQueryPlugin', () => { itIf(isVue3)('should NOT setup devtools by default', () => { const envCopy = process.env.NODE_ENV process.env.NODE_ENV = 'development' - const setupDevtoolsMock = setupDevtools as Mock + const setupDevtoolsMock = vi.mocked(setupDevtools) const appMock = getAppMock() VueQueryPlugin.install(appMock) process.env.NODE_ENV = envCopy @@ -103,7 +102,7 @@ describe('VueQueryPlugin', () => { itIf(isVue3)('should setup devtools', () => { const envCopy = process.env.NODE_ENV process.env.NODE_ENV = 'development' - const setupDevtoolsMock = setupDevtools as Mock + const setupDevtoolsMock = vi.mocked(setupDevtools) const appMock = getAppMock() VueQueryPlugin.install(appMock, { enableDevtoolsV6Plugin: true }) process.env.NODE_ENV = envCopy @@ -246,7 +245,8 @@ describe('VueQueryPlugin', () => { queryClientConfig: config, }) - const client = (appMock.provide as Mock).mock.calls[0]?.[1] + const client = vi.mocked(appMock.provide).mock + .calls[0]?.[1] as QueryClient const defaultOptions = client.getDefaultOptions() expect(defaultOptions).toEqual(config.defaultOptions)