Add latest changes from gitlab-org/gitlab@master

8 files changed, 42 insertions, 42 deletions

diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/filtered_search_bar_root_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/filtered_search_bar_root_spec.js
index 1b9ca8e6092..6a03d1aec2d 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/filtered_search_bar_root_spec.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/filtered_search_bar_root_spec.js
@@ -13,7 +13,7 @@ import RecentSearchesService from '~/filtered_search/services/recent_searches_se
 import RecentSearchesStore from '~/filtered_search/stores/recent_searches_store';
 import {
   FILTERED_SEARCH_TERM,
-  SortDirection,
+  SORT_DIRECTION,
 } from '~/vue_shared/components/filtered_search_bar/constants';
 import FilteredSearchBarRoot from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
 import { uniqueTokens } from '~/vue_shared/components/filtered_search_bar/filtered_search_utils';
@@ -87,7 +87,7 @@ describe('FilteredSearchBarRoot', () => {
     it('initializes `filterValue`, `selectedSortOption` and `selectedSortDirection` data props and displays the sort dropdown', () => {
       expect(wrapper.vm.filterValue).toEqual([]);
       expect(wrapper.vm.selectedSortOption).toBe(mockSortOptions[0]);
-      expect(wrapper.vm.selectedSortDirection).toBe(SortDirection.descending);
+      expect(wrapper.vm.selectedSortDirection).toBe(SORT_DIRECTION.descending);
       expect(wrapper.findComponent(GlButtonGroup).exists()).toBe(true);
       expect(wrapper.findComponent(GlButton).exists()).toBe(true);
       expect(wrapper.findComponent(GlDropdown).exists()).toBe(true);
@@ -132,7 +132,7 @@ describe('FilteredSearchBarRoot', () => {
         // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
         // eslint-disable-next-line no-restricted-syntax
         wrapper.setData({
-          selectedSortDirection: SortDirection.ascending,
+          selectedSortDirection: SORT_DIRECTION.ascending,
         });
 
         expect(wrapper.vm.sortDirectionIcon).toBe('sort-lowest');
@@ -142,7 +142,7 @@ describe('FilteredSearchBarRoot', () => {
         // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
         // eslint-disable-next-line no-restricted-syntax
         wrapper.setData({
-          selectedSortDirection: SortDirection.descending,
+          selectedSortDirection: SORT_DIRECTION.descending,
         });
 
         expect(wrapper.vm.sortDirectionIcon).toBe('sort-highest');
@@ -154,7 +154,7 @@ describe('FilteredSearchBarRoot', () => {
         // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
         // eslint-disable-next-line no-restricted-syntax
         wrapper.setData({
-          selectedSortDirection: SortDirection.ascending,
+          selectedSortDirection: SORT_DIRECTION.ascending,
         });
 
         expect(wrapper.vm.sortDirectionTooltip).toBe('Sort direction: Ascending');
@@ -164,7 +164,7 @@ describe('FilteredSearchBarRoot', () => {
         // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
         // eslint-disable-next-line no-restricted-syntax
         wrapper.setData({
-          selectedSortDirection: SortDirection.descending,
+          selectedSortDirection: SORT_DIRECTION.descending,
         });
 
         expect(wrapper.vm.sortDirectionTooltip).toBe('Sort direction: Descending');
@@ -272,11 +272,11 @@ describe('FilteredSearchBarRoot', () => {
       });
 
       it('sets `selectedSortDirection` to be opposite of its current value', () => {
-        expect(wrapper.vm.selectedSortDirection).toBe(SortDirection.descending);
+        expect(wrapper.vm.selectedSortDirection).toBe(SORT_DIRECTION.descending);
 
         wrapper.vm.handleSortDirectionClick();
 
-        expect(wrapper.vm.selectedSortDirection).toBe(SortDirection.ascending);
+        expect(wrapper.vm.selectedSortDirection).toBe(SORT_DIRECTION.ascending);
       });
 
       it('emits component event `onSort` with opposite of currently selected sort by value', () => {
@@ -384,7 +384,7 @@ describe('FilteredSearchBarRoot', () => {
       // eslint-disable-next-line no-restricted-syntax
       wrapper.setData({
         selectedSortOption: mockSortOptions[0],
-        selectedSortDirection: SortDirection.descending,
+        selectedSortDirection: SORT_DIRECTION.descending,
         recentSearches: mockHistoryItems,
       });
 
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/author_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/author_token_spec.js
index 5371b9af475..69a0dc6469c 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/author_token_spec.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/author_token_spec.js
@@ -11,7 +11,7 @@ import waitForPromises from 'helpers/wait_for_promises';
 import { createAlert } from '~/flash';
 import axios from '~/lib/utils/axios_utils';
 
-import { DEFAULT_NONE_ANY } from '~/vue_shared/components/filtered_search_bar/constants';
+import { OPTIONS_NONE_ANY } from '~/vue_shared/components/filtered_search_bar/constants';
 import AuthorToken from '~/vue_shared/components/filtered_search_bar/tokens/author_token.vue';
 import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue';
 
@@ -243,7 +243,7 @@ describe('AuthorToken', () => {
     });
 
     it('renders provided defaultAuthors as suggestions', async () => {
-      const defaultAuthors = DEFAULT_NONE_ANY;
+      const defaultAuthors = OPTIONS_NONE_ANY;
       wrapper = createComponent({
         active: true,
         config: { ...mockAuthorToken, defaultAuthors, preloadedAuthors: mockPreloadedAuthors },
@@ -274,7 +274,7 @@ describe('AuthorToken', () => {
       expect(wrapper.findComponent(GlDropdownDivider).exists()).toBe(false);
     });
 
-    it('renders `DEFAULT_NONE_ANY` as default suggestions', async () => {
+    it('renders `OPTIONS_NONE_ANY` as default suggestions', async () => {
       wrapper = createComponent({
         active: true,
         config: { ...mockAuthorToken, preloadedAuthors: mockPreloadedAuthors },
@@ -286,8 +286,8 @@ describe('AuthorToken', () => {
       const suggestions = wrapper.findAllComponents(GlFilteredSearchSuggestion);
 
       expect(suggestions).toHaveLength(2 + currentUserLength);
-      expect(suggestions.at(0).text()).toBe(DEFAULT_NONE_ANY[0].text);
-      expect(suggestions.at(1).text()).toBe(DEFAULT_NONE_ANY[1].text);
+      expect(suggestions.at(0).text()).toBe(OPTIONS_NONE_ANY[0].text);
+      expect(suggestions.at(1).text()).toBe(OPTIONS_NONE_ANY[1].text);
     });
 
     it('emits listeners in the base-token', () => {
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/base_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/base_token_spec.js
index 5546b0c7032..d9ba044a779 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/base_token_spec.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/base_token_spec.js
@@ -15,7 +15,7 @@ import {
 } from 'jest/vue_shared/components/sidebar/labels_select_vue/mock_data';
 
 import {
-  DEFAULT_NONE_ANY,
+  OPTIONS_NONE_ANY,
   OPERATOR_IS,
   OPERATOR_NOT,
 } from '~/vue_shared/components/filtered_search_bar/constants';
@@ -76,7 +76,7 @@ const mockProps = {
   active: false,
   suggestions: [],
   suggestionsLoading: false,
-  defaultSuggestions: DEFAULT_NONE_ANY,
+  defaultSuggestions: OPTIONS_NONE_ANY,
   getActiveTokenValue: (labels, data) => labels.find((label) => label.title === data),
   cursorPosition: 'start',
 };
@@ -307,7 +307,7 @@ describe('BaseToken', () => {
       `('when operator is $operator', ({ shouldRenderFilteredSearchSuggestion, operator }) => {
         beforeEach(() => {
           const props = {
-            defaultSuggestions: DEFAULT_NONE_ANY,
+            defaultSuggestions: OPTIONS_NONE_ANY,
             value: { data: '', operator },
           };
 
@@ -322,7 +322,7 @@ describe('BaseToken', () => {
 
           if (shouldRenderFilteredSearchSuggestion) {
             expect(filteredSearchSuggestions.map((c) => c.props())).toMatchObject(
-              DEFAULT_NONE_ANY.map((opt) => ({ value: opt.value })),
+              OPTIONS_NONE_ANY.map((opt) => ({ value: opt.value })),
             );
           } else {
             expect(filteredSearchSuggestions).toHaveLength(0);
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/branch_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/branch_token_spec.js
index 05b42011fe1..311d5a13280 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/branch_token_spec.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/branch_token_spec.js
@@ -11,7 +11,7 @@ import waitForPromises from 'helpers/wait_for_promises';
 
 import { createAlert } from '~/flash';
 import axios from '~/lib/utils/axios_utils';
-import { DEFAULT_NONE_ANY } from '~/vue_shared/components/filtered_search_bar/constants';
+import { OPTIONS_NONE_ANY } from '~/vue_shared/components/filtered_search_bar/constants';
 import BranchToken from '~/vue_shared/components/filtered_search_bar/tokens/branch_token.vue';
 
 import { mockBranches, mockBranchToken } from '../mock_data';
@@ -112,7 +112,7 @@ describe('BranchToken', () => {
   });
 
   describe('template', () => {
-    const defaultBranches = DEFAULT_NONE_ANY;
+    const defaultBranches = OPTIONS_NONE_ANY;
     async function showSuggestions() {
       const tokenSegments = wrapper.findAllComponents(GlFilteredSearchTokenSegment);
       const suggestionsSegment = tokenSegments.at(2);
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/crm_contact_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/crm_contact_token_spec.js
index 5b744521979..7be7035a0f2 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/crm_contact_token_spec.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/crm_contact_token_spec.js
@@ -10,7 +10,7 @@ import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import { createAlert } from '~/flash';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import { DEFAULT_NONE_ANY } from '~/vue_shared/components/filtered_search_bar/constants';
+import { OPTIONS_NONE_ANY } from '~/vue_shared/components/filtered_search_bar/constants';
 import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue';
 import CrmContactToken from '~/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue';
 import searchCrmContactsQuery from '~/vue_shared/components/filtered_search_bar/queries/search_crm_contacts.query.graphql';
@@ -187,7 +187,7 @@ describe('CrmContactToken', () => {
   });
 
   describe('template', () => {
-    const defaultContacts = DEFAULT_NONE_ANY;
+    const defaultContacts = OPTIONS_NONE_ANY;
 
     it('renders base-token component', () => {
       mountComponent({
@@ -250,7 +250,7 @@ describe('CrmContactToken', () => {
       expect(wrapper.findComponent(GlDropdownDivider).exists()).toBe(false);
     });
 
-    it('renders `DEFAULT_NONE_ANY` as default suggestions', () => {
+    it('renders `OPTIONS_NONE_ANY` as default suggestions', () => {
       mountComponent({
         active: true,
         config: { ...mockCrmContactToken },
@@ -262,8 +262,8 @@ describe('CrmContactToken', () => {
 
       const suggestions = wrapper.findAllComponents(GlFilteredSearchSuggestion);
 
-      expect(suggestions).toHaveLength(DEFAULT_NONE_ANY.length);
-      DEFAULT_NONE_ANY.forEach((contact, index) => {
+      expect(suggestions).toHaveLength(OPTIONS_NONE_ANY.length);
+      OPTIONS_NONE_ANY.forEach((contact, index) => {
         expect(suggestions.at(index).text()).toBe(contact.text);
       });
     });
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/crm_organization_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/crm_organization_token_spec.js
index 3a3e96032e8..ecd3e8a04f1 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/crm_organization_token_spec.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/crm_organization_token_spec.js
@@ -10,7 +10,7 @@ import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import { createAlert } from '~/flash';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import { DEFAULT_NONE_ANY } from '~/vue_shared/components/filtered_search_bar/constants';
+import { OPTIONS_NONE_ANY } from '~/vue_shared/components/filtered_search_bar/constants';
 import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue';
 import CrmOrganizationToken from '~/vue_shared/components/filtered_search_bar/tokens/crm_organization_token.vue';
 import searchCrmOrganizationsQuery from '~/vue_shared/components/filtered_search_bar/queries/search_crm_organizations.query.graphql';
@@ -186,7 +186,7 @@ describe('CrmOrganizationToken', () => {
   });
 
   describe('template', () => {
-    const defaultOrganizations = DEFAULT_NONE_ANY;
+    const defaultOrganizations = OPTIONS_NONE_ANY;
 
     it('renders base-token component', () => {
       mountComponent({
@@ -249,7 +249,7 @@ describe('CrmOrganizationToken', () => {
       expect(wrapper.findComponent(GlDropdownDivider).exists()).toBe(false);
     });
 
-    it('renders `DEFAULT_NONE_ANY` as default suggestions', () => {
+    it('renders `OPTIONS_NONE_ANY` as default suggestions', () => {
       mountComponent({
         active: true,
         config: { ...mockCrmOrganizationToken },
@@ -261,8 +261,8 @@ describe('CrmOrganizationToken', () => {
 
       const suggestions = wrapper.findAllComponents(GlFilteredSearchSuggestion);
 
-      expect(suggestions).toHaveLength(DEFAULT_NONE_ANY.length);
-      DEFAULT_NONE_ANY.forEach((organization, index) => {
+      expect(suggestions).toHaveLength(OPTIONS_NONE_ANY.length);
+      OPTIONS_NONE_ANY.forEach((organization, index) => {
         expect(suggestions.at(index).text()).toBe(organization.text);
       });
     });
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/emoji_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/emoji_token_spec.js
index e8436d2db17..773df01ada7 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/emoji_token_spec.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/emoji_token_spec.js
@@ -12,9 +12,9 @@ import { createAlert } from '~/flash';
 import axios from '~/lib/utils/axios_utils';
 
 import {
-  DEFAULT_LABEL_NONE,
-  DEFAULT_LABEL_ANY,
-  DEFAULT_NONE_ANY,
+  OPTION_NONE,
+  OPTION_ANY,
+  OPTIONS_NONE_ANY,
 } from '~/vue_shared/components/filtered_search_bar/constants';
 import EmojiToken from '~/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue';
 
@@ -118,7 +118,7 @@ describe('EmojiToken', () => {
   });
 
   describe('template', () => {
-    const defaultEmojis = DEFAULT_NONE_ANY;
+    const defaultEmojis = OPTIONS_NONE_ANY;
 
     beforeEach(async () => {
       wrapper = createComponent({
@@ -181,7 +181,7 @@ describe('EmojiToken', () => {
       expect(wrapper.findComponent(GlDropdownDivider).exists()).toBe(false);
     });
 
-    it('renders `DEFAULT_LABEL_NONE` and `DEFAULT_LABEL_ANY` as default suggestions', async () => {
+    it('renders `OPTION_NONE` and `OPTION_ANY` as default suggestions', async () => {
       wrapper = createComponent({
         active: true,
         config: { ...mockReactionEmojiToken },
@@ -195,8 +195,8 @@ describe('EmojiToken', () => {
       const suggestions = wrapper.findAllComponents(GlFilteredSearchSuggestion);
 
       expect(suggestions).toHaveLength(2);
-      expect(suggestions.at(0).text()).toBe(DEFAULT_LABEL_NONE.text);
-      expect(suggestions.at(1).text()).toBe(DEFAULT_LABEL_ANY.text);
+      expect(suggestions.at(0).text()).toBe(OPTION_NONE.text);
+      expect(suggestions.at(1).text()).toBe(OPTION_ANY.text);
     });
   });
 });
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/label_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/label_token_spec.js
index 8ca12afacec..a2071037508 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/label_token_spec.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/label_token_spec.js
@@ -14,7 +14,7 @@ import {
 import { createAlert } from '~/flash';
 import axios from '~/lib/utils/axios_utils';
 
-import { DEFAULT_NONE_ANY } from '~/vue_shared/components/filtered_search_bar/constants';
+import { OPTIONS_NONE_ANY } from '~/vue_shared/components/filtered_search_bar/constants';
 import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue';
 import LabelToken from '~/vue_shared/components/filtered_search_bar/tokens/label_token.vue';
 
@@ -141,7 +141,7 @@ describe('LabelToken', () => {
   });
 
   describe('template', () => {
-    const defaultLabels = DEFAULT_NONE_ANY;
+    const defaultLabels = OPTIONS_NONE_ANY;
 
     beforeEach(async () => {
       wrapper = createComponent({ value: { data: `"${mockRegularLabel.title}"` } });
@@ -209,7 +209,7 @@ describe('LabelToken', () => {
       expect(wrapper.findComponent(GlDropdownDivider).exists()).toBe(false);
     });
 
-    it('renders `DEFAULT_NONE_ANY` as default suggestions', () => {
+    it('renders `OPTIONS_NONE_ANY` as default suggestions', () => {
       wrapper = createComponent({
         active: true,
         config: { ...mockLabelToken },
@@ -221,8 +221,8 @@ describe('LabelToken', () => {
 
       const suggestions = wrapper.findAllComponents(GlFilteredSearchSuggestion);
 
-      expect(suggestions).toHaveLength(DEFAULT_NONE_ANY.length);
-      DEFAULT_NONE_ANY.forEach((label, index) => {
+      expect(suggestions).toHaveLength(OPTIONS_NONE_ANY.length);
+      OPTIONS_NONE_ANY.forEach((label, index) => {
         expect(suggestions.at(index).text()).toBe(label.text);
       });
     });