diff --git a/src/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts b/src/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts index fced89c51b8..7299d0cb1ee 100644 --- a/src/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts +++ b/src/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts @@ -93,13 +93,7 @@ function renderBaseTerminal(props: Record = {}) { return render(BaseTerminal, { props, global: { - plugins: [getActivePinia()!, i18n], - stubs: { - Button: { - template: '', - props: ['icon', 'severity', 'size'] - } - } + plugins: [getActivePinia()!, i18n] } }) } diff --git a/src/components/common/CustomizationDialog.test.ts b/src/components/common/CustomizationDialog.test.ts index bf163cd1d4b..e4ab252a066 100644 --- a/src/components/common/CustomizationDialog.test.ts +++ b/src/components/common/CustomizationDialog.test.ts @@ -56,14 +56,6 @@ vi.mock( }) ) -vi.mock(import('@/components/ui/button/Button.vue'), () => ({ - default: { - name: 'Button', - template: ``, - emits: ['click'] - } -})) - const i18n = createI18n({ legacy: false, locale: 'en', messages: { en: {} } }) function renderDialog(extraProps: Record = {}) { diff --git a/src/components/dialog/content/subscription/CancelSubscriptionDialogContent.test.ts b/src/components/dialog/content/subscription/CancelSubscriptionDialogContent.test.ts index 46695e61e3d..7894ccb3061 100644 --- a/src/components/dialog/content/subscription/CancelSubscriptionDialogContent.test.ts +++ b/src/components/dialog/content/subscription/CancelSubscriptionDialogContent.test.ts @@ -122,13 +122,7 @@ function renderComponent( return render(CancelSubscriptionDialogContent, { props, global: { - plugins: [i18n], - stubs: { - Button: { - template: '', - props: ['disabled', 'variant', 'size', 'loading'] - } - } + plugins: [i18n] } }) } diff --git a/src/components/error/ErrorOverlay.test.ts b/src/components/error/ErrorOverlay.test.ts index 9f2c26954e7..45ef3e9f24c 100644 --- a/src/components/error/ErrorOverlay.test.ts +++ b/src/components/error/ErrorOverlay.test.ts @@ -95,12 +95,7 @@ function renderOverlay(props: { appMode?: boolean } = {}) { return render(ErrorOverlay, { props, global: { - plugins: [createTestI18n()], - stubs: { - Button: { - template: '' - } - } + plugins: [createTestI18n()] } }) } diff --git a/src/components/hdr/HdrViewerContent.test.ts b/src/components/hdr/HdrViewerContent.test.ts index 76c1d6b4b40..2376a4c0897 100644 --- a/src/components/hdr/HdrViewerContent.test.ts +++ b/src/components/hdr/HdrViewerContent.test.ts @@ -81,7 +81,7 @@ function makeViewer(overrides: Record = {}) { function renderViewer() { return render(HdrViewerContent, { props: { imageUrl: '/api/view?filename=out.exr' }, - global: { plugins: [i18n], stubs: { Button: true } } + global: { plugins: [i18n] } }) } diff --git a/src/components/imagecrop/WidgetImageCrop.test.ts b/src/components/imagecrop/WidgetImageCrop.test.ts index c5dbe1a9fec..b24aa90c11b 100644 --- a/src/components/imagecrop/WidgetImageCrop.test.ts +++ b/src/components/imagecrop/WidgetImageCrop.test.ts @@ -84,12 +84,6 @@ const i18n = createI18n({ } }) -const ButtonStub = defineComponent({ - name: 'Button', - inheritAttrs: false, - template: '' -}) - const Passthrough = defineComponent({ template: '
' }) @@ -144,7 +138,6 @@ function renderWidget( global: { plugins: [i18n], stubs: { - Button: ButtonStub, Select: Passthrough, SelectContent: Passthrough, SelectTrigger: Passthrough, diff --git a/src/components/load3d/Load3D.test.ts b/src/components/load3d/Load3D.test.ts index 01b3038962f..acf33f30b50 100644 --- a/src/components/load3d/Load3D.test.ts +++ b/src/components/load3d/Load3D.test.ts @@ -125,12 +125,6 @@ function renderLoad3D(options: RenderOptions = {}) { ViewerControls: { name: 'ViewerControls', template: '
' - }, - Button: { - name: 'Button', - props: ['ariaLabel'], - template: - '' } }, directives: { diff --git a/src/components/load3d/Load3dViewerContent.test.ts b/src/components/load3d/Load3dViewerContent.test.ts index 16af793ca8c..a0436693329 100644 --- a/src/components/load3d/Load3dViewerContent.test.ts +++ b/src/components/load3d/Load3dViewerContent.test.ts @@ -183,10 +183,6 @@ async function renderViewerContent(options: RenderOptions = {}) { SceneControls: { name: 'SceneControls', template: '
' - }, - Button: { - name: 'Button', - template: '' } } } diff --git a/src/components/maskeditor/dialog/TopBarHeader.test.ts b/src/components/maskeditor/dialog/TopBarHeader.test.ts index f9e728bffa7..ee37dac9d89 100644 --- a/src/components/maskeditor/dialog/TopBarHeader.test.ts +++ b/src/components/maskeditor/dialog/TopBarHeader.test.ts @@ -37,15 +37,6 @@ vi.mock(import('@/composables/maskeditor/useMaskEditorSaver'), () => ({ useMaskEditorSaver: () => mockSaver })) -vi.mock(import('@/components/ui/button/Button.vue'), () => ({ - default: { - name: 'ButtonStub', - props: ['variant', 'disabled'], - template: - '' - } -})) - const i18n = createI18n({ legacy: false, locale: 'en', diff --git a/src/components/painter/WidgetPainter.test.ts b/src/components/painter/WidgetPainter.test.ts index c3ff8949618..19f0bbc86c5 100644 --- a/src/components/painter/WidgetPainter.test.ts +++ b/src/components/painter/WidgetPainter.test.ts @@ -73,12 +73,6 @@ const i18n = createI18n({ } }) -const ButtonStub = defineComponent({ - name: 'Button', - inheritAttrs: false, - template: '' -}) - const SliderStub = defineComponent({ name: 'Slider', props: { @@ -106,7 +100,7 @@ function renderWidget(initialModel = '') { return render(Harness, { global: { plugins: [i18n], - stubs: { Button: ButtonStub, Slider: SliderStub } + stubs: { Slider: SliderStub } } }) } diff --git a/src/components/queue/job/JobContextMenu.test.ts b/src/components/queue/job/JobContextMenu.test.ts index c1b9506002e..db55ea0a2f3 100644 --- a/src/components/queue/job/JobContextMenu.test.ts +++ b/src/components/queue/job/JobContextMenu.test.ts @@ -49,18 +49,6 @@ const popoverStub = defineComponent({ ` }) -const buttonStub = { - props: { - disabled: { type: Boolean, default: false }, - ariaLabel: { type: String, default: undefined } - }, - template: ` - - ` -} - type MenuHandle = { open: (e: Event) => Promise; hide: () => void } const createEntries = (): MenuEntry[] => [ @@ -98,7 +86,7 @@ function renderMenu(entries: MenuEntry[], onAction?: ReturnType) { const { unmount } = render(Wrapper, { props: { onAction: actionSpy }, global: { - stubs: { Popover: popoverStub, Button: buttonStub } + stubs: { Popover: popoverStub } } }) diff --git a/src/components/rightSidePanel/RightSidePanel.test.ts b/src/components/rightSidePanel/RightSidePanel.test.ts index 205ce60dc5e..b7ec1a73847 100644 --- a/src/components/rightSidePanel/RightSidePanel.test.ts +++ b/src/components/rightSidePanel/RightSidePanel.test.ts @@ -43,7 +43,6 @@ function createPanelI18n() { } const panelStubs = { - Button: { template: '' }, EditableText: true, Tab: { template: '' }, TabErrors: true, diff --git a/src/components/rightSidePanel/errors/ErrorNodeCard.test.ts b/src/components/rightSidePanel/errors/ErrorNodeCard.test.ts index ce642bf206b..f7ac488754a 100644 --- a/src/components/rightSidePanel/errors/ErrorNodeCard.test.ts +++ b/src/components/rightSidePanel/errors/ErrorNodeCard.test.ts @@ -112,10 +112,7 @@ describe('ErrorNodeCard.vue', () => { global: { plugins: [PrimeVue, i18n, getActivePinia()!], stubs: { - TransitionCollapse: { template: '
' }, - Button: { - template: '' - } + TransitionCollapse: { template: '
' } } } }) diff --git a/src/components/rightSidePanel/errors/TabErrors.test.ts b/src/components/rightSidePanel/errors/TabErrors.test.ts index 6a2c7bdba98..1bff74e4f18 100644 --- a/src/components/rightSidePanel/errors/TabErrors.test.ts +++ b/src/components/rightSidePanel/errors/TabErrors.test.ts @@ -160,9 +160,6 @@ describe('TabErrors.vue', () => { AsyncSearchInput: { template: '' - }, - Button: { - template: '' } } } diff --git a/src/components/rightSidePanel/parameters/SectionWidgets.test.ts b/src/components/rightSidePanel/parameters/SectionWidgets.test.ts index 7504bea5561..4db1b27d86d 100644 --- a/src/components/rightSidePanel/parameters/SectionWidgets.test.ts +++ b/src/components/rightSidePanel/parameters/SectionWidgets.test.ts @@ -141,7 +141,6 @@ describe('SectionWidgets', () => { global: { plugins: [i18n], stubs: { - Button: true, WidgetItem: WidgetItemStub, PropertiesAccordionItem: PropertiesAccordionItemStub } diff --git a/src/components/sidebar/tabs/AssetsSidebarTab.test.ts b/src/components/sidebar/tabs/AssetsSidebarTab.test.ts index e440b42a884..8815d646e2c 100644 --- a/src/components/sidebar/tabs/AssetsSidebarTab.test.ts +++ b/src/components/sidebar/tabs/AssetsSidebarTab.test.ts @@ -134,10 +134,6 @@ const assetsGridStub = { ` } -const buttonStub = { - template: '' -} - function renderTab() { return render(AssetsSidebarTab, { global: { @@ -149,7 +145,6 @@ function renderTab() { SidebarTabTemplate: sidebarTabTemplateStub, AssetsSidebarGridView: assetsGridStub, AssetsSidebarListView: true, - Button: buttonStub, MediaAssetFilterBar: true, MediaAssetSelectionBar: true, MediaLightbox: true, diff --git a/src/components/sidebar/tabs/BaseWorkflowsSidebarTab.test.ts b/src/components/sidebar/tabs/BaseWorkflowsSidebarTab.test.ts index 20ef1d0f84f..9dca6fedc75 100644 --- a/src/components/sidebar/tabs/BaseWorkflowsSidebarTab.test.ts +++ b/src/components/sidebar/tabs/BaseWorkflowsSidebarTab.test.ts @@ -171,10 +171,6 @@ vi.mock( }) ) -vi.mock(import('@/components/ui/button/Button.vue'), () => ({ - default: { name: 'Button', template: '' } -})) - vi.mock(import('@/composables/useTreeExpansion'), () => ({ useTreeExpansion: () => ({ expandNode: mockExpandNode, diff --git a/src/components/topbar/WorkflowTab.test.ts b/src/components/topbar/WorkflowTab.test.ts index e648c70a72a..defa5b31f76 100644 --- a/src/components/topbar/WorkflowTab.test.ts +++ b/src/components/topbar/WorkflowTab.test.ts @@ -130,10 +130,7 @@ function renderTab({ global: { plugins: [i18n], stubs: { - WorkflowActionsList: true, - Button: { - template: '' - } + WorkflowActionsList: true } }, props: { diff --git a/src/components/videoEdit/VideoEditPanel.test.ts b/src/components/videoEdit/VideoEditPanel.test.ts index 1066b429d4c..920674b962f 100644 --- a/src/components/videoEdit/VideoEditPanel.test.ts +++ b/src/components/videoEdit/VideoEditPanel.test.ts @@ -103,8 +103,7 @@ function renderPanel(props: Partial = {}) { SelectTrigger: stub('stub-select-trigger'), SelectValue: stub('stub-select-value'), SelectContent: stub('stub-select-content'), - SelectItem: stub('stub-select-item'), - Button: stub('stub-lock-button') + SelectItem: stub('stub-select-item') } } }) diff --git a/src/platform/assets/components/AssetCard.test.ts b/src/platform/assets/components/AssetCard.test.ts index b55b5da6c02..54e886ea8ec 100644 --- a/src/platform/assets/components/AssetCard.test.ts +++ b/src/platform/assets/components/AssetCard.test.ts @@ -57,8 +57,7 @@ function renderCard(asset: AssetDisplayItem) { AssetBadgeGroup: true, IconGroup: true, MoreButton: true, - StatusBadge: true, - Button: { template: '' } + StatusBadge: true }, directives: { tooltip: {} diff --git a/src/platform/assets/components/MediaAssetContextMenu.test.ts b/src/platform/assets/components/MediaAssetContextMenu.test.ts index a61b974482e..4ffc4a9bdf1 100644 --- a/src/platform/assets/components/MediaAssetContextMenu.test.ts +++ b/src/platform/assets/components/MediaAssetContextMenu.test.ts @@ -100,10 +100,6 @@ const asset: AssetItem = fromPartial({ user_metadata: {} }) -const buttonStub = { - template: '
' -} - interface MediaAssetContextMenuExposed { show: (event: MouseEvent) => void } @@ -129,8 +125,7 @@ function mountComponent(targetAsset: AssetItem = asset) { global: { plugins: [i18n], stubs: { - ContextMenu: contextMenuStub, - Button: buttonStub + ContextMenu: contextMenuStub } } } diff --git a/src/platform/cloud/subscription/components/CreditsTile.test.ts b/src/platform/cloud/subscription/components/CreditsTile.test.ts index 3b400fe7043..5ce87ba03f7 100644 --- a/src/platform/cloud/subscription/components/CreditsTile.test.ts +++ b/src/platform/cloud/subscription/components/CreditsTile.test.ts @@ -171,12 +171,6 @@ function renderTile(props: Record = {}) { plugins: [i18n], directives: { tooltip: () => {} }, stubs: { - Button: { - template: - '', - props: ['variant', 'size', 'loading'], - emits: ['click'] - }, Skeleton: { template: '
' } } } @@ -576,7 +570,10 @@ describe('CreditsTile', () => { "You're now spending additional credits." ) expect(screen.getByText('In use')).toBeTruthy() - expect(screen.getByText('Add credits').dataset.variant).toBe('secondary') + expect(screen.getByRole('button', { name: 'Add credits' })).toHaveClass( + 'bg-interface-menu-component-surface-selected', + 'hover:bg-secondary-background-hover' + ) }) it('emphasizes add-credits when fully out of credits', () => { @@ -594,7 +591,9 @@ describe('CreditsTile', () => { 'Add more credits to continue generating.' ) expect(screen.queryByText('In use')).toBeNull() - expect(screen.getByText('Add credits').dataset.variant).toBe('inverted') + expect(screen.getByRole('button', { name: 'Add credits' })).toHaveClass( + 'bg-base-foreground' + ) }) it('suppresses the depletion notice until the balance has loaded', () => { diff --git a/src/platform/cloud/subscription/components/SubscriptionFooterLinks.test.ts b/src/platform/cloud/subscription/components/SubscriptionFooterLinks.test.ts index 3db2cd43d6f..7dfa8faca7c 100644 --- a/src/platform/cloud/subscription/components/SubscriptionFooterLinks.test.ts +++ b/src/platform/cloud/subscription/components/SubscriptionFooterLinks.test.ts @@ -61,14 +61,7 @@ function renderComponent( return render(SubscriptionFooterLinks, { props, global: { - plugins: [i18n], - stubs: { - Button: { - props: ['loading'], - emits: ['click'], - template: '' - } - } + plugins: [i18n] } }) } diff --git a/src/platform/secrets/components/SecretFormDialog.test.ts b/src/platform/secrets/components/SecretFormDialog.test.ts index 703939bb819..a73232b85c1 100644 --- a/src/platform/secrets/components/SecretFormDialog.test.ts +++ b/src/platform/secrets/components/SecretFormDialog.test.ts @@ -43,10 +43,6 @@ vi.mock( }) ) -vi.mock(import('@/components/ui/button/Button.vue'), () => ({ - default: { name: 'Button', template: '' } -})) - vi.mock(import('@/components/ui/select/Select.vue'), () => ({ default: { name: 'Select', template: '
' } })) diff --git a/src/platform/secrets/components/SecretFormDialog.zindex.test.ts b/src/platform/secrets/components/SecretFormDialog.zindex.test.ts index a19cfad4132..803f0c73282 100644 --- a/src/platform/secrets/components/SecretFormDialog.zindex.test.ts +++ b/src/platform/secrets/components/SecretFormDialog.zindex.test.ts @@ -35,9 +35,6 @@ vi.mock(import('primevue/password'), () => ({ default: { name: 'Password', template: '' } })) -vi.mock(import('@/components/ui/button/Button.vue'), () => ({ - default: { name: 'Button', template: '' } -})) vi.mock(import('@/components/ui/select/Select.vue'), () => ({ default: { name: 'Select', template: '
' } })) diff --git a/src/platform/secrets/components/SecretListItem.test.ts b/src/platform/secrets/components/SecretListItem.test.ts index 59a3e19f5d3..025799f1a7a 100644 --- a/src/platform/secrets/components/SecretListItem.test.ts +++ b/src/platform/secrets/components/SecretListItem.test.ts @@ -60,13 +60,6 @@ function renderComponent(props: { props, global: { plugins: [i18n], - stubs: { - Button: { - template: - '', - props: ['disabled', 'variant', 'size', 'aria-label'] - } - }, directives: { tooltip: () => {} } diff --git a/src/platform/secrets/components/SecretsPanel.test.ts b/src/platform/secrets/components/SecretsPanel.test.ts index 2dc495942c9..9c4786acc46 100644 --- a/src/platform/secrets/components/SecretsPanel.test.ts +++ b/src/platform/secrets/components/SecretsPanel.test.ts @@ -91,11 +91,6 @@ function renderPanel() { TabPanel: { template: '
' }, Divider: true, ProgressSpinner: true, - Button: { - template: - '', - props: ['disabled'] - }, SecretListItem: { template: '', diff --git a/src/platform/workflow/sharing/components/publish/ComfyHubDescribeStep.test.ts b/src/platform/workflow/sharing/components/publish/ComfyHubDescribeStep.test.ts index 4e687bc6b3d..a9c81f26a34 100644 --- a/src/platform/workflow/sharing/components/publish/ComfyHubDescribeStep.test.ts +++ b/src/platform/workflow/sharing/components/publish/ComfyHubDescribeStep.test.ts @@ -73,10 +73,6 @@ function renderStep( }, TagsInputInput: { template: '' - }, - Button: { - template: - '' } } } @@ -187,7 +183,9 @@ describe('ComfyHubDescribeStep', () => { expect(defaultSuggestions).toHaveLength(10) expect(container.textContent).toContain('comfyHubPublish.showMoreTags') - await userEvent.click(screen.getByTestId('toggle-suggestions')) + await userEvent.click( + screen.getByRole('button', { name: 'comfyHubPublish.showMoreTags' }) + ) await nextTick() // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access diff --git a/src/platform/workflow/sharing/components/publish/ComfyHubPublishFooter.test.ts b/src/platform/workflow/sharing/components/publish/ComfyHubPublishFooter.test.ts index 3f8ee79b273..24ae7cede3a 100644 --- a/src/platform/workflow/sharing/components/publish/ComfyHubPublishFooter.test.ts +++ b/src/platform/workflow/sharing/components/publish/ComfyHubPublishFooter.test.ts @@ -7,12 +7,7 @@ function renderFooter(props: Record = {}) { return render(ComfyHubPublishFooter, { props: { isFirstStep: false, isLastStep: true, ...props }, global: { - mocks: { $t: (key: string) => key }, - stubs: { - Button: { - template: '' - } - } + mocks: { $t: (key: string) => key } } }) } diff --git a/src/platform/workflow/sharing/components/publish/ComfyHubThumbnailStep.test.ts b/src/platform/workflow/sharing/components/publish/ComfyHubThumbnailStep.test.ts index 9f848c45958..21783109dfb 100644 --- a/src/platform/workflow/sharing/components/publish/ComfyHubThumbnailStep.test.ts +++ b/src/platform/workflow/sharing/components/publish/ComfyHubThumbnailStep.test.ts @@ -49,11 +49,7 @@ function renderStep( template: '
' }, - ToggleGroupItem: { template: '
', props: ['value'] }, - Button: { - template: - '' - } + ToggleGroupItem: { template: '
', props: ['value'] } } } }) @@ -231,7 +227,7 @@ describe('ComfyHubThumbnailStep', () => { } ) - await user.click(screen.getByTestId('clear-button')) + await user.click(screen.getByRole('button', { name: 'Clear' })) expect(onUpdateThumbnailFile).toHaveBeenCalledWith(null) expect(onUpdateThumbnailUrl).toHaveBeenCalledWith(null) @@ -258,7 +254,7 @@ describe('ComfyHubThumbnailStep', () => { } ) - await user.click(screen.getByTestId('clear-button')) + await user.click(screen.getByRole('button', { name: 'Clear' })) expect(onUpdateThumbnailUrl).toHaveBeenCalledWith(null) expect(onUpdateComparisonAfterUrl).toHaveBeenCalledWith(null) diff --git a/src/platform/workspace/components/SubscriptionAddPaymentPreviewWorkspace.test.ts b/src/platform/workspace/components/SubscriptionAddPaymentPreviewWorkspace.test.ts index 5e042d38a02..6612634171f 100644 --- a/src/platform/workspace/components/SubscriptionAddPaymentPreviewWorkspace.test.ts +++ b/src/platform/workspace/components/SubscriptionAddPaymentPreviewWorkspace.test.ts @@ -65,10 +65,7 @@ const i18n = createI18n({ const globalOptions = { plugins: [i18n], stubs: { - 'i18n-t': { template: '' }, - Button: { - template: '' - } + 'i18n-t': { template: '' } } } @@ -487,17 +484,7 @@ describe('SubscriptionAddPaymentPreviewWorkspace', () => { it('owns a back action whether or not the payment element is embedded', async () => { const { emitted } = render(SubscriptionAddPaymentPreviewWorkspace, { props: { tierKey: 'creator' }, - global: { - ...globalOptions, - stubs: { - ...globalOptions.stubs, - Button: { - props: ['ariaLabel'], - template: - '' - } - } - } + global: globalOptions }) await userEvent.click(screen.getByRole('button', { name: 'g.back' })) diff --git a/src/platform/workspace/components/SubscriptionPanelContentWorkspace.test.ts b/src/platform/workspace/components/SubscriptionPanelContentWorkspace.test.ts index 46ef7dc2fa3..498596f933d 100644 --- a/src/platform/workspace/components/SubscriptionPanelContentWorkspace.test.ts +++ b/src/platform/workspace/components/SubscriptionPanelContentWorkspace.test.ts @@ -247,13 +247,6 @@ const CreditsTileStub = { '
' } -const ButtonStub = { - template: - '', - props: ['variant', 'size', 'loading'], - emits: ['click'] -} - const SubscriptionFooterLinksStub = { props: ['showInvoiceHistory'], template: @@ -278,7 +271,6 @@ function renderComponent({ stubFooter = true } = {}) { directives: { tooltip: {} }, stubs: { CreditsTile: CreditsTileStub, - Button: ButtonStub, ...(stubFooter ? { SubscriptionFooterLinks: SubscriptionFooterLinksStub } : {}), diff --git a/src/platform/workspace/components/SubscriptionSuccessWorkspace.test.ts b/src/platform/workspace/components/SubscriptionSuccessWorkspace.test.ts index 54d9334ce1a..fbdc236bb11 100644 --- a/src/platform/workspace/components/SubscriptionSuccessWorkspace.test.ts +++ b/src/platform/workspace/components/SubscriptionSuccessWorkspace.test.ts @@ -80,11 +80,6 @@ const TEAM_STOP = { discountedUsd: 630 } -const ButtonStub = { - emits: ['click'], - template: '' -} - function createTestI18n() { return createI18n({ legacy: false, locale: 'en', messages: { en: {} } }) } @@ -99,10 +94,7 @@ function renderCard(props: Record = {}) { ...props }, global: { - plugins: [createTestI18n()], - stubs: { - Button: ButtonStub - } + plugins: [createTestI18n()] } }) } @@ -157,10 +149,7 @@ describe('SubscriptionSuccessWorkspace', () => { previewData: makePreviewData(33_600, 'ANNUAL') }, global: { - plugins: [createTestI18n()], - stubs: { - Button: ButtonStub - } + plugins: [createTestI18n()] } }) expect(screen.getByText('$336')).toBeTruthy() @@ -176,12 +165,7 @@ describe('SubscriptionSuccessWorkspace', () => { previewData: makePreviewData(3_500, 'MONTHLY') }, global: { - plugins: [createTestI18n()], - stubs: { - Button: { - template: '' - } - } + plugins: [createTestI18n()] } }) expect(screen.getByText('$35')).toBeTruthy() diff --git a/src/platform/workspace/components/SubscriptionTransitionPreviewWorkspace.test.ts b/src/platform/workspace/components/SubscriptionTransitionPreviewWorkspace.test.ts index d6b52bd4ee2..26a797a69e8 100644 --- a/src/platform/workspace/components/SubscriptionTransitionPreviewWorkspace.test.ts +++ b/src/platform/workspace/components/SubscriptionTransitionPreviewWorkspace.test.ts @@ -39,8 +39,7 @@ const i18n = createI18n({ const globalOptions = { plugins: [i18n], stubs: { - SubscriptionTermsNote: { template: '
' }, - Button: { template: '' } + SubscriptionTermsNote: { template: '
' } } } diff --git a/src/platform/workspace/components/dialogs/TeamWorkspacesDialogContent.test.ts b/src/platform/workspace/components/dialogs/TeamWorkspacesDialogContent.test.ts index 14dbec6093a..ef1915a5906 100644 --- a/src/platform/workspace/components/dialogs/TeamWorkspacesDialogContent.test.ts +++ b/src/platform/workspace/components/dialogs/TeamWorkspacesDialogContent.test.ts @@ -55,13 +55,6 @@ const i18n = createI18n({ fallbackWarn: false }) -const ButtonStub = { - name: 'Button', - template: - '', - props: ['disabled', 'loading', 'variant', 'size'] -} - function mountComponent(props: Record = {}) { const user = userEvent.setup() const { container } = render(TeamWorkspacesDialogContent, { @@ -69,7 +62,6 @@ function mountComponent(props: Record = {}) { global: { plugins: [pinia, i18n], stubs: { - Button: ButtonStub, WorkspaceProfilePic: true } } @@ -361,7 +353,7 @@ describe('TeamWorkspacesDialogContent', () => { await typeAndCreate(container, user, 'New Team') - expect(findCreateButton(container).dataset.loading).toBe('false') + expect(findCreateButton(container)).not.toHaveAttribute('aria-busy') }) it('resets loading state after onConfirm fails', async () => { @@ -377,7 +369,7 @@ describe('TeamWorkspacesDialogContent', () => { await typeAndCreate(container, user, 'New Team') - expect(findCreateButton(container).dataset.loading).toBe('false') + expect(findCreateButton(container)).not.toHaveAttribute('aria-busy') }) }) diff --git a/src/platform/workspace/components/dialogs/settings/BillingStatusBanner.test.ts b/src/platform/workspace/components/dialogs/settings/BillingStatusBanner.test.ts index 749cbd3cfca..4018cd96be9 100644 --- a/src/platform/workspace/components/dialogs/settings/BillingStatusBanner.test.ts +++ b/src/platform/workspace/components/dialogs/settings/BillingStatusBanner.test.ts @@ -150,15 +150,7 @@ const i18n = createI18n({ }) const globalOptions = { - plugins: [i18n], - stubs: { - Button: { - template: - '', - props: ['variant', 'size', 'loading'], - emits: ['click'] - } - } + plugins: [i18n] } function renderBanner() { diff --git a/src/platform/workspace/components/dialogs/settings/MembersPanelContent.test.ts b/src/platform/workspace/components/dialogs/settings/MembersPanelContent.test.ts index db60b56ceea..bc1b1207c46 100644 --- a/src/platform/workspace/components/dialogs/settings/MembersPanelContent.test.ts +++ b/src/platform/workspace/components/dialogs/settings/MembersPanelContent.test.ts @@ -171,13 +171,6 @@ const i18n = createI18n({ fallbackWarn: false }) -const ButtonStub = { - name: 'Button', - template: - '', - props: ['disabled', 'loading', 'variant', 'size', 'ariaLabel'] -} - const SearchInputStub = { name: 'SearchInput', template: @@ -191,7 +184,6 @@ function renderComponent() { global: { plugins: [i18n], stubs: { - Button: ButtonStub, SearchInput: SearchInputStub, UserAvatar: true, WorkspaceMenuButton: true diff --git a/src/platform/workspace/components/dialogs/settings/WorkspaceMenuButton.test.ts b/src/platform/workspace/components/dialogs/settings/WorkspaceMenuButton.test.ts index f7ae67257f2..2e43e445cdd 100644 --- a/src/platform/workspace/components/dialogs/settings/WorkspaceMenuButton.test.ts +++ b/src/platform/workspace/components/dialogs/settings/WorkspaceMenuButton.test.ts @@ -63,7 +63,7 @@ function renderComponent() { global: { plugins: [i18n], directives: { tooltip: {} }, - stubs: { DropdownMenu: DropdownMenuStub, Button: true } + stubs: { DropdownMenu: DropdownMenuStub } } }) } diff --git a/src/renderer/extensions/compositor/components/WidgetCompositor.test.ts b/src/renderer/extensions/compositor/components/WidgetCompositor.test.ts index ddd73507935..1440bac0aa0 100644 --- a/src/renderer/extensions/compositor/components/WidgetCompositor.test.ts +++ b/src/renderer/extensions/compositor/components/WidgetCompositor.test.ts @@ -57,10 +57,7 @@ function renderWidget() { return render(WidgetCompositor, { props: { nodeId }, global: { - plugins: [i18n], - stubs: { - Button: { template: '' } - } + plugins: [i18n] } }) } diff --git a/src/renderer/extensions/vueNodes/widgets/components/BatchNavigation.test.ts b/src/renderer/extensions/vueNodes/widgets/components/BatchNavigation.test.ts index 41474473b23..766fbfd7283 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/BatchNavigation.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/components/BatchNavigation.test.ts @@ -12,13 +12,6 @@ const i18n = createI18n({ messages: { en: { batch: { index: '{current} / {total}' } } } }) -const ButtonStub = defineComponent({ - inheritAttrs: false, - props: { disabled: { type: Boolean, default: false } }, - template: - '' -}) - function renderBatch(count: number, initialIndex = 0) { const index = ref(initialIndex) const Harness = defineComponent({ @@ -27,7 +20,7 @@ function renderBatch(count: number, initialIndex = 0) { template: '' }) const utils = render(Harness, { - global: { plugins: [i18n], stubs: { Button: ButtonStub } } + global: { plugins: [i18n] } }) return { ...utils, index } } diff --git a/src/renderer/extensions/vueNodes/widgets/components/ValueControlPopover.test.ts b/src/renderer/extensions/vueNodes/widgets/components/ValueControlPopover.test.ts index f72330fceca..8ad38f8722e 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/ValueControlPopover.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/components/ValueControlPopover.test.ts @@ -47,13 +47,6 @@ const i18n = createI18n({ } }) -const ButtonStub = defineComponent({ - name: 'Button', - inheritAttrs: false, - props: { as: { type: String, default: 'button' } }, - template: '' -}) - function renderPopover(modelValue: ControlOptions = 'randomize') { const value = ref(modelValue) const Harness = defineComponent({ @@ -63,8 +56,7 @@ function renderPopover(modelValue: ControlOptions = 'randomize') { }) const utils = render(Harness, { global: { - plugins: [PrimeVue, i18n], - stubs: { Button: ButtonStub } + plugins: [PrimeVue, i18n] } }) return { ...utils, value } diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetButton.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetButton.test.ts index 9be7e87d1c4..6ae7b6d6481 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/WidgetButton.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetButton.test.ts @@ -19,13 +19,6 @@ const BUTTON_DEFAULTS = { name: 'test_button' } as const -const ButtonStub = { - name: 'Button', - props: ['size', 'variant', 'disabled'], - template: - '' -} - describe('WidgetButton Interactions', () => { const createButtonWidget = ( overrides: Partial> = {} @@ -34,11 +27,6 @@ describe('WidgetButton Interactions', () => { const mountComponent = (widget: SimplifiedWidget) => { const user = userEvent.setup() const result = render(WidgetButton, { - global: { - stubs: { - Button: ButtonStub - } - }, props: { widget } @@ -104,7 +92,7 @@ describe('WidgetButton Interactions', () => { const widget = createButtonWidget() mountComponent(widget) - expect(screen.getByRole('button').getAttribute('data-size')).toBe('sm') + expect(screen.getByRole('button')).toHaveClass('h-6', 'rounded-sm') }) it('passes widget options to button component', () => { @@ -113,8 +101,8 @@ describe('WidgetButton Interactions', () => { }) mountComponent(widget) - expect(screen.getByRole('button').getAttribute('data-variant')).toBe( - 'secondary' + expect(screen.getByRole('button')).toHaveClass( + 'hover:bg-secondary-background-hover' ) }) }) @@ -153,16 +141,19 @@ describe('WidgetButton Interactions', () => { expect(container.querySelector('i.pi.pi-save')).not.toBeNull() }) - it.for(['secondary', 'primary', 'inverted', 'textonly'] as const)( - 'handles button variant: %s', - (variant) => { - const widget = createButtonWidget({ options: { variant } }) - mountComponent(widget) - expect(screen.getByRole('button').getAttribute('data-variant')).toBe( - variant - ) - } - ) + it.for([ + ['secondary', 'hover:bg-secondary-background-hover'], + ['primary', 'hover:bg-primary-background-hover'], + ['inverted', 'hover:bg-base-foreground/80'], + ['textonly', 'hover:bg-secondary-background-hover'] + ] as const)('handles button variant: %s', ([variant, hoverClass]) => { + const widget = createButtonWidget({ options: { variant } }) + mountComponent(widget) + expect(screen.getByRole('button')).toHaveClass( + 'bg-component-node-widget-background', + hoverClass + ) + }) }) describe('Edge Cases', () => { diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuActions.test.ts b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuActions.test.ts index 21b92a0b8df..14cca0402d0 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuActions.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuActions.test.ts @@ -22,11 +22,6 @@ const i18n = createI18n({ const popoverHide = vi.fn() -const ButtonStub = defineComponent({ - inheritAttrs: false, - template: '' -}) - const PopoverStub = defineComponent({ inheritAttrs: false, data() { @@ -126,7 +121,7 @@ function renderMenu(props: MenuProps = {}) { const utils = render(Harness, { global: { plugins: [i18n], - stubs: { Button: ButtonStub, Popover: PopoverStub } + stubs: { Popover: PopoverStub } } }) return { diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuFilter.test.ts b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuFilter.test.ts index 6593c694786..3c41398b6cc 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuFilter.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuFilter.test.ts @@ -40,11 +40,6 @@ const i18n = createI18n({ messages: { en: { g: { import: 'Import', upload: 'Upload' } } } }) -const ButtonStub = { - inheritAttrs: false, - template: '' -} - const options: FilterOption[] = [ { value: 'all', name: 'All' }, { value: 'mine', name: 'Mine' }, @@ -68,8 +63,7 @@ function renderMenu( }) const utils = render(Harness, { global: { - plugins: [i18n], - stubs: { Button: ButtonStub } + plugins: [i18n] } }) return { ...utils, value, onShowPicker } diff --git a/src/workbench/extensions/manager/components/manager/NodeConflictDialogContent.test.ts b/src/workbench/extensions/manager/components/manager/NodeConflictDialogContent.test.ts index d5ee13080ff..2f11993e135 100644 --- a/src/workbench/extensions/manager/components/manager/NodeConflictDialogContent.test.ts +++ b/src/workbench/extensions/manager/components/manager/NodeConflictDialogContent.test.ts @@ -55,8 +55,7 @@ describe('NodeConflictDialogContent', () => { global: { plugins: [pinia, i18n], stubs: { - ContentDivider: true, - Button: { template: '' } + ContentDivider: true } } })