Change default disabled merge request widget message to "Merge is not allowed yet"

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39188

1 files changed, 46 insertions, 0 deletions

diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
index d7019ea408b..df3d29ee1f9 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
@@ -43,6 +43,10 @@ describe('MRWidgetReadyToMerge', () => {
     vm = createComponent();
   });
 
+  afterEach(() => {
+    vm.$destroy();
+  });
+
   describe('props', () => {
     it('should have props', () => {
       const { mr, service } = readyToMergeComponent.props;
@@ -495,6 +499,48 @@ describe('MRWidgetReadyToMerge', () => {
     });
   });
 
+  describe('Merge controls', () => {
+    describe('when allowed to merge', () => {
+      beforeEach(() => {
+        vm = createComponent({
+          mr: { isMergeAllowed: true },
+        });
+      });
+
+      it('shows remove source branch checkbox', () => {
+        expect(vm.$el.querySelector('.js-remove-source-branch-checkbox')).toBeDefined();
+      });
+
+      it('shows modify commit message button', () => {
+        expect(vm.$el.querySelector('.js-modify-commit-message-button')).toBeDefined();
+      });
+
+      it('does not show message about needing to resolve items', () => {
+        expect(vm.$el.querySelector('.js-resolve-mr-widget-items-message')).toBeNull();
+      });
+    });
+
+    describe('when not allowed to merge', () => {
+      beforeEach(() => {
+        vm = createComponent({
+          mr: { isMergeAllowed: false },
+        });
+      });
+
+      it('does not show remove source branch checkbox', () => {
+        expect(vm.$el.querySelector('.js-remove-source-branch-checkbox')).toBeNull();
+      });
+
+      it('does not show  modify commit message button', () => {
+        expect(vm.$el.querySelector('.js-modify-commit-message-button')).toBeNull();
+      });
+
+      it('shows message to resolve all items before being allowed to merge', () => {
+        expect(vm.$el.querySelector('.js-resolve-mr-widget-items-message')).toBeDefined();
+      });
+    });
+  });
+
   describe('Commit message area', () => {
     it('when using merge commits, should show "Modify commit message" button', () => {
       const customVm = createComponent({