Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/graph/GraphCanvas.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,13 @@ vi.mock<unknown>(
})
)

vi.mock<unknown>(import('@/composables/useCanvasDrop'), () => ({
vi.mock(import('@/composables/useCanvasDrop'), () => ({
useCanvasDrop: vi.fn()
}))
vi.mock(import('@/platform/settings/composables/useLitegraphSettings'), () => ({
useLitegraphSettings: vi.fn()
}))
vi.mock<unknown>(import('@/composables/node/useNodeBadge'), () => ({
vi.mock(import('@/composables/node/useNodeBadge'), () => ({
useNodeBadge: vi.fn()
}))
vi.mock(import('@/composables/useGlobalLitegraph'), () => ({
Expand Down
2 changes: 1 addition & 1 deletion src/components/sidebar/tabs/AssetsSidebarTab.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ vi.mock<unknown>(
})
)

vi.mock<unknown>(import('@/platform/assets/utils/outputAssetUtil'))
vi.mock(import('@/platform/assets/utils/outputAssetUtil'))

vi.mock<unknown>(
import('primevue/usetoast'), // eslint-disable-line primevue-removal/no-imports
Expand Down
2 changes: 1 addition & 1 deletion src/components/topbar/WorkflowTabs.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import WorkflowTabs from './WorkflowTabs.vue'

vi.mock(import('firebase/auth'))
vi.mock(import('@/platform/telemetry'))
vi.mock<unknown>(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() }))
vi.mock(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() }))

const distribution = vi.hoisted(() => ({
isCloud: false,
Expand Down
7 changes: 4 additions & 3 deletions src/composables/node/useNodeAnimatedImage.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ vi.mock<unknown>(
)
// `@/scripts/app` has a heavy import graph (pinia stores, LGraphCanvas, etc.)
// that we cannot pull in here, so we stub only the constant we need.
vi.mock<unknown>(import('@/scripts/app'), () => ({
ANIM_PREVIEW_WIDGET: '$$comfy_animation_preview'
}))
vi.mock(
import('@/scripts/app'),
() => ({ ANIM_PREVIEW_WIDGET: '$$comfy_animation_preview' }) as const
)

describe('useNodeAnimatedImage', () => {
function setup() {
Expand Down
2 changes: 1 addition & 1 deletion src/composables/useCoreCommands.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ vi.mock<unknown>(import('@/scripts/api'), () => ({
}))

const mockDistributionState = vi.hoisted(() => ({ isCloud: false }))
vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
vi.mock(import('@/platform/distribution/types'), () => ({
get isCloud() {
return mockDistributionState.isCloud
}
Expand Down
2 changes: 1 addition & 1 deletion src/extensions/core/agentPanel.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
vi.mock(import('firebase/auth'))
vi.mock<unknown>(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() }))
vi.mock(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() }))
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import type { Mocked } from 'vitest'
import { computed, effectScope, ref } from 'vue'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
vi.mock(import('firebase/auth'))
vi.mock<unknown>(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() }))
vi.mock(import('vuefire'), () => ({ useFirebaseAuth: vi.fn() }))
import { beforeEach, describe, expect, it, vi } from 'vitest'

import { useAgentPanelStore } from '@/workbench/extensions/agent/stores/agent/agentPanelStore'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ vi.mock(import('@/composables/useCopyToClipboard'), () => ({
const mockDistribution = vi.hoisted(
(): { isCloud: typeof DistributionTypes.isCloud } => ({ isCloud: false })
)
vi.mock<unknown>(
import('@/platform/distribution/types'),
() => mockDistribution
)
vi.mock(import('@/platform/distribution/types'), () => mockDistribution)

vi.mock(import('@/platform/assets/composables/useModelTypes'), async () => {
const { ref } = await import('vue')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ vi.mock(import('@/base/common/downloadUtil'), () => ({
downloadFile: mockDownloadFile
}))

vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
vi.mock(import('@/platform/distribution/types'), () => ({
get isCloud() {
return mockIsCloud.value
}
Expand Down
4 changes: 2 additions & 2 deletions src/platform/assets/services/assetService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { api } from '@/scripts/api'
const mockDistributionState = vi.hoisted(() => ({ isCloud: false }))
const mockSupportsModelTypeTags = vi.hoisted(() => ({ value: true }))

vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
vi.mock(import('@/platform/distribution/types'), () => ({
get isCloud() {
return mockDistributionState.isCloud
}
Expand All @@ -43,7 +43,7 @@ vi.mock<unknown>(import('@/scripts/api'), () => ({
}
}))

vi.mock<unknown>(import('@/i18n'), () => ({
vi.mock(import('@/i18n'), () => ({
t: (key: string) => key,
st: vi.fn((_key: string, fallback: string) => fallback)
}))
Expand Down
5 changes: 1 addition & 4 deletions src/platform/assets/utils/assetMetadataUtils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ const mockDistribution = vi.hoisted(
(): { isCloud: typeof DistributionTypes.isCloud } => ({ isCloud: true })
)

vi.mock<unknown>(
import('@/platform/distribution/types'),
() => mockDistribution
)
vi.mock(import('@/platform/distribution/types'), () => mockDistribution)

describe('assetMetadataUtils', () => {
const mockAsset: AssetItem = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { useMissingMediaStore } from '@/platform/missingMedia/missingMediaStore'

import { markDeletedAssetsAsMissingMedia } from './markDeletedAssetsAsMissingMedia'

vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
vi.mock(import('@/platform/distribution/types'), () => ({
isCloud: true
}))

Expand Down
2 changes: 1 addition & 1 deletion src/platform/auth/session/useSessionCookie.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const mockGetAuthHeader = vi.fn<
>(async () => null)
const originalFetch = globalThis.fetch

vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
vi.mock(import('@/platform/distribution/types'), () => ({
isCloud: true
}))

Expand Down
2 changes: 1 addition & 1 deletion src/platform/auth/unified/remintRetry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ vi.mock<unknown>(import('@/composables/useFeatureFlags'), () => ({

// The axios interceptor gates on shouldRemintCloudRequest(), which is a no-op
// off-cloud; the unit env is not a cloud build, so force it on.
vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
vi.mock(import('@/platform/distribution/types'), () => ({
isCloud: true
}))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@ const electron = {

const errorReporter = vi.hoisted(() => vi.fn())

vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
DISTRIBUTION: 'desktop',
isCloud: false,
isDesktop: true,
isNightly: false
}))
vi.mock(
import('@/platform/distribution/types'),
() =>
({
DISTRIBUTION: 'desktop',
isCloud: false,
isDesktop: true,
isNightly: false
}) as const
)

vi.mock(import('@/platform/telemetry/reportError'), () => ({
reportError: errorReporter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const mockToastAdd = vi.hoisted(() => vi.fn())
const mockUserGetIdToken = vi.hoisted(() => vi.fn())
const mockStoreGetIdToken = vi.hoisted(() => vi.fn())

vi.mock<unknown>(import('@/i18n'), () => ({
vi.mock(import('@/i18n'), () => ({
t: (key: string) => key
}))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ vi.mock<unknown>(
})
)

vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
vi.mock(import('@/platform/distribution/types'), () => ({
isCloud: true
}))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ vi.mock<unknown>(import('@/composables/useErrorHandling'), () => ({
}))
}))

vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
vi.mock(import('@/platform/distribution/types'), () => ({
get isCloud() {
return mockIsCloud.value
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ vi.mock<unknown>(import('@/composables/useFeatureFlags'), () => ({
})
}))

vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
vi.mock(import('@/platform/distribution/types'), () => ({
get isCloud() {
return mockIsCloud.value
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ vi.mock<unknown>(import('@/composables/billing/useBillingContext'), () => ({
})
}))

vi.mock<unknown>(import('@/i18n'), () => ({
vi.mock(import('@/i18n'), () => ({
t: (key: string) => key
}))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ vi.mock<unknown>(import('@/platform/telemetry'), () => ({
useTelemetry: vi.fn(() => mockTelemetry)
}))

vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
vi.mock(import('@/platform/distribution/types'), () => ({
get isCloud() {
return mockIsCloud.value
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const {
mockTrackBillingEvent: vi.fn()
}))

vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
vi.mock(import('@/platform/distribution/types'), () => ({
get isCloud() {
return mockIsCloud.value
}
Expand Down
2 changes: 1 addition & 1 deletion src/platform/keybindings/presetService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ vi.mock<unknown>(import('@/platform/keybindings/keybindingService'), () => ({
})
}))

vi.mock<unknown>(import('@/i18n'), () => ({
vi.mock(import('@/i18n'), () => ({
t: (key: string) => key
}))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ vi.mock<unknown>(import('@/platform/assets/services/assetService'), () => ({
}
}))

vi.mock<unknown>(import('@/platform/remote/comfyui/jobs/fetchJobs'), () => ({
vi.mock(import('@/platform/remote/comfyui/jobs/fetchJobs'), () => ({
fetchHistoryPage: mockFetchHistoryPage
}))

Expand Down
2 changes: 1 addition & 1 deletion src/platform/missingMedia/missingMediaScan.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ vi.mock<unknown>(import('@/platform/assets/services/assetService'), () => ({
}
}))

vi.mock<unknown>(import('@/platform/remote/comfyui/jobs/fetchJobs'), () => ({
vi.mock(import('@/platform/remote/comfyui/jobs/fetchJobs'), () => ({
fetchHistoryPage: mockFetchHistoryPage
}))

Expand Down
20 changes: 12 additions & 8 deletions src/platform/missingModel/components/MissingModelCard.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,18 @@ vi.mock<unknown>(import('./MissingModelRow.vue'), () => ({
}))

const mockIsCloud = vi.hoisted(() => ({ value: true }))
vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
DISTRIBUTION: 'cloud',
get isCloud() {
return mockIsCloud.value
},
isDesktop: false,
isNightly: false
}))
vi.mock(
import('@/platform/distribution/types'),
() =>
({
DISTRIBUTION: 'cloud',
get isCloud() {
return mockIsCloud.value
},
isDesktop: false,
isNightly: false
}) as const
)

import MissingModelCard from './MissingModelCard.vue'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const mockDownloadList = vi.fn(
>[] => []
)

vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
vi.mock(import('@/platform/distribution/types'), () => ({
isCloud: false
}))

Expand Down
20 changes: 12 additions & 8 deletions src/platform/missingModel/missingModelDownload.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,18 @@ const { fetchMock, mockIsDesktop, mockStartDownload } = vi.hoisted(() => ({
mockStartDownload: vi.fn()
}))

vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
DISTRIBUTION: 'localhost',
isCloud: false,
get isDesktop() {
return mockIsDesktop.value
},
isNightly: false
}))
vi.mock(
import('@/platform/distribution/types'),
() =>
({
DISTRIBUTION: 'localhost',
isCloud: false,
get isDesktop() {
return mockIsDesktop.value
},
isNightly: false
}) as const
)

beforeEach(() => {
mockIsDesktop.value = false
Expand Down
2 changes: 1 addition & 1 deletion src/platform/missingModel/missingModelPipeline.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const { mockHandles } = vi.hoisted(() => {
}
})

vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
vi.mock(import('@/platform/distribution/types'), () => ({
isCloud: false
}))

Expand Down
2 changes: 1 addition & 1 deletion src/platform/missingModel/missingModelScan.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1740,7 +1740,7 @@ const { mockUpdateModelsForNodeType, mockGetAssets } = vi.hoisted(() => ({
mockGetAssets: vi.fn().mockReturnValue([])
}))

vi.mock<unknown>(import('@/i18n'), () => ({
vi.mock(import('@/i18n'), () => ({
t: (key: string) => key,
st: (_key: string, fallback: string) => fallback
}))
Expand Down
4 changes: 2 additions & 2 deletions src/platform/missingModel/missingModelStore.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ const mockNodeLocatorIdToNodeExecutionId = vi.hoisted(() =>
vi.fn((nodeLocatorId: string) => nodeLocatorId)
)

vi.mock<unknown>(import('@/i18n'), () => ({
vi.mock(import('@/i18n'), () => ({
t: vi.fn((key: string) => `translated:${key}`),
st: vi.fn((_key: string, fallback: string) => fallback)
}))

vi.mock<unknown>(import('@/platform/distribution/types'), () => ({
vi.mock(import('@/platform/distribution/types'), () => ({
isCloud: false
}))

Expand Down
6 changes: 3 additions & 3 deletions src/platform/settings/globalSettingsApi.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ import {
setGlobalSetting
} from './globalSettingsApi'

vi.mock<unknown>(import('@/config/comfyApi'), () => ({
vi.mock(import('@/config/comfyApi'), () => ({
getComfyApiBaseUrl: () => 'https://api.comfy.test'
}))
const distribution = vi.hoisted(() => ({ isCloud: true }))
vi.mock<unknown>(import('@/platform/distribution/types'), () => distribution)
vi.mock(import('@/platform/distribution/types'), () => distribution)
const fetchApi = vi.hoisted(() => vi.fn())
vi.mock<unknown>(import('@/scripts/api'), () => ({
api: { fetchApi, apiURL: (path: string) => `/api${path}` }
}))
const fetchWithUnifiedRemint = vi.hoisted(() => vi.fn())
vi.mock<unknown>(import('@/platform/auth/unified/remintRetry'), () => ({
vi.mock(import('@/platform/auth/unified/remintRetry'), () => ({
fetchWithUnifiedRemint,
shouldRemintCloudRequest: () => Promise.resolve(false)
}))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ vi.mock<unknown>(import('@/composables/auth/useCurrentUser'), () => ({
})
}))

vi.mock<unknown>(import('@/platform/remoteConfig/remoteConfig'), async () => {
vi.mock(import('@/platform/remoteConfig/remoteConfig'), async () => {
hoisted.refs.remoteConfig = ref<RemoteConfig>({})
return { remoteConfig: hoisted.refs.remoteConfig }
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ vi.mock<unknown>(import('@/composables/useFeatureFlags'), () => ({

const mockReportError = vi.hoisted(() => vi.fn())

vi.mock<unknown>(import('@/platform/telemetry/reportError'), () => ({
vi.mock(import('@/platform/telemetry/reportError'), () => ({
reportError: mockReportError
}))

Expand Down
Loading
Loading