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
31 changes: 18 additions & 13 deletions src/components/TopMenuSection.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,28 @@ const mockData = vi.hoisted(() => ({
setShowConflictRedDot: (_value: boolean) => {}
}))

vi.mock('@/composables/auth/useCurrentUser', () => ({
vi.mock<unknown>(import('@/composables/auth/useCurrentUser'), () => ({
useCurrentUser: () => {
return {
isLoggedIn: computed(() => mockData.isLoggedIn)
}
}
}))

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

vi.mock('@/platform/updates/common/releaseStore', () => ({
vi.mock<unknown>(import('@/platform/updates/common/releaseStore'), () => ({
useReleaseStore: () => ({
shouldShowRedDot: computed(() => true)
})
}))

vi.mock(
'@/workbench/extensions/manager/composables/useConflictAcknowledgment',
vi.mock<unknown>(
import('@/workbench/extensions/manager/composables/useConflictAcknowledgment'),

() => {
const shouldShowConflictRedDot = ref(false)
mockData.setShowConflictRedDot = (value: boolean) => {
Expand All @@ -62,21 +63,25 @@ vi.mock(
}
)

vi.mock('@/workbench/extensions/manager/composables/useManagerState', () => ({
useManagerState: () => ({
shouldShowManagerButtons: computed(() => true),
openManager: vi.fn()
vi.mock<unknown>(
import('@/workbench/extensions/manager/composables/useManagerState'),

() => ({
useManagerState: () => ({
shouldShowManagerButtons: computed(() => true),
openManager: vi.fn()
})
})
}))
)

vi.mock('@/stores/authStore', () => ({
vi.mock<unknown>(import('@/stores/authStore'), () => ({
useAuthStore: vi.fn(() => ({
currentUser: null,
loading: false
}))
}))

vi.mock('@/scripts/app', () => ({
vi.mock<unknown>(import('@/scripts/app'), () => ({
app: {
menu: {
element: document.createElement('div')
Expand All @@ -86,7 +91,7 @@ vi.mock('@/scripts/app', () => ({

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

vi.mock('@/platform/telemetry', () => ({
vi.mock<unknown>(import('@/platform/telemetry'), () => ({
useTelemetry: () => ({
trackUiButtonClicked: mockTrackUiButtonClicked
})
Expand Down
2 changes: 1 addition & 1 deletion src/components/actionbar/BatchCountEdit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import BatchCountEdit from './BatchCountEdit.vue'

const maxBatchCount = 16

vi.mock('@/platform/settings/settingStore', () => ({
vi.mock<unknown>(import('@/platform/settings/settingStore'), () => ({
useSettingStore: () => ({
get: (settingId: string) =>
settingId === 'Comfy.QueueButton.BatchCountLimit' ? maxBatchCount : 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,31 @@ const state = vi.hoisted(() => ({
updateDialog: vi.fn()
}))

vi.mock('@/composables/billing/useBillingContext', async () => {
const { computed } = await import('vue')
return {
useBillingContext: () => ({
canRunWorkflows: mockCanRunWorkflows,
showsSubscribeToRunPrompt: computed(
() => mockIsInitialized.value && !mockCanRunWorkflows.value
),
billingStatus: mockBillingStatus,
subscription: computed(() =>
mockSubscriptionTier.value ? { tier: mockSubscriptionTier.value } : null
),
manageSubscription: state.manageSubscription,
fetchStatus: state.fetchStatus,
fetchBalance: state.fetchBalance
})
vi.mock<unknown>(
import('@/composables/billing/useBillingContext'),
async () => {
const { computed } = await import('vue')
return {
useBillingContext: () => ({
canRunWorkflows: mockCanRunWorkflows,
showsSubscribeToRunPrompt: computed(
() => mockIsInitialized.value && !mockCanRunWorkflows.value
),
billingStatus: mockBillingStatus,
subscription: computed(() =>
mockSubscriptionTier.value
? { tier: mockSubscriptionTier.value }
: null
),
manageSubscription: state.manageSubscription,
fetchStatus: state.fetchStatus,
fetchBalance: state.fetchBalance
})
}
}
})
)

vi.mock('@/composables/useFeatureFlags', () => ({
vi.mock<unknown>(import('@/composables/useFeatureFlags'), () => ({
useFeatureFlags: () => ({
flags: {
get v1PaymentRecovery() {
Expand All @@ -52,48 +57,57 @@ vi.mock('@/composables/useFeatureFlags', () => ({
})
}))

vi.mock('@/composables/useErrorHandling', () => ({
vi.mock<unknown>(import('@/composables/useErrorHandling'), () => ({
useErrorHandling: () => ({ toastErrorHandler: state.toastErrorHandler })
}))

vi.mock('@/platform/workspace/composables/useWorkspaceUI', async () => {
const { computed } = await import('vue')
return {
useWorkspaceUI: () => ({
permissions: computed(() => ({
canManageSubscription: state.canManageSubscription
}))
})
vi.mock<unknown>(
import('@/platform/workspace/composables/useWorkspaceUI'),
async () => {
const { computed } = await import('vue')
return {
useWorkspaceUI: () => ({
permissions: computed(() => ({
canManageSubscription: state.canManageSubscription
}))
})
}
}
})
)

vi.mock('@/services/dialogService', () => ({
vi.mock<unknown>(import('@/services/dialogService'), () => ({
useDialogService: () => ({ showLayoutDialog: state.showLayoutDialog })
}))

vi.mock('@/stores/dialogStore', () => ({
vi.mock<unknown>(import('@/stores/dialogStore'), () => ({
useDialogStore: () => ({
closeDialog: state.closeDialog,
updateDialog: state.updateDialog
})
}))

vi.mock('@/components/actionbar/ComfyRunButton/ComfyQueueButton.vue', () => ({
default: {
name: 'ComfyQueueButton',
props: ['paymentRecoveryLock'],
emits: ['paymentRecoveryClick'],
template:
'<div data-testid="queue-group"><div data-testid="batch-count"/><button data-testid="queue-button" @click="$emit(\'paymentRecoveryClick\')">{{ paymentRecoveryLock === \'owner\' ? \'Update payment to run\' : \'Run\' }}</button><div data-testid="queue-dropdown"/></div>'
}
}))

vi.mock('@/platform/cloud/subscription/components/SubscribeToRun.vue', () => ({
default: {
name: 'SubscribeToRun',
template: '<div data-testid="subscribe-to-run-button" />'
}
}))
vi.mock<unknown>(
import('@/components/actionbar/ComfyRunButton/ComfyQueueButton.vue'),
() => ({
default: {
name: 'ComfyQueueButton',
props: ['paymentRecoveryLock'],
emits: ['paymentRecoveryClick'],
template:
'<div data-testid="queue-group"><div data-testid="batch-count"/><button data-testid="queue-button" @click="$emit(\'paymentRecoveryClick\')">{{ paymentRecoveryLock === \'owner\' ? \'Update payment to run\' : \'Run\' }}</button><div data-testid="queue-dropdown"/></div>'
}
})
)

vi.mock<unknown>(
import('@/platform/cloud/subscription/components/SubscribeToRun.vue'),
() => ({
default: {
name: 'SubscribeToRun',
template: '<div data-testid="subscribe-to-run-button" />'
}
})
)

function renderWrapper() {
return render(CloudRunButtonWrapper)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ import userEvent from '@testing-library/user-event'

import ComfyQueueButton from './ComfyQueueButton.vue'

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

vi.mock('@/platform/telemetry', () => ({
vi.mock(import('@/platform/telemetry'), () => ({
useTelemetry: () => null
}))

vi.mock('@/stores/workspaceStore', () => ({
vi.mock<unknown>(import('@/stores/workspaceStore'), () => ({
useWorkspaceStore: () => ({
shiftDown: false
})
Expand Down
4 changes: 2 additions & 2 deletions src/components/appMode/AppModeToolbar.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ const appModeState = vi.hoisted(() => ({
}))
const enterBuilder = vi.hoisted(() => vi.fn())

vi.mock('@/composables/useAppMode', () => ({
vi.mock<unknown>(import('@/composables/useAppMode'), () => ({
useAppMode: () => ({ enableAppBuilder: appModeState.enableAppBuilder })
}))

vi.mock('@/stores/appModeStore', async () => {
vi.mock<unknown>(import('@/stores/appModeStore'), async () => {
const { computed, reactive } = await import('vue')
return {
useAppModeStore: () =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ import { describe, expect, it, vi } from 'vitest'
import type { ComfyCommandImpl } from '@/stores/commandStore'

// Mock ShortcutsList component
vi.mock('@/components/bottomPanel/tabs/shortcuts/ShortcutsList.vue', () => ({
default: {
name: 'ShortcutsList',
props: ['commands', 'subcategories', 'columns'],
template:
'<div data-testid="shortcuts-list">{{ JSON.stringify(subcategories) }}</div>'
}
}))
vi.mock<unknown>(
import('@/components/bottomPanel/tabs/shortcuts/ShortcutsList.vue'),
() => ({
default: {
name: 'ShortcutsList',
props: ['commands', 'subcategories', 'columns'],
template:
'<div data-testid="shortcuts-list">{{ JSON.stringify(subcategories) }}</div>'
}
})
)

// Mock command store
const mockCommands: ComfyCommandImpl[] = [
Expand Down Expand Up @@ -42,7 +45,7 @@ const mockCommands: ComfyCommandImpl[] = [
}
]

vi.mock('@/stores/commandStore', () => ({
vi.mock<unknown>(import('@/stores/commandStore'), () => ({
useCommandStore: () => ({
commands: mockCommands
})
Expand Down
55 changes: 38 additions & 17 deletions src/components/bottomPanel/tabs/shortcuts/ShortcutsList.test.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,35 @@
import { describe, expect, it, vi } from 'vitest'
import { describe, expect, it } from 'vitest'
import { createI18n } from 'vue-i18n'

import { render, screen } from '@testing-library/vue'

import ShortcutsList from '@/components/bottomPanel/tabs/shortcuts/ShortcutsList.vue'
import type { ComfyCommandImpl } from '@/stores/commandStore'

// Mock vue-i18n
const mockT = vi.fn((key: string) => {
const translations: Record<string, string> = {
'shortcuts.subcategories.workflow': 'Workflow',
'shortcuts.subcategories.node': 'Node',
'shortcuts.subcategories.queue': 'Queue',
'shortcuts.subcategories.view': 'View',
'shortcuts.subcategories.panelControls': 'Panel Controls',
'commands.Workflow_New.label': 'New Blank Workflow'
const i18n = createI18n({
legacy: false,
locale: 'en',
messages: {
en: {
shortcuts: {
subcategories: {
workflow: 'Workflow',
node: 'Node',
queue: 'Queue',
view: 'View',
panelControls: 'Panel Controls'
}
},
commands: {
Workflow_New: { label: 'New Blank Workflow' },
Node_Add: { label: 'Add Node' },
Queue_Clear: { label: 'Clear Queue' },
Special_Keys: { label: 'Special Keys' }
}
}
}
return translations[key] || key
})

vi.mock('vue-i18n', () => ({
useI18n: () => ({
t: mockT
})
}))

describe('ShortcutsList', () => {
const mockCommands: ComfyCommandImpl[] = [
{
Expand Down Expand Up @@ -68,6 +74,9 @@ describe('ShortcutsList', () => {
render(ShortcutsList, {
props: {
subcategories: mockSubcategories
},
global: {
plugins: [i18n]
}
})

Expand All @@ -81,6 +90,9 @@ describe('ShortcutsList', () => {
const { container } = render(ShortcutsList, {
props: {
subcategories: mockSubcategories
},
global: {
plugins: [i18n]
}
})

Expand Down Expand Up @@ -109,6 +121,9 @@ describe('ShortcutsList', () => {
...mockSubcategories,
other: [commandsWithoutKeybinding[3]]
}
},
global: {
plugins: [i18n]
}
})

Expand All @@ -132,6 +147,9 @@ describe('ShortcutsList', () => {
subcategories: {
special: [specialKeyCommand]
}
},
global: {
plugins: [i18n]
}
})

Expand All @@ -149,6 +167,9 @@ describe('ShortcutsList', () => {
subcategories: {
unknown: [mockCommands[0]]
}
},
global: {
plugins: [i18n]
}
})

Expand Down
Loading
Loading