1 files changed, 40 insertions, 7 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..2d00cd8e8d4 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
@@ -59,12 +59,17 @@ const createTestService = () => ({
 });
 
 let wrapper;
-const createComponent = (customConfig = {}) => {
+const createComponent = (customConfig = {}, mergeRequestWidgetGraphql = false) => {
   wrapper = shallowMount(ReadyToMerge, {
     propsData: {
       mr: createTestMr(customConfig),
       service: createTestService(),
     },
+    provide: {
+      glFeatures: {
+        mergeRequestWidgetGraphql,
+      },
+    },
   });
 };
 
@@ -123,26 +128,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', () => {
@@ -673,6 +678,34 @@ describe('ReadyToMerge', () => {
         expect(findCommitEditElements().length).toBe(2);
       });
 
+      it('should have two edit components when squash is enabled and there is more than 1 commit and mergeRequestWidgetGraphql is enabled', async () => {
+        createComponent(
+          {
+            mr: {
+              commitsCount: 2,
+              squashIsSelected: true,
+              enableSquashBeforeMerge: true,
+            },
+          },
+          true,
+        );
+
+        wrapper.setData({
+          loading: false,
+          state: {
+            ...createTestMr({}),
+            userPermissions: {},
+            squash: true,
+            mergeable: true,
+            commitCount: 2,
+            commitsWithoutMergeCommits: {},
+          },
+        });
+        await wrapper.vm.$nextTick();
+
+        expect(findCommitEditElements().length).toBe(2);
+      });
+
       it('should have one edit components when squash is enabled and there is 1 commit only', () => {
         createComponent({
           mr: {