Skip to content

fix: mobile category tree parent categories should allow viewing chil… #1129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 15, 2022
Merged

fix: mobile category tree parent categories should allow viewing chil… #1129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...dules/catalog/category/components/sidebar/MobileCategorySidebar/MobileCategorySidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
:key="category.uid"
:label="category.name"
class="mobile-menu-sidebar__item"
@click="category.children ? navigate(category) : onGoCategoryDown(category)"
@click="category.children && category.children.length > 0 ? onGoCategoryDown(category) : navigate(category)"
/>
</SfList>
</SfSidebar>
Expand Down Expand Up @@ -66,7 +66,7 @@ export default defineComponent({
};

// A category with no child categories can't be entered into - it can only navigated to
const initialHistoryWithSnippedSubcategoryLessTail = initialHistory.value.at(-1)?.children.length
const initialHistoryWithSnippedSubcategoryLessTail = initialHistory.value.at(-1)?.children?.length
? initialHistory.value
: initialHistory.value.slice(0, -1);

Expand Down
20 changes: 12 additions & 8 deletions ...category/components/sidebar/MobileCategorySidebar/__tests__/MobileCategorySidebar.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import userEvent from '@testing-library/user-event';
import { useRoute, useContext, useRouter } from '@nuxtjs/composition-api';
import { render } from '~/test-utils';
import MobileCategorySidebar from '../MobileCategorySidebar.vue';
import { useUiHelpers, useUiState } from '~/composables';
import { useCategoryStore } from '~/modules/catalog/category/stores/category';
import useUiHelpersMock from '~/test-utils/mocks/useUiHelpersMock';
Expand All @@ -12,6 +11,7 @@ import useContextMock from '~/test-utils/mocks/useContext';
import { womanCategoryTreeData, defaultCategoryTreeData } from '~/test-utils/mocks/categoryTreeDataMock';
import useCategoryStoreMock from '~/test-utils/mocks/useCategoryStore';
import { useMobileCategoryTree } from '../logic';
import MobileCategorySidebar from '../MobileCategorySidebar.vue';

jest.mock('~/composables', () => {
const composables = jest.requireActual('~/composables');
Expand Down Expand Up @@ -92,19 +92,21 @@ describe('MobileCategorySidebar.vue', () => {
(useUiHelpers as jest.Mock).mockReturnValue(UiHelpersMock);
(useUiState as jest.Mock).mockReturnValue(uiStateMock);

const categoryTreeData = [...defaultCategoryTreeData];
const onGoCategoryDownMock = jest.fn(() => categoryTreeData.pop());

(useMobileCategoryTree as jest.Mock).mockReturnValue({
currentItems: {
value: defaultCategoryTreeData,
},
onGoCategoryDown: onGoCategoryDownMock,
});

const { getByText } = render(MobileCategorySidebar);
const womenCategory = getByText('Women');

await user.click(womenCategory);

expect(uiStateMock.toggleMobileMenu).toHaveBeenCalledTimes(1);
expect(UiHelpersMock.getCatLink).toHaveBeenCalledWith(defaultCategoryTreeData[0]);
expect(onGoCategoryDownMock).toHaveBeenCalled();
});

it('Should render sub categories when current category is selected and should render "Go back" button.', () => {
Expand Down Expand Up @@ -138,6 +140,9 @@ describe('MobileCategorySidebar.vue', () => {

it('if the user click on a category without children he will be redirected to that category', async () => {
const onGoCategoryDownMock = jest.fn((val) => val);
const UiHelpersMock = useUiHelpersMock();

(useUiHelpers as jest.Mock).mockReturnValue(UiHelpersMock);

(useMobileCategoryTree as jest.Mock).mockReturnValue({
currentItems: {
Expand All @@ -148,11 +153,10 @@ describe('MobileCategorySidebar.vue', () => {

const { getByText } = render(MobileCategorySidebar);

const bagsButton = getByText('Training');
const trainingButton = getByText('Training');

await userEvent.click(bagsButton);
expect(onGoCategoryDownMock).toHaveBeenCalledTimes(1);
expect(onGoCategoryDownMock).toHaveBeenCalledWith(defaultCategoryTreeData[3]);
await userEvent.click(trainingButton);
expect(UiHelpersMock.getCatLink).toHaveBeenCalledWith(defaultCategoryTreeData[3]);
});

it('if the user click on the back arrow (not the go back button) menu will be hidden', async () => {
Expand Down
1 change: 1 addition & 0 deletions packages/theme/test-utils/mocks/categoryTreeDataMock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,7 @@ export const defaultCategoryTreeData = [
url_path: 'training',
url_suffix: '.html',
include_in_menu: 1,
children: [],
},
];

Expand Down