diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-07 06:08:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-07 06:08:35 +0300 |
commit | 84ac2a3fcdaa8df2c35c54b1738d8e943263d4bb (patch) | |
tree | 47fad9c207aec9b3d8fdd779134bdcae07602a2e /spec | |
parent | 4e4519f1f8ee22cca599a8d9b7f7dbc7a9764052 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
-rw-r--r-- | spec/frontend/boards/components/board_filtered_search_spec.js | 3 | ||||
-rw-r--r-- | spec/frontend/boards/mock_data.js | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/spec/frontend/boards/components/board_filtered_search_spec.js b/spec/frontend/boards/components/board_filtered_search_spec.js index 01dba83dd91..615516b32bd 100644 --- a/spec/frontend/boards/components/board_filtered_search_spec.js +++ b/spec/frontend/boards/components/board_filtered_search_spec.js @@ -116,6 +116,7 @@ describe('BoardFilteredSearch', () => { { type: 'label_name', value: { data: 'label', operator: '=' } }, { type: 'label_name', value: { data: 'label2', operator: '=' } }, { type: 'milestone_title', value: { data: 'New Milestone', operator: '=' } }, + { type: 'types', value: { data: 'INCIDENT', operator: '=' } }, ]; jest.spyOn(urlUtility, 'updateHistory'); findFilteredSearch().vm.$emit('onFilter', mockFilters); @@ -124,7 +125,7 @@ describe('BoardFilteredSearch', () => { title: '', replace: true, url: - 'http://test.host/?author_username=root&label_name[]=label&label_name[]=label2&milestone_title=New+Milestone', + 'http://test.host/?author_username=root&label_name[]=label&label_name[]=label2&milestone_title=New+Milestone&types=INCIDENT', }); }); }); diff --git a/spec/frontend/boards/mock_data.js b/spec/frontend/boards/mock_data.js index d1d00786ad3..21728ec0f59 100644 --- a/spec/frontend/boards/mock_data.js +++ b/spec/frontend/boards/mock_data.js @@ -1,5 +1,6 @@ /* global List */ +import { GlFilteredSearchToken } from '@gitlab/ui'; import { keyBy } from 'lodash'; import Vue from 'vue'; import '~/boards/models/list'; @@ -585,6 +586,18 @@ export const mockTokens = (fetchLabels, fetchAuthors, fetchMilestones) => [ preloadedAuthors: [], }, { + icon: 'issues', + title: __('Type'), + type: 'types', + operators: [{ value: '=', description: 'is' }], + token: GlFilteredSearchToken, + unique: true, + options: [ + { icon: 'issue-type-issue', value: 'ISSUE', title: 'Issue' }, + { icon: 'issue-type-incident', value: 'INCIDENT', title: 'Incident' }, + ], + }, + { icon: 'clock', title: __('Milestone'), symbol: '%', |