From 8491ca91b7bf577acbfe65f5e05cd4ffe840d8b7 Mon Sep 17 00:00:00 2001 From: Benjamin Lu Date: Fri, 25 Apr 2025 13:13:30 -0400 Subject: [PATCH] Move component tests into the same directory as their component counterparts (#3625) Co-authored-by: Benjamin Lu --- src/components/{__tests__ => }/BrowserTabTitle.spec.ts | 0 .../common/{__tests__ => }/ColorCustomizationSelector.spec.ts | 2 +- src/components/common/{__tests__ => }/EditableText.spec.ts | 2 +- .../common/{__tests__ => }/TreeExplorerTreeNode.spec.ts | 0 src/components/common/{__tests__ => }/UrlInput.test.ts | 2 +- .../{__tests__ => }/ManagerProgressDialogContent.test.ts | 2 +- .../content/error/{__tests__ => }/ReportIssuePanel.spec.ts | 2 +- .../content/manager/{__tests__ => }/PackVersionBadge.test.ts | 4 ++-- .../{__tests__ => }/PackVersionSelectorPopover.test.ts | 2 +- .../manager/button/{__tests__ => }/PackEnableToggle.test.ts | 2 +- .../tabs/{__tests__ => }/DescriptionTabPanel.test.ts | 2 +- .../skeleton/{__tests__ => }/PackCardGridSkeleton.test.ts | 4 ++-- .../content/setting/{__tests__ => }/SettingItem.spec.ts | 2 +- src/components/sidebar/{__tests__ => }/SidebarIcon.spec.ts | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) rename src/components/{__tests__ => }/BrowserTabTitle.spec.ts (100%) rename src/components/common/{__tests__ => }/ColorCustomizationSelector.spec.ts (98%) rename src/components/common/{__tests__ => }/EditableText.spec.ts (97%) rename src/components/common/{__tests__ => }/TreeExplorerTreeNode.spec.ts (100%) rename src/components/common/{__tests__ => }/UrlInput.test.ts (99%) rename src/components/dialog/content/{__tests__ => }/ManagerProgressDialogContent.test.ts (98%) rename src/components/dialog/content/error/{__tests__ => }/ReportIssuePanel.spec.ts (99%) rename src/components/dialog/content/manager/{__tests__ => }/PackVersionBadge.test.ts (97%) rename src/components/dialog/content/manager/{__tests__ => }/PackVersionSelectorPopover.test.ts (98%) rename src/components/dialog/content/manager/button/{__tests__ => }/PackEnableToggle.test.ts (98%) rename src/components/dialog/content/manager/infoPanel/tabs/{__tests__ => }/DescriptionTabPanel.test.ts (98%) rename src/components/dialog/content/manager/skeleton/{__tests__ => }/PackCardGridSkeleton.test.ts (95%) rename src/components/dialog/content/setting/{__tests__ => }/SettingItem.spec.ts (96%) rename src/components/sidebar/{__tests__ => }/SidebarIcon.spec.ts (98%) diff --git a/src/components/__tests__/BrowserTabTitle.spec.ts b/src/components/BrowserTabTitle.spec.ts similarity index 100% rename from src/components/__tests__/BrowserTabTitle.spec.ts rename to src/components/BrowserTabTitle.spec.ts diff --git a/src/components/common/__tests__/ColorCustomizationSelector.spec.ts b/src/components/common/ColorCustomizationSelector.spec.ts similarity index 98% rename from src/components/common/__tests__/ColorCustomizationSelector.spec.ts rename to src/components/common/ColorCustomizationSelector.spec.ts index 60082f568..c98b5c431 100644 --- a/src/components/common/__tests__/ColorCustomizationSelector.spec.ts +++ b/src/components/common/ColorCustomizationSelector.spec.ts @@ -5,7 +5,7 @@ import SelectButton from 'primevue/selectbutton' import { beforeEach, describe, expect, it } from 'vitest' import { createApp, nextTick } from 'vue' -import ColorCustomizationSelector from '../ColorCustomizationSelector.vue' +import ColorCustomizationSelector from './ColorCustomizationSelector.vue' describe('ColorCustomizationSelector', () => { const colorOptions = [ diff --git a/src/components/common/__tests__/EditableText.spec.ts b/src/components/common/EditableText.spec.ts similarity index 97% rename from src/components/common/__tests__/EditableText.spec.ts rename to src/components/common/EditableText.spec.ts index 6e437a7df..2e7b036b5 100644 --- a/src/components/common/__tests__/EditableText.spec.ts +++ b/src/components/common/EditableText.spec.ts @@ -4,7 +4,7 @@ import InputText from 'primevue/inputtext' import { beforeAll, describe, expect, it } from 'vitest' import { createApp } from 'vue' -import EditableText from '../EditableText.vue' +import EditableText from './EditableText.vue' describe('EditableText', () => { beforeAll(() => { diff --git a/src/components/common/__tests__/TreeExplorerTreeNode.spec.ts b/src/components/common/TreeExplorerTreeNode.spec.ts similarity index 100% rename from src/components/common/__tests__/TreeExplorerTreeNode.spec.ts rename to src/components/common/TreeExplorerTreeNode.spec.ts diff --git a/src/components/common/__tests__/UrlInput.test.ts b/src/components/common/UrlInput.test.ts similarity index 99% rename from src/components/common/__tests__/UrlInput.test.ts rename to src/components/common/UrlInput.test.ts index 4fda49643..e3fc81d29 100644 --- a/src/components/common/__tests__/UrlInput.test.ts +++ b/src/components/common/UrlInput.test.ts @@ -6,7 +6,7 @@ import InputText from 'primevue/inputtext' import { beforeEach, describe, expect, it } from 'vitest' import { createApp, nextTick } from 'vue' -import UrlInput from '../UrlInput.vue' +import UrlInput from './UrlInput.vue' describe('UrlInput', () => { beforeEach(() => { diff --git a/src/components/dialog/content/__tests__/ManagerProgressDialogContent.test.ts b/src/components/dialog/content/ManagerProgressDialogContent.test.ts similarity index 98% rename from src/components/dialog/content/__tests__/ManagerProgressDialogContent.test.ts rename to src/components/dialog/content/ManagerProgressDialogContent.test.ts index d985c7465..801c769da 100644 --- a/src/components/dialog/content/__tests__/ManagerProgressDialogContent.test.ts +++ b/src/components/dialog/content/ManagerProgressDialogContent.test.ts @@ -9,7 +9,7 @@ import { createI18n } from 'vue-i18n' import enMessages from '@/locales/en/main.json' -import ManagerProgressDialogContent from '../ManagerProgressDialogContent.vue' +import ManagerProgressDialogContent from './ManagerProgressDialogContent.vue' type ComponentInstance = InstanceType & { lastPanelRef: HTMLElement | null diff --git a/src/components/dialog/content/error/__tests__/ReportIssuePanel.spec.ts b/src/components/dialog/content/error/ReportIssuePanel.spec.ts similarity index 99% rename from src/components/dialog/content/error/__tests__/ReportIssuePanel.spec.ts rename to src/components/dialog/content/error/ReportIssuePanel.spec.ts index 7478a0480..46f8626d6 100644 --- a/src/components/dialog/content/error/__tests__/ReportIssuePanel.spec.ts +++ b/src/components/dialog/content/error/ReportIssuePanel.spec.ts @@ -12,7 +12,7 @@ import { createI18n } from 'vue-i18n' import enMesages from '@/locales/en/main.json' import { IssueReportPanelProps } from '@/types/issueReportTypes' -import ReportIssuePanel from '../ReportIssuePanel.vue' +import ReportIssuePanel from './ReportIssuePanel.vue' const DEFAULT_FIELDS = ['Workflow', 'Logs', 'Settings', 'SystemStats'] const CUSTOM_FIELDS = [ diff --git a/src/components/dialog/content/manager/__tests__/PackVersionBadge.test.ts b/src/components/dialog/content/manager/PackVersionBadge.test.ts similarity index 97% rename from src/components/dialog/content/manager/__tests__/PackVersionBadge.test.ts rename to src/components/dialog/content/manager/PackVersionBadge.test.ts index 2cb5262d7..9d9866373 100644 --- a/src/components/dialog/content/manager/__tests__/PackVersionBadge.test.ts +++ b/src/components/dialog/content/manager/PackVersionBadge.test.ts @@ -9,8 +9,8 @@ import { createI18n } from 'vue-i18n' import enMessages from '@/locales/en/main.json' import { SelectedVersion } from '@/types/comfyManagerTypes' -import PackVersionBadge from '../PackVersionBadge.vue' -import PackVersionSelectorPopover from '../PackVersionSelectorPopover.vue' +import PackVersionBadge from './PackVersionBadge.vue' +import PackVersionSelectorPopover from './PackVersionSelectorPopover.vue' const mockNodePack = { id: 'test-pack', diff --git a/src/components/dialog/content/manager/__tests__/PackVersionSelectorPopover.test.ts b/src/components/dialog/content/manager/PackVersionSelectorPopover.test.ts similarity index 98% rename from src/components/dialog/content/manager/__tests__/PackVersionSelectorPopover.test.ts rename to src/components/dialog/content/manager/PackVersionSelectorPopover.test.ts index d46b823b6..a465d38f7 100644 --- a/src/components/dialog/content/manager/__tests__/PackVersionSelectorPopover.test.ts +++ b/src/components/dialog/content/manager/PackVersionSelectorPopover.test.ts @@ -10,7 +10,7 @@ import { createI18n } from 'vue-i18n' import enMessages from '@/locales/en/main.json' import { SelectedVersion } from '@/types/comfyManagerTypes' -import PackVersionSelectorPopover from '../PackVersionSelectorPopover.vue' +import PackVersionSelectorPopover from './PackVersionSelectorPopover.vue' // Default mock versions for reference const defaultMockVersions = [ diff --git a/src/components/dialog/content/manager/button/__tests__/PackEnableToggle.test.ts b/src/components/dialog/content/manager/button/PackEnableToggle.test.ts similarity index 98% rename from src/components/dialog/content/manager/button/__tests__/PackEnableToggle.test.ts rename to src/components/dialog/content/manager/button/PackEnableToggle.test.ts index df7456798..77299d266 100644 --- a/src/components/dialog/content/manager/button/__tests__/PackEnableToggle.test.ts +++ b/src/components/dialog/content/manager/button/PackEnableToggle.test.ts @@ -9,7 +9,7 @@ import { createI18n } from 'vue-i18n' import enMessages from '@/locales/en/main.json' import { useComfyManagerStore } from '@/stores/comfyManagerStore' -import PackEnableToggle from '../PackEnableToggle.vue' +import PackEnableToggle from './PackEnableToggle.vue' // Mock debounce to execute immediately vi.mock('lodash', () => ({ diff --git a/src/components/dialog/content/manager/infoPanel/tabs/__tests__/DescriptionTabPanel.test.ts b/src/components/dialog/content/manager/infoPanel/tabs/DescriptionTabPanel.test.ts similarity index 98% rename from src/components/dialog/content/manager/infoPanel/tabs/__tests__/DescriptionTabPanel.test.ts rename to src/components/dialog/content/manager/infoPanel/tabs/DescriptionTabPanel.test.ts index 9a92ce46e..fac684a52 100644 --- a/src/components/dialog/content/manager/infoPanel/tabs/__tests__/DescriptionTabPanel.test.ts +++ b/src/components/dialog/content/manager/infoPanel/tabs/DescriptionTabPanel.test.ts @@ -5,7 +5,7 @@ import { createI18n } from 'vue-i18n' import enMessages from '@/locales/en/main.json' import { components } from '@/types/comfyRegistryTypes' -import DescriptionTabPanel from '../DescriptionTabPanel.vue' +import DescriptionTabPanel from './DescriptionTabPanel.vue' const i18n = createI18n({ legacy: false, diff --git a/src/components/dialog/content/manager/skeleton/__tests__/PackCardGridSkeleton.test.ts b/src/components/dialog/content/manager/skeleton/PackCardGridSkeleton.test.ts similarity index 95% rename from src/components/dialog/content/manager/skeleton/__tests__/PackCardGridSkeleton.test.ts rename to src/components/dialog/content/manager/skeleton/PackCardGridSkeleton.test.ts index 5baeff958..4948e79fd 100644 --- a/src/components/dialog/content/manager/skeleton/__tests__/PackCardGridSkeleton.test.ts +++ b/src/components/dialog/content/manager/skeleton/PackCardGridSkeleton.test.ts @@ -7,8 +7,8 @@ import { createI18n } from 'vue-i18n' import enMessages from '@/locales/en/main.json' -import GridSkeleton from '../GridSkeleton.vue' -import PackCardSkeleton from '../PackCardSkeleton.vue' +import GridSkeleton from './GridSkeleton.vue' +import PackCardSkeleton from './PackCardSkeleton.vue' describe('GridSkeleton', () => { const mountComponent = ({ diff --git a/src/components/dialog/content/setting/__tests__/SettingItem.spec.ts b/src/components/dialog/content/setting/SettingItem.spec.ts similarity index 96% rename from src/components/dialog/content/setting/__tests__/SettingItem.spec.ts rename to src/components/dialog/content/setting/SettingItem.spec.ts index dab90f836..22ab1e4df 100644 --- a/src/components/dialog/content/setting/__tests__/SettingItem.spec.ts +++ b/src/components/dialog/content/setting/SettingItem.spec.ts @@ -4,7 +4,7 @@ import PrimeVue from 'primevue/config' import { describe, expect, it, vi } from 'vitest' import { createI18n } from 'vue-i18n' -import SettingItem from '../SettingItem.vue' +import SettingItem from './SettingItem.vue' const i18n = createI18n({ legacy: false, diff --git a/src/components/sidebar/__tests__/SidebarIcon.spec.ts b/src/components/sidebar/SidebarIcon.spec.ts similarity index 98% rename from src/components/sidebar/__tests__/SidebarIcon.spec.ts rename to src/components/sidebar/SidebarIcon.spec.ts index 5a1825c4e..806ce69ca 100644 --- a/src/components/sidebar/__tests__/SidebarIcon.spec.ts +++ b/src/components/sidebar/SidebarIcon.spec.ts @@ -5,7 +5,7 @@ import OverlayBadge from 'primevue/overlaybadge' import Tooltip from 'primevue/tooltip' import { describe, expect, it } from 'vitest' -import SidebarIcon from '../SidebarIcon.vue' +import SidebarIcon from './SidebarIcon.vue' type SidebarIconProps = { icon: string