diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-14 18:09:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-14 18:09:04 +0300 |
commit | a3dfd311f4660fc81e929058abd6e136ac884ed3 (patch) | |
tree | 4d7087cac6e2ca89df3adea98f92b9eddffa7790 /spec/frontend/packages | |
parent | 7f408a3831590a1f98a1e1a04b63acba8937e36b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/packages')
-rw-r--r-- | spec/frontend/packages/list/components/packages_search_spec.js | 6 | ||||
-rw-r--r-- | spec/frontend/packages/list/utils_spec.js | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/spec/frontend/packages/list/components/packages_search_spec.js b/spec/frontend/packages/list/components/packages_search_spec.js index a5048e7e268..30fad74b493 100644 --- a/spec/frontend/packages/list/components/packages_search_spec.js +++ b/spec/frontend/packages/list/components/packages_search_spec.js @@ -2,7 +2,7 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; import component from '~/packages/list/components/package_search.vue'; import PackageTypeToken from '~/packages/list/components/tokens/package_type_token.vue'; -import getTableHeaders from '~/packages/list/utils'; +import { sortableFields } from '~/packages/list/utils'; import RegistrySearch from '~/vue_shared/components/registry/registry_search.vue'; import UrlSync from '~/vue_shared/components/url_sync.vue'; @@ -60,7 +60,7 @@ describe('Package Search', () => { tokens: expect.arrayContaining([ expect.objectContaining({ token: PackageTypeToken, type: 'type', icon: 'package' }), ]), - sortableFields: getTableHeaders(), + sortableFields: sortableFields(), }); }); @@ -77,7 +77,7 @@ describe('Package Search', () => { tokens: expect.arrayContaining([ expect.objectContaining({ token: PackageTypeToken, type: 'type', icon: 'package' }), ]), - sortableFields: getTableHeaders(isGroupPage), + sortableFields: sortableFields(isGroupPage), }); }); diff --git a/spec/frontend/packages/list/utils_spec.js b/spec/frontend/packages/list/utils_spec.js index 5bcc3784752..4e4f7b8a723 100644 --- a/spec/frontend/packages/list/utils_spec.js +++ b/spec/frontend/packages/list/utils_spec.js @@ -1,6 +1,15 @@ -import { getNewPaginationPage } from '~/packages/list/utils'; +import { SORT_FIELDS } from '~/packages/list/constants'; +import { getNewPaginationPage, sortableFields } from '~/packages/list/utils'; describe('Packages list utils', () => { + describe('sortableFields', () => { + it('returns the correct list when is a project page', () => { + expect(sortableFields()).toEqual(SORT_FIELDS.filter((f) => f.orderBy !== 'project_path')); + }); + it('returns the full list on the group page', () => { + expect(sortableFields(true)).toEqual(SORT_FIELDS); + }); + }); describe('packageTypeDisplay', () => { it('returns the current page when total items exceeds pagniation', () => { expect(getNewPaginationPage(2, 20, 21)).toBe(2); |