From 4493591f043aa6d9ce8afbc98a49648b9da71dcf Mon Sep 17 00:00:00 2001 From: mnenie <1alexpeshkov@gmail.com> Date: Sat, 31 Aug 2024 14:20:33 +0300 Subject: [PATCH 1/2] fix: todos-to-issue --- .github/workflows/todos-to-issue.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/todos-to-issue.yml b/.github/workflows/todos-to-issue.yml index 0868dc8..114b0be 100644 --- a/.github/workflows/todos-to-issue.yml +++ b/.github/workflows/todos-to-issue.yml @@ -4,7 +4,6 @@ on: push: branches: - 'dev' - - 'master' jobs: todo: From 6b68046cc7981af445ec90698f94050447efb9f5 Mon Sep 17 00:00:00 2001 From: mnenie <1alexpeshkov@gmail.com> Date: Mon, 2 Sep 2024 21:36:12 +0300 Subject: [PATCH 2/2] fix: resolves #49 --- src/pages/__tests__/NotFound.spec.ts | 3 ++- .../layout/ui/header/__tests__/HeaderWelcome.spec.ts | 9 +++++---- src/widgets/layout/ui/header/__tests__/UserMenu.spec.ts | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/pages/__tests__/NotFound.spec.ts b/src/pages/__tests__/NotFound.spec.ts index 99a52d1..708a22b 100644 --- a/src/pages/__tests__/NotFound.spec.ts +++ b/src/pages/__tests__/NotFound.spec.ts @@ -4,6 +4,7 @@ import '@/shared/lib/vitest-utils/cookiesI18n-mock'; import NotFound from '../NotFoundPage.vue'; import { useHead } from '@unhead/vue'; import i18n from '@/shared/lib/i18n'; +import { UiButton } from '@/shared/ui'; vi.mock('@unhead/vue', () => ({ useHead: vi.fn() @@ -35,7 +36,7 @@ describe('tests for NotFoundPage.vue', () => { }); it('should redirect correctly', async () => { - await wrapper.findComponent({ name: 'UiButton' }).trigger('click'); + await wrapper.findComponent(UiButton).trigger('click'); expect(mockRouter.push).toHaveBeenCalledWith({ name: 'boards' }); }); }); diff --git a/src/widgets/layout/ui/header/__tests__/HeaderWelcome.spec.ts b/src/widgets/layout/ui/header/__tests__/HeaderWelcome.spec.ts index 7263a55..0e3a908 100644 --- a/src/widgets/layout/ui/header/__tests__/HeaderWelcome.spec.ts +++ b/src/widgets/layout/ui/header/__tests__/HeaderWelcome.spec.ts @@ -5,6 +5,7 @@ import '@/shared/lib/vitest-utils/cookiesI18n-mock'; import HeaderWelcome from '../HeaderWelcome.vue'; import i18n from '@/shared/lib/i18n'; import { Moon, Sun } from 'lucide-vue-next'; +import { UiButton, UiSelect } from '@/shared/ui'; const mockRouter = { push: vi.fn(), @@ -40,8 +41,8 @@ describe('tests for HeaderWelcome.vue', () => { }); it('should render subcomponents', () => { - expect(wrapper.findComponent({ name: 'UiButton' }).exists()).toBe(true); - expect(wrapper.findComponent({ name: 'UiSelect' }).exists()).toBe(true); + expect(wrapper.findComponent(UiButton).exists()).toBe(true); + expect(wrapper.findComponent(UiSelect).exists()).toBe(true); }); it('should handle mode + icon changing', async () => { @@ -61,14 +62,14 @@ describe('tests for HeaderWelcome.vue', () => { }); it('should redirect correctly to login', async () => { - const loginButton = wrapper.find('.btns').findAllComponents({ name: 'UiButton' }).at(0); + const loginButton = wrapper.find('.btns').findAllComponents(UiButton).at(0); await loginButton.trigger('click'); expect(mockRouter.push).toHaveBeenCalledWith({ name: 'login' }); }); it('should redirect correctly to registration', async () => { - const registrationButton = wrapper.find('.btns').findAllComponents({ name: 'UiButton' }).at(1); + const registrationButton = wrapper.find('.btns').findAllComponents(UiButton).at(1); await registrationButton.trigger('click'); expect(mockRouter.push).toHaveBeenCalledWith({ name: 'registration' }); diff --git a/src/widgets/layout/ui/header/__tests__/UserMenu.spec.ts b/src/widgets/layout/ui/header/__tests__/UserMenu.spec.ts index 202ccf2..a197e4f 100644 --- a/src/widgets/layout/ui/header/__tests__/UserMenu.spec.ts +++ b/src/widgets/layout/ui/header/__tests__/UserMenu.spec.ts @@ -4,7 +4,7 @@ import { nextTick } from 'vue'; import '@/shared/lib/vitest-utils/cookiesI18n-mock'; import i18n from '@/shared/lib/i18n'; import UserMenu from '../UserMenu.vue'; -import { UiDropdownItem } from '@/shared/ui'; +import { UiDropdown, UiDropdownItem } from '@/shared/ui'; const mockRouter = { push: vi.fn(), @@ -30,8 +30,8 @@ describe('tests for UserMenu.vue', () => { }); it('should be render correctly', async () => { - // TODO(@mnenie): change {name: 'Component'} to Component(instance) for (!all tests) -> name - deprecated - await wrapper.findComponent({ name: 'UiDropdown' }).vm.handleDropdown(); + // @ts-expect-error inctance + await wrapper.findComponent(UiDropdown).vm.handleDropdown(); await nextTick(); expect(wrapper.html()).toMatchSnapshot(); });