Merge branch 'replace-gl-deprecated-button-approvals' into 'master'

Replaced gl-deprecated-button with gl-button

See merge request gitlab-org/gitlab!34207

ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue

 <script>
-import { GlDeprecatedButton, GlLoadingIcon } from '@gitlab/ui';
+import { GlButton, GlLoadingIcon } from '@gitlab/ui';
 import createFlash, { hideFlash } from '~/flash';
 import { s__ } from '~/locale';
 import eventHub from '~/vue_merge_request_widget/event_hub';
@@ -20,7 +20,7 @@ export default {
     ApprovalsSummaryOptional,
     ApprovalsFooter,
     ApprovalsAuth,
-    GlDeprecatedButton,
+    GlButton,
     GlLoadingIcon,
   },
   props: {
@@ -89,7 +89,7 @@ export default {
         return {
           text: this.approvalText,
           inverted,
-          variant: 'primary',
+          variant: 'info',
           action: () => this.approve(),
         };
       } else if (this.showUnapprove) {
@@ -207,18 +207,18 @@ export default {
           @approve="approveWithAuth"
           @hide="clearError"
         />
-        <gl-deprecated-button
+        <gl-button
           v-if="action"
           :variant="action.variant"
           :class="{ 'btn-inverted': action.inverted }"
-          size="sm"
+          category="secondary"
           class="mr-3"
           data-qa-selector="approve_button"
           @click="action.action"
         >
           <gl-loading-icon v-if="isApproving" inline />
           {{ action.text }}
-        </gl-deprecated-button>
+        </gl-button>
         <approvals-summary-optional
           v-if="isOptional"
           :can-approve="hasAction"

ee/spec/javascripts/vue_mr_widget/components/approvals/approvals_spec.js

 import { createLocalVue, shallowMount } from '@vue/test-utils';
-import { GlDeprecatedButton, GlLoadingIcon } from '@gitlab/ui';
+import { GlButton, GlLoadingIcon } from '@gitlab/ui';
 import Approvals from 'ee/vue_merge_request_widget/components/approvals/approvals.vue';
 import ApprovalsSummary from 'ee/vue_merge_request_widget/components/approvals/approvals_summary.vue';
 import ApprovalsSummaryOptional from 'ee/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue';
@@ -55,7 +55,7 @@ describe('EE MRWidget approvals', () => {
     });
   };
 
-  const findAction = () => wrapper.find(GlDeprecatedButton);
+  const findAction = () => wrapper.find(GlButton);
   const findActionData = () => {
     const action = findAction();
 
@@ -184,7 +184,7 @@ describe('EE MRWidget approvals', () => {
 
         it('approve action is rendered', () => {
           expect(findActionData()).toEqual({
-            variant: 'primary',
+            variant: 'info',
             text: 'Approve',
             inverted: false,
           });
@@ -205,7 +205,7 @@ describe('EE MRWidget approvals', () => {
 
           it('approve action (with inverted) is rendered', () => {
             expect(findActionData()).toEqual({
-              variant: 'primary',
+              variant: 'info',
               text: 'Approve',
               inverted: true,
             });
@@ -221,7 +221,7 @@ describe('EE MRWidget approvals', () => {
 
           it('approve additionally action is rendered', () => {
             expect(findActionData()).toEqual({
-              variant: 'primary',
+              variant: 'info',
               text: 'Approve additionally',
               inverted: true,
             });