Add latest changes from gitlab-org/gitlab@master

3 files changed, 12 insertions, 18 deletions

diff --git a/spec/frontend/issues/show/components/description_spec.js b/spec/frontend/issues/show/components/description_spec.js
index 1fb290b5b19..3f4513e6bfa 100644
--- a/spec/frontend/issues/show/components/description_spec.js
+++ b/spec/frontend/issues/show/components/description_spec.js
@@ -310,7 +310,7 @@ describe('Description component', () => {
     });
   });
 
-  describe('with work_items_mvc_2 feature flag enabled', () => {
+  describe('with work_items_mvc feature flag enabled', () => {
     describe('empty description', () => {
       beforeEach(() => {
         createComponent({
@@ -319,7 +319,7 @@ describe('Description component', () => {
           },
           provide: {
             glFeatures: {
-              workItemsMvc2: true,
+              workItemsMvc: true,
             },
           },
         });
@@ -339,7 +339,7 @@ describe('Description component', () => {
           },
           provide: {
             glFeatures: {
-              workItemsMvc2: true,
+              workItemsMvc: true,
             },
           },
         });
@@ -383,7 +383,7 @@ describe('Description component', () => {
    1. [ ] item 4;`;
             createComponent({
               props: { descriptionText },
-              provide: { glFeatures: { workItemsMvc2: true } },
+              provide: { glFeatures: { workItemsMvc: true } },
               createWorkItemMutationHandler,
             });
             await waitForPromises();
@@ -437,7 +437,7 @@ describe('Description component', () => {
           beforeEach(async () => {
             createComponent({
               props: { descriptionText: 'description' },
-              provide: { glFeatures: { workItemsMvc2: true } },
+              provide: { glFeatures: { workItemsMvc: true } },
               createWorkItemMutationHandler: jest
                 .fn()
                 .mockResolvedValue(createWorkItemMutationErrorResponse),
@@ -473,7 +473,7 @@ describe('Description component', () => {
    1. [ ] item 4;`;
           createComponent({
             props: { descriptionText },
-            provide: { glFeatures: { workItemsMvc2: true } },
+            provide: { glFeatures: { workItemsMvc: true } },
           });
 
           eventHub.$emit('delete-task-list-item', '4:4-5:19');
@@ -491,7 +491,7 @@ describe('Description component', () => {
               descriptionHtml: descriptionHtmlWithTask,
             },
             provide: {
-              glFeatures: { workItemsMvc2: true },
+              glFeatures: { workItemsMvc: true },
             },
           });
           return nextTick();
@@ -553,7 +553,7 @@ describe('Description component', () => {
 
             createComponent({
               props: { descriptionHtml: descriptionHtmlWithTask },
-              provide: { glFeatures: { workItemsMvc2: true } },
+              provide: { glFeatures: { workItemsMvc: true } },
             });
 
             expect(showDetailsModal).toHaveBeenCalledTimes(modalOpened);
@@ -569,7 +569,7 @@ describe('Description component', () => {
             descriptionHtml: descriptionHtmlWithTask,
           },
           provide: {
-            glFeatures: { workItemsMvc2: true },
+            glFeatures: { workItemsMvc: true },
           },
         });
         return nextTick();
diff --git a/spec/frontend/projects/settings/components/new_access_dropdown_spec.js b/spec/frontend/projects/settings/components/new_access_dropdown_spec.js
index 1b06f7874a3..26297d0c3ff 100644
--- a/spec/frontend/projects/settings/components/new_access_dropdown_spec.js
+++ b/spec/frontend/projects/settings/components/new_access_dropdown_spec.js
@@ -5,6 +5,7 @@ import {
   GlDropdownSectionHeader,
   GlSearchBoxByType,
 } from '@gitlab/ui';
+import { last } from 'lodash';
 import { nextTick } from 'vue';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';
@@ -254,7 +255,6 @@ describe('Access Level Dropdown', () => {
 
       createComponent({ preselectedItems });
       await waitForPromises();
-      const spy = jest.spyOn(wrapper.vm, '$emit');
       const dropdownItems = findAllDropdownItems();
       // select new item from each group
       findDropdownItemWithText(dropdownItems, 'role1').trigger('click');
@@ -267,7 +267,7 @@ describe('Access Level Dropdown', () => {
       findDropdownItemWithText(dropdownItems, 'user8').trigger('click');
       findDropdownItemWithText(dropdownItems, 'key11').trigger('click');
 
-      expect(spy).toHaveBeenLastCalledWith('select', [
+      expect(last(wrapper.emitted('select'))[0]).toStrictEqual([
         { access_level: 1 },
         { id: 112, access_level: 2, _destroy: true },
         { id: 113, access_level: 3 },
@@ -347,12 +347,10 @@ describe('Access Level Dropdown', () => {
     });
 
     it('should emit `hidden` event with dropdown selection', () => {
-      jest.spyOn(wrapper.vm, '$emit');
-
       findAllDropdownItems().at(1).trigger('click');
 
       findDropdown().vm.$emit('hidden');
-      expect(wrapper.vm.$emit).toHaveBeenCalledWith('hidden', [{ access_level: 2 }]);
+      expect(wrapper.emitted('hidden')[0][0]).toStrictEqual([{ access_level: 2 }]);
     });
   });
 });
diff --git a/spec/frontend/work_items/components/work_item_links/work_item_links_form_spec.js b/spec/frontend/work_items/components/work_item_links/work_item_links_form_spec.js
index 5e1c46826cc..480f8fbcc58 100644
--- a/spec/frontend/work_items/components/work_item_links/work_item_links_form_spec.js
+++ b/spec/frontend/work_items/components/work_item_links/work_item_links_form_spec.js
@@ -40,7 +40,6 @@ describe('WorkItemLinksForm', () => {
     typesResponse = projectWorkItemTypesQueryResponse,
     parentConfidential = false,
     hasIterationsFeature = false,
-    workItemsMvcEnabled = false,
     parentIteration = null,
     formType = FORM_TYPES.create,
     parentWorkItemType = WORK_ITEM_TYPE_VALUE_ISSUE,
@@ -62,9 +61,6 @@ describe('WorkItemLinksForm', () => {
         formType,
       },
       provide: {
-        glFeatures: {
-          workItemsMvc: workItemsMvcEnabled,
-        },
         projectPath: 'project/path',
         hasIterationsFeature,
       },