Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

3 files changed, 47 insertions, 50 deletions

diff --git a/spec/frontend/vue_shared/alert_details/alert_status_spec.js b/spec/frontend/vue_shared/alert_details/alert_status_spec.js
index c532f688cbd..3fc13243bce 100644
--- a/spec/frontend/vue_shared/alert_details/alert_status_spec.js
+++ b/spec/frontend/vue_shared/alert_details/alert_status_spec.js
@@ -1,5 +1,5 @@
 import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
-import { shallowMount } from '@vue/test-utils';
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import updateAlertStatusMutation from '~/graphql_shared//mutations/alert_status_update.mutation.graphql';
 import Tracking from '~/tracking';
@@ -10,9 +10,10 @@ const mockAlert = mockAlerts[0];
 
 describe('AlertManagementStatus', () => {
   let wrapper;
-  const findStatusDropdown = () => wrapper.find(GlDropdown);
-  const findFirstStatusOption = () => findStatusDropdown().find(GlDropdownItem);
+  const findStatusDropdown = () => wrapper.findComponent(GlDropdown);
+  const findFirstStatusOption = () => findStatusDropdown().findComponent(GlDropdownItem);
   const findAllStatusOptions = () => findStatusDropdown().findAll(GlDropdownItem);
+  const findStatusDropdownHeader = () => wrapper.findByTestId('dropdown-header');
 
   const selectFirstStatusOption = () => {
     findFirstStatusOption().vm.$emit('click');
@@ -21,7 +22,7 @@ describe('AlertManagementStatus', () => {
   };
 
   function mountComponent({ props = {}, provide = {}, loading = false, stubs = {} } = {}) {
-    wrapper = shallowMount(AlertManagementStatus, {
+    wrapper = shallowMountExtended(AlertManagementStatus, {
       propsData: {
         alert: { ...mockAlert },
         projectPath: 'gitlab-org/gitlab',
@@ -43,17 +44,29 @@ describe('AlertManagementStatus', () => {
     });
   }
 
-  beforeEach(() => {
-    mountComponent();
-  });
-
   afterEach(() => {
     if (wrapper) {
       wrapper.destroy();
-      wrapper = null;
     }
   });
 
+  describe('sidebar', () => {
+    it('displays the dropdown status header', () => {
+      mountComponent({ props: { isSidebar: true } });
+      expect(findStatusDropdownHeader().exists()).toBe(true);
+    });
+
+    it('hides the dropdown by default', () => {
+      mountComponent({ props: { isSidebar: true } });
+      expect(wrapper.classes()).toContain('gl-display-none');
+    });
+
+    it('shows the dropdown', () => {
+      mountComponent({ props: { isSidebar: true, isDropdownShowing: true } });
+      expect(wrapper.classes()).toContain('show');
+    });
+  });
+
   describe('updating the alert status', () => {
     const iid = '1527542';
     const mockUpdatedMutationResult = {
@@ -99,6 +112,13 @@ describe('AlertManagementStatus', () => {
         ]);
       });
 
+      it('emits an update event at the start and ending of the updating', async () => {
+        await selectFirstStatusOption();
+        expect(wrapper.emitted('handle-updating').length > 1).toBe(true);
+        expect(wrapper.emitted('handle-updating')[0]).toEqual([true]);
+        expect(wrapper.emitted('handle-updating')[1]).toEqual([false]);
+      });
+
       it('emits an error when triggered a second time', async () => {
         await selectFirstStatusOption();
         await wrapper.vm.$nextTick();
diff --git a/spec/frontend/vue_shared/alert_details/sidebar/alert_sidebar_assignees_spec.js b/spec/frontend/vue_shared/alert_details/sidebar/alert_sidebar_assignees_spec.js
index db9b0930c06..9ae45071f45 100644
--- a/spec/frontend/vue_shared/alert_details/sidebar/alert_sidebar_assignees_spec.js
+++ b/spec/frontend/vue_shared/alert_details/sidebar/alert_sidebar_assignees_spec.js
@@ -21,6 +21,7 @@ describe('Alert Details Sidebar Assignees', () => {
       id: 1,
       name: 'User 1',
       username: 'root',
+      webUrl: 'https://gitlab:3443/root',
     },
     {
       avatar_url:
@@ -28,6 +29,7 @@ describe('Alert Details Sidebar Assignees', () => {
       id: 2,
       name: 'User 2',
       username: 'not-root',
+      webUrl: 'https://gitlab:3443/non-root',
     },
   ];
 
@@ -128,7 +130,7 @@ describe('Alert Details Sidebar Assignees', () => {
         variables: {
           iid: '1527542',
           assigneeUsernames: ['root'],
-          projectPath: 'projectPath',
+          fullPath: 'projectPath',
         },
       });
     });
@@ -137,7 +139,7 @@ describe('Alert Details Sidebar Assignees', () => {
       wrapper.setData({ isDropdownSearching: false });
       const errorMutationResult = {
         data: {
-          alertSetAssignees: {
+          issuableSetAssignees: {
             errors: ['There was a problem for sure.'],
             alert: {},
           },
diff --git a/spec/frontend/vue_shared/alert_details/sidebar/alert_sidebar_status_spec.js b/spec/frontend/vue_shared/alert_details/sidebar/alert_sidebar_status_spec.js
index d5be5b623b8..b00a20dab1a 100644
--- a/spec/frontend/vue_shared/alert_details/sidebar/alert_sidebar_status_spec.js
+++ b/spec/frontend/vue_shared/alert_details/sidebar/alert_sidebar_status_spec.js
@@ -1,6 +1,5 @@
-import { GlDropdown, GlDropdownItem, GlLoadingIcon } from '@gitlab/ui';
-import { mountExtended } from 'helpers/vue_test_utils_helper';
-import updateAlertStatusMutation from '~/graphql_shared/mutations/alert_status_update.mutation.graphql';
+import { GlDropdown, GlLoadingIcon } from '@gitlab/ui';
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import AlertStatus from '~/vue_shared/alert_details/components/alert_status.vue';
 import AlertSidebarStatus from '~/vue_shared/alert_details/components/sidebar/sidebar_status.vue';
 import { PAGE_CONFIG } from '~/vue_shared/alert_details/constants';
@@ -11,9 +10,7 @@ const mockAlert = mockAlerts[0];
 describe('Alert Details Sidebar Status', () => {
   let wrapper;
   const findStatusDropdown = () => wrapper.findComponent(GlDropdown);
-  const findStatusDropdownItem = () => wrapper.findComponent(GlDropdownItem);
   const findStatusLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
-  const findStatusDropdownHeader = () => wrapper.findByTestId('dropdown-header');
   const findAlertStatus = () => wrapper.findComponent(AlertStatus);
   const findStatus = () => wrapper.findByTestId('status');
   const findSidebarIcon = () => wrapper.findByTestId('status-icon');
@@ -25,7 +22,7 @@ describe('Alert Details Sidebar Status', () => {
     stubs = {},
     provide = {},
   } = {}) {
-    wrapper = mountExtended(AlertSidebarStatus, {
+    wrapper = shallowMountExtended(AlertSidebarStatus, {
       propsData: {
         alert: { ...mockAlert },
         ...data,
@@ -63,11 +60,7 @@ describe('Alert Details Sidebar Status', () => {
     });
 
     it('displays status dropdown', () => {
-      expect(findStatusDropdown().exists()).toBe(true);
-    });
-
-    it('displays the dropdown status header', () => {
-      expect(findStatusDropdownHeader().exists()).toBe(true);
+      expect(findAlertStatus().exists()).toBe(true);
     });
 
     it('does not display the collapsed sidebar icon', () => {
@@ -75,42 +68,24 @@ describe('Alert Details Sidebar Status', () => {
     });
 
     describe('updating the alert status', () => {
-      const mockUpdatedMutationResult = {
-        data: {
-          updateAlertStatus: {
-            errors: [],
-            alert: {
-              status: 'acknowledged',
-            },
-          },
-        },
-      };
-
-      beforeEach(() => {
+      it('ensures dropdown is hidden when loading', async () => {
         mountComponent({
           data: { alert: mockAlert },
           sidebarCollapsed: false,
           loading: false,
         });
-      });
-
-      it('calls `$apollo.mutate` with `updateAlertStatus` mutation and variables containing `iid`, `status`, & `projectPath`', () => {
-        jest.spyOn(wrapper.vm.$apollo, 'mutate').mockResolvedValue(mockUpdatedMutationResult);
-        findStatusDropdownItem().vm.$emit('click');
-
-        expect(wrapper.vm.$apollo.mutate).toHaveBeenCalledWith({
-          mutation: updateAlertStatusMutation,
-          variables: {
-            iid: '1527542',
-            status: 'TRIGGERED',
-            projectPath: 'projectPath',
-          },
-        });
+        findAlertStatus().vm.$emit('handle-updating', true);
+        await wrapper.vm.$nextTick();
+        expect(findStatusLoadingIcon().exists()).toBe(true);
       });
 
       it('stops updating when the request fails', () => {
-        jest.spyOn(wrapper.vm.$apollo, 'mutate').mockReturnValue(Promise.reject(new Error()));
-        findStatusDropdownItem().vm.$emit('click');
+        mountComponent({
+          data: { alert: mockAlert },
+          sidebarCollapsed: false,
+          loading: false,
+        });
+        findAlertStatus().vm.$emit('handle-updating', false);
         expect(findStatusLoadingIcon().exists()).toBe(false);
         expect(findStatus().text()).toBe('Triggered');
       });