Fix removes source branch text being rendered in merged state

app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js

@@ -71,7 +71,8 @@ export default {
       return this.mr.deployments.length;
     },
     shouldRenderSourceBranchRemovalStatus() {
-      return !this.mr.canRemoveSourceBranch && this.mr.shouldRemoveSourceBranch;
+      return !this.mr.canRemoveSourceBranch && this.mr.shouldRemoveSourceBranch &&
+        (!this.mr.isNothingToMergeState && !this.mr.isMergedState);
     },
   },
   methods: {

app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js

@@ -125,6 +125,10 @@ export default class MergeRequestStore {
     return this.state === stateKey.nothingToMerge;
   }
 
+  get isMergedState() {
+    return this.state === stateKey.merged;
+  }
+
   initRebase(data) {
     this.canPushToSourceBranch = data.can_push_to_source_branch;
     this.rebaseInProgress = data.rebase_in_progress;

app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js

@@ -49,6 +49,7 @@ export const stateKey = {
   notAllowedToMerge: 'notAllowedToMerge',
   readyToMerge: 'readyToMerge',
   rebase: 'rebase',
+  merged: 'merged',
 };
 
 export default {

spec/javascripts/vue_mr_widget/mr_widget_options_spec.js

@@ -82,6 +82,10 @@ describe('mrWidgetOptions', () => {
     });
 
     describe('shouldRenderSourceBranchRemovalStatus', () => {
+      beforeEach(() => {
+        vm.mr.state = 'readyToMerge';
+      });
+
       it('should return true when cannot remove source branch and branch will be removed', () => {
         vm.mr.canRemoveSourceBranch = false;
         vm.mr.shouldRemoveSourceBranch = true;
@@ -102,6 +106,22 @@ describe('mrWidgetOptions', () => {
 
         expect(vm.shouldRenderSourceBranchRemovalStatus).toEqual(false);
       });
+
+      it('should return false when in merged state', () => {
+        vm.mr.canRemoveSourceBranch = false;
+        vm.mr.shouldRemoveSourceBranch = true;
+        vm.mr.state = 'merged';
+
+        expect(vm.shouldRenderSourceBranchRemovalStatus).toEqual(false);
+      });
+
+      it('should return false when in nothing to merge state', () => {
+        vm.mr.canRemoveSourceBranch = false;
+        vm.mr.shouldRemoveSourceBranch = true;
+        vm.mr.state = 'nothingToMerge';
+
+        expect(vm.shouldRenderSourceBranchRemovalStatus).toEqual(false);
+      });
     });
 
     describe('shouldRenderDeployments', () => {
@@ -419,5 +439,18 @@ describe('mrWidgetOptions', () => {
         done();
       });
     });
+
+    it('does not render in merged state', (done) => {
+      vm.mr.canRemoveSourceBranch = false;
+      vm.mr.shouldRemoveSourceBranch = true;
+      vm.mr.state = 'merged';
+
+      vm.$nextTick(() => {
+        expect(vm.$el.textContent).toContain('The source branch has been removed');
+        expect(vm.$el.textContent).not.toContain('Removes source branch');
+
+        done();
+      });
+    });
   });
 });