Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 8 deletions

diff --git a/spec/frontend/work_items/components/work_item_links/work_item_links_spec.js b/spec/frontend/work_items/components/work_item_links/work_item_links_spec.js
index 563f2c7f716..99e44b4d89c 100644
--- a/spec/frontend/work_items/components/work_item_links/work_item_links_spec.js
+++ b/spec/frontend/work_items/components/work_item_links/work_item_links_spec.js
@@ -54,7 +54,6 @@ describe('WorkItemLinks', () => {
     mutationHandler = mutationChangeParentHandler,
     issueDetailsQueryHandler = jest.fn().mockResolvedValue(getIssueDetailsResponse()),
     hasIterationsFeature = false,
-    fetchByIid = false,
   } = {}) => {
     mockApollo = createMockApollo(
       [
@@ -77,9 +76,6 @@ describe('WorkItemLinks', () => {
       provide: {
         projectPath: 'project/path',
         hasIterationsFeature,
-        glFeatures: {
-          useIidInWorkItemsPath: fetchByIid,
-        },
       },
       propsData: { issuableId: 1 },
       apolloProvider: mockApollo,
@@ -350,7 +346,7 @@ describe('WorkItemLinks', () => {
 
       beforeEach(async () => {
         setWindowLocation('?iid_path=true');
-        await createComponent({ fetchByIid: true });
+        await createComponent();
 
         firstChild = findFirstWorkItemLinkChild();
       });
@@ -390,7 +386,7 @@ describe('WorkItemLinks', () => {
 
     it('starts prefetching work item by iid if URL contains work item id', async () => {
       setWindowLocation('?work_item_iid=5&iid_path=true');
-      await createComponent({ fetchByIid: true });
+      await createComponent();
 
       expect(childWorkItemByIidHandler).toHaveBeenCalledWith({
         iid: '5',
@@ -401,7 +397,7 @@ describe('WorkItemLinks', () => {
 
   it('does not open the modal if work item iid URL parameter is not found in child items', async () => {
     setWindowLocation('?work_item_iid=555&iid_path=true');
-    await createComponent({ fetchByIid: true });
+    await createComponent();
 
     expect(showModal).not.toHaveBeenCalled();
     expect(wrapper.findComponent(WorkItemDetailModal).props('workItemIid')).toBe(null);
@@ -409,7 +405,7 @@ describe('WorkItemLinks', () => {
 
   it('opens the modal if work item iid URL parameter is found in child items', async () => {
     setWindowLocation('?work_item_iid=2&iid_path=true');
-    await createComponent({ fetchByIid: true });
+    await createComponent();
 
     expect(showModal).toHaveBeenCalled();
     expect(wrapper.findComponent(WorkItemDetailModal).props('workItemIid')).toBe('2');