Add latest changes from gitlab-org/gitlab@master

2 files changed, 52 insertions, 4 deletions

diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/mock_data.js b/spec/frontend/vue_shared/components/filtered_search_bar/mock_data.js
index 74cf6985b99..238c5d16db5 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/mock_data.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/mock_data.js
@@ -111,6 +111,18 @@ export const mockIterationToken = {
   fetchIterations: () => Promise.resolve(),
 };
 
+export const mockIterations = [
+  {
+    id: 1,
+    title: 'Iteration 1',
+    startDate: '2021-11-05',
+    dueDate: '2021-11-10',
+    iterationCadence: {
+      title: 'Cadence 1',
+    },
+  },
+];
+
 export const mockLabelToken = {
   type: 'label_name',
   icon: 'labels',
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/iteration_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/iteration_token_spec.js
index af90ee93543..44bc16adb97 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/iteration_token_spec.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/iteration_token_spec.js
@@ -1,9 +1,13 @@
-import { GlFilteredSearchToken, GlFilteredSearchTokenSegment } from '@gitlab/ui';
+import {
+  GlFilteredSearchToken,
+  GlFilteredSearchTokenSegment,
+  GlFilteredSearchSuggestion,
+} from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
 import waitForPromises from 'helpers/wait_for_promises';
 import createFlash from '~/flash';
 import IterationToken from '~/vue_shared/components/filtered_search_bar/tokens/iteration_token.vue';
-import { mockIterationToken } from '../mock_data';
+import { mockIterationToken, mockIterations } from '../mock_data';
 
 jest.mock('~/flash');
 
@@ -11,10 +15,16 @@ describe('IterationToken', () => {
   const id = 123;
   let wrapper;
 
-  const createComponent = ({ config = mockIterationToken, value = { data: '' } } = {}) =>
+  const createComponent = ({
+    config = mockIterationToken,
+    value = { data: '' },
+    active = false,
+    stubs = {},
+    provide = {},
+  } = {}) =>
     mount(IterationToken, {
       propsData: {
-        active: false,
+        active,
         config,
         value,
       },
@@ -22,13 +32,39 @@ describe('IterationToken', () => {
         portalName: 'fake target',
         alignSuggestions: function fakeAlignSuggestions() {},
         suggestionsListClass: () => 'custom-class',
+        ...provide,
       },
+      stubs,
     });
 
   afterEach(() => {
     wrapper.destroy();
   });
 
+  describe('when iteration cadence feature is available', () => {
+    beforeEach(async () => {
+      wrapper = createComponent({
+        active: true,
+        config: { ...mockIterationToken, initialIterations: mockIterations },
+        value: { data: 'i' },
+        stubs: { Portal: true },
+        provide: {
+          glFeatures: {
+            iterationCadences: true,
+          },
+        },
+      });
+
+      await wrapper.setData({ loading: false });
+    });
+
+    it('renders iteration start date and due date', () => {
+      const suggestions = wrapper.findAll(GlFilteredSearchSuggestion);
+
+      expect(suggestions.at(3).text()).toContain('Nov 5, 2021 - Nov 10, 2021');
+    });
+  });
+
   it('renders iteration value', async () => {
     wrapper = createComponent({ value: { data: id } });