Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/frontend/issues_list/mock_data.js b/spec/frontend/issues_list/mock_data.js
index eede806c42f..d6a23c4dcff 100644
--- a/spec/frontend/issues_list/mock_data.js
+++ b/spec/frontend/issues_list/mock_data.js
@@ -16,6 +16,8 @@ export const locationSearch = [
   'confidential=no',
   'iteration_title=season:+%234',
   'not[iteration_title]=season:+%2320',
+  'epic_id=12',
+  'not[epic_id]=34',
   'weight=1',
   'not[weight]=3',
 ].join('&');
@@ -24,6 +26,7 @@ export const locationSearchWithSpecialValues = [
   'assignee_id=None',
   'my_reaction_emoji=None',
   'iteration_id=Current',
+  'epic_id=None',
   'weight=None',
 ].join('&');
 
@@ -42,6 +45,8 @@ export const filteredTokens = [
   { type: 'confidential', value: { data: 'no', operator: OPERATOR_IS } },
   { type: 'iteration', value: { data: 'season: #4', operator: OPERATOR_IS } },
   { type: 'iteration', value: { data: 'season: #20', operator: OPERATOR_IS_NOT } },
+  { type: 'epic_id', value: { data: '12', operator: OPERATOR_IS } },
+  { type: 'epic_id', value: { data: '34', operator: OPERATOR_IS_NOT } },
   { type: 'weight', value: { data: '1', operator: OPERATOR_IS } },
   { type: 'weight', value: { data: '3', operator: OPERATOR_IS_NOT } },
   { type: 'filtered-search-term', value: { data: 'find' } },
@@ -52,6 +57,7 @@ export const filteredTokensWithSpecialValues = [
   { type: 'assignee_username', value: { data: 'None', operator: OPERATOR_IS } },
   { type: 'my_reaction_emoji', value: { data: 'None', operator: OPERATOR_IS } },
   { type: 'iteration', value: { data: 'Current', operator: OPERATOR_IS } },
+  { type: 'epic_id', value: { data: 'None', operator: OPERATOR_IS } },
   { type: 'weight', value: { data: 'None', operator: OPERATOR_IS } },
 ];
 
@@ -68,6 +74,8 @@ export const apiParams = {
   confidential: 'no',
   iteration_title: 'season: #4',
   'not[iteration_title]': 'season: #20',
+  epic_id: '12',
+  'not[epic_id]': '34',
   weight: '1',
   'not[weight]': '3',
 };
@@ -76,6 +84,7 @@ export const apiParamsWithSpecialValues = {
   assignee_id: 'None',
   my_reaction_emoji: 'None',
   iteration_id: 'Current',
+  epic_id: 'None',
   weight: 'None',
 };
 
@@ -92,6 +101,8 @@ export const urlParams = {
   confidential: ['no'],
   iteration_title: ['season: #4'],
   'not[iteration_title]': ['season: #20'],
+  epic_id: ['12'],
+  'not[epic_id]': ['34'],
   weight: ['1'],
   'not[weight]': ['3'],
 };
@@ -100,5 +111,6 @@ export const urlParamsWithSpecialValues = {
   assignee_id: ['None'],
   my_reaction_emoji: ['None'],
   iteration_id: ['Current'],
+  epic_id: ['None'],
   weight: ['None'],
 };