Merge branch '222346-fix-delete-button-spinner' into 'master'

Fix vulnerability comment delete button spinner position

See merge request gitlab-org/gitlab!40681

ee/app/assets/javascripts/vulnerabilities/components/history_comment.vue

 <script>
 /* eslint-disable vue/no-v-html */
-import { GlDeprecatedButton, GlButton, GlLoadingIcon } from '@gitlab/ui';
+import { GlDeprecatedButton, GlButton } from '@gitlab/ui';
 import EventItem from 'ee/vue_shared/security_reports/components/event_item.vue';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
 import { __, s__ } from '~/locale';
@@ -13,7 +13,6 @@ export default {
     GlButton,
     EventItem,
     HistoryCommentEditor,
-    GlLoadingIcon,
   },
 
   props: {
@@ -161,10 +160,9 @@ export default {
       <gl-button
         ref="confirmDeleteButton"
         variant="danger"
-        :disabled="isDeletingComment"
+        :loading="isDeletingComment"
         @click="deleteComment"
       >
-        <gl-loading-icon v-if="isDeletingComment" class="mr-1" />
         {{ __('Delete') }}
       </gl-button>
       <gl-button

ee/changelogs/unreleased/222346-fix-delete-button-spinner.yml

+---
+title: Fix vulnerability comment delete button spinner position
+merge_request: 40681
+author:
+type: fixed

ee/spec/frontend/vulnerabilities/history_comment_spec.js

@@ -196,8 +196,8 @@ describe('History Comment', () => {
           return wrapper.vm.$nextTick();
         })
         .then(() => {
-          expect(confirmDeleteButton().attributes('disabled')).toBeTruthy();
-          expect(cancelDeleteButton().attributes('disabled')).toBeTruthy();
+          expect(confirmDeleteButton().props('loading')).toBe(true);
+          expect(cancelDeleteButton().props('disabled')).toBe(true);
           return axios.waitForAll();
         })
         .then(() => {