Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 6 deletions

diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
index 85a42946325..ea317d83588 100644
--- a/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
@@ -123,26 +123,26 @@ describe('ReadyToMerge', () => {
     });
 
     describe('mergeButtonVariant', () => {
-      it('defaults to success class', () => {
+      it('defaults to confirm class', () => {
         createComponent({
           mr: { availableAutoMergeStrategies: [] },
         });
 
-        expect(wrapper.vm.mergeButtonVariant).toEqual('success');
+        expect(wrapper.vm.mergeButtonVariant).toEqual('confirm');
       });
 
-      it('returns success class for success status', () => {
+      it('returns confirm class for success status', () => {
         createComponent({
           mr: { availableAutoMergeStrategies: [], pipeline: true },
         });
 
-        expect(wrapper.vm.mergeButtonVariant).toEqual('success');
+        expect(wrapper.vm.mergeButtonVariant).toEqual('confirm');
       });
 
-      it('returns info class for pending status', () => {
+      it('returns confirm class for pending status', () => {
         createComponent();
 
-        expect(wrapper.vm.mergeButtonVariant).toEqual('info');
+        expect(wrapper.vm.mergeButtonVariant).toEqual('confirm');
       });
 
       it('returns danger class for failed status', () => {