Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 230 insertions, 0 deletions

diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js
new file mode 100644
index 00000000000..e2caa6e8092
--- /dev/null
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js
@@ -0,0 +1,230 @@
+import Vue from 'vue';
+import mountComponent from 'helpers/vue_mount_component_helper';
+import { trimText } from 'helpers/text_helper';
+import autoMergeEnabledComponent from '~/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue';
+import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service';
+import eventHub from '~/vue_merge_request_widget/event_hub';
+import { MWPS_MERGE_STRATEGY } from '~/vue_merge_request_widget/constants';
+
+describe('MRWidgetAutoMergeEnabled', () => {
+  let vm;
+  const targetBranchPath = '/foo/bar';
+  const targetBranch = 'foo';
+  const sha = '1EA2EZ34';
+
+  beforeEach(() => {
+    const Component = Vue.extend(autoMergeEnabledComponent);
+    jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
+
+    vm = mountComponent(Component, {
+      mr: {
+        shouldRemoveSourceBranch: false,
+        canRemoveSourceBranch: true,
+        canCancelAutomaticMerge: true,
+        mergeUserId: 1,
+        currentUserId: 1,
+        setToAutoMergeBy: {},
+        sha,
+        targetBranchPath,
+        targetBranch,
+        autoMergeStrategy: MWPS_MERGE_STRATEGY,
+      },
+      service: new MRWidgetService({}),
+    });
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('computed', () => {
+    describe('canRemoveSourceBranch', () => {
+      it('should return true when user is able to remove source branch', () => {
+        expect(vm.canRemoveSourceBranch).toBeTruthy();
+      });
+
+      it('should return false when user id is not the same with who set the MWPS', () => {
+        vm.mr.mergeUserId = 2;
+
+        expect(vm.canRemoveSourceBranch).toBeFalsy();
+
+        vm.mr.currentUserId = 2;
+
+        expect(vm.canRemoveSourceBranch).toBeTruthy();
+
+        vm.mr.currentUserId = 3;
+
+        expect(vm.canRemoveSourceBranch).toBeFalsy();
+      });
+
+      it('should return false when shouldRemoveSourceBranch set to false', () => {
+        vm.mr.shouldRemoveSourceBranch = true;
+
+        expect(vm.canRemoveSourceBranch).toBeFalsy();
+      });
+
+      it('should return false if user is not able to remove the source branch', () => {
+        vm.mr.canRemoveSourceBranch = false;
+
+        expect(vm.canRemoveSourceBranch).toBeFalsy();
+      });
+    });
+
+    describe('statusTextBeforeAuthor', () => {
+      it('should return "Set by" if the MWPS is selected', () => {
+        Vue.set(vm.mr, 'autoMergeStrategy', MWPS_MERGE_STRATEGY);
+
+        expect(vm.statusTextBeforeAuthor).toBe('Set by');
+      });
+    });
+
+    describe('statusTextAfterAuthor', () => {
+      it('should return "to be merged automatically..." if MWPS is selected', () => {
+        Vue.set(vm.mr, 'autoMergeStrategy', MWPS_MERGE_STRATEGY);
+
+        expect(vm.statusTextAfterAuthor).toBe(
+          'to be merged automatically when the pipeline succeeds',
+        );
+      });
+    });
+
+    describe('cancelButtonText', () => {
+      it('should return "Cancel automatic merge" if MWPS is selected', () => {
+        Vue.set(vm.mr, 'autoMergeStrategy', MWPS_MERGE_STRATEGY);
+
+        expect(vm.cancelButtonText).toBe('Cancel automatic merge');
+      });
+    });
+  });
+
+  describe('methods', () => {
+    describe('cancelAutomaticMerge', () => {
+      it('should set flag and call service then tell main component to update the widget with data', done => {
+        const mrObj = {
+          is_new_mr_data: true,
+        };
+        jest.spyOn(vm.service, 'cancelAutomaticMerge').mockReturnValue(
+          new Promise(resolve => {
+            resolve({
+              data: mrObj,
+            });
+          }),
+        );
+
+        vm.cancelAutomaticMerge();
+        setImmediate(() => {
+          expect(vm.isCancellingAutoMerge).toBeTruthy();
+          expect(eventHub.$emit).toHaveBeenCalledWith('UpdateWidgetData', mrObj);
+          done();
+        });
+      });
+    });
+
+    describe('removeSourceBranch', () => {
+      it('should set flag and call service then request main component to update the widget', done => {
+        jest.spyOn(vm.service, 'merge').mockReturnValue(
+          Promise.resolve({
+            data: {
+              status: MWPS_MERGE_STRATEGY,
+            },
+          }),
+        );
+
+        vm.removeSourceBranch();
+        setImmediate(() => {
+          expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
+          expect(vm.service.merge).toHaveBeenCalledWith({
+            sha,
+            auto_merge_strategy: MWPS_MERGE_STRATEGY,
+            should_remove_source_branch: true,
+          });
+          done();
+        });
+      });
+    });
+  });
+
+  describe('template', () => {
+    it('should have correct elements', () => {
+      expect(vm.$el.classList.contains('mr-widget-body')).toBeTruthy();
+      expect(vm.$el.innerText).toContain('to be merged automatically when the pipeline succeeds');
+
+      expect(vm.$el.innerText).toContain('The changes will be merged into');
+      expect(vm.$el.innerText).toContain(targetBranch);
+      expect(vm.$el.innerText).toContain('The source branch will not be deleted');
+      expect(vm.$el.querySelector('.js-cancel-auto-merge').innerText).toContain(
+        'Cancel automatic merge',
+      );
+
+      expect(vm.$el.querySelector('.js-cancel-auto-merge').getAttribute('disabled')).toBeFalsy();
+      expect(vm.$el.querySelector('.js-remove-source-branch').innerText).toContain(
+        'Delete source branch',
+      );
+
+      expect(vm.$el.querySelector('.js-remove-source-branch').getAttribute('disabled')).toBeFalsy();
+    });
+
+    it('should disable cancel auto merge button when the action is in progress', done => {
+      vm.isCancellingAutoMerge = true;
+
+      Vue.nextTick(() => {
+        expect(vm.$el.querySelector('.js-cancel-auto-merge').getAttribute('disabled')).toBeTruthy();
+        done();
+      });
+    });
+
+    it('should show source branch will be deleted text when it source branch set to remove', done => {
+      vm.mr.shouldRemoveSourceBranch = true;
+
+      Vue.nextTick(() => {
+        const normalizedText = vm.$el.innerText.replace(/\s+/g, ' ');
+
+        expect(normalizedText).toContain('The source branch will be deleted');
+        expect(normalizedText).not.toContain('The source branch will not be deleted');
+        done();
+      });
+    });
+
+    it('should not show delete source branch button when user not able to delete source branch', done => {
+      vm.mr.currentUserId = 4;
+
+      Vue.nextTick(() => {
+        expect(vm.$el.querySelector('.js-remove-source-branch')).toEqual(null);
+        done();
+      });
+    });
+
+    it('should disable delete source branch button when the action is in progress', done => {
+      vm.isRemovingSourceBranch = true;
+
+      Vue.nextTick(() => {
+        expect(
+          vm.$el.querySelector('.js-remove-source-branch').getAttribute('disabled'),
+        ).toBeTruthy();
+        done();
+      });
+    });
+
+    it('should render the status text as "...to merged automatically" if MWPS is selected', done => {
+      Vue.set(vm.mr, 'autoMergeStrategy', MWPS_MERGE_STRATEGY);
+
+      Vue.nextTick(() => {
+        const statusText = trimText(vm.$el.querySelector('.js-status-text-after-author').innerText);
+
+        expect(statusText).toBe('to be merged automatically when the pipeline succeeds');
+        done();
+      });
+    });
+
+    it('should render the cancel button as "Cancel automatic merge" if MWPS is selected', done => {
+      Vue.set(vm.mr, 'autoMergeStrategy', MWPS_MERGE_STRATEGY);
+
+      Vue.nextTick(() => {
+        const cancelButtonText = trimText(vm.$el.querySelector('.js-cancel-auto-merge').innerText);
+
+        expect(cancelButtonText).toBe('Cancel automatic merge');
+        done();
+      });
+    });
+  });
+});