diff --git a/ee/app/assets/javascripts/boards/constants.js b/ee/app/assets/javascripts/boards/constants.js index baee2d8b2735ee6fa1fd6dbbfda5ca768bfc871a..bd83c2a485d7bc923cc4b64ad9dbf3f21643dc5e 100644 --- a/ee/app/assets/javascripts/boards/constants.js +++ b/ee/app/assets/javascripts/boards/constants.js @@ -46,11 +46,6 @@ export const IterationFilterType = { current: 'Current', }; -export const MilestoneFilterType = { - any: 'Any', - none: 'None', -}; - export const WeightFilterType = { none: 'None', }; diff --git a/spec/frontend/boards/boards_util_spec.js b/spec/frontend/boards/boards_util_spec.js index ab3cf0723574c80763b16fc0667f44fa3b7d8264..3601bf1470363fb050f022ad49539ece812de13d 100644 --- a/spec/frontend/boards/boards_util_spec.js +++ b/spec/frontend/boards/boards_util_spec.js @@ -1,4 +1,5 @@ -import { formatIssueInput, filterVariables } from '~/boards/boards_util'; +import { formatIssueInput, filterVariables, FiltersInfo } from '~/boards/boards_util'; +import { FilterFields } from '~/boards/constants'; describe('formatIssueInput', () => { const issueInput = { @@ -149,4 +150,40 @@ describe('filterVariables', () => { expect(result).toEqual(expected); }); + + it.each([ + [ + 'converts milestone wild card', + { + filters: { + milestoneTitle: 'Started', + }, + expected: { + milestoneWildcardId: 'STARTED', + not: {}, + }, + }, + ], + [ + 'converts assignee wild card', + { + filters: { + assigneeUsername: 'Any', + }, + expected: { + assigneeWildcardId: 'ANY', + not: {}, + }, + }, + ], + ])('%s', (_, { filters, issuableType = 'issue', expected }) => { + const result = filterVariables({ + filters, + issuableType, + filterInfo: FiltersInfo, + filterFields: FilterFields, + }); + + expect(result).toEqual(expected); + }); });