Merge branch 'fix-approvals-button' into 'master'

Fix "Remove your approval" button visibility for merged MRs

Closes #2439

See merge request !1936

app/assets/javascripts/vue_merge_request_widget/ee/components/approvals/approvals_footer.js

@@ -46,7 +46,8 @@ export default {
   },
   computed: {
     showUnapproveButton() {
-      return this.userHasApproved && !this.userCanApprove;
+      const isMerged = this.mr.state === 'merged';
+      return this.userHasApproved && !this.userCanApprove && !isMerged;
     },
   },
   methods: {

spec/javascripts/approvals/approvals_footer_spec.js

@@ -21,6 +21,10 @@ import ApprovalsFooter from '~/vue_merge_request_widget/ee/components/approvals/
     `);
 
     this.initialData = {
+      mr: {
+        state: 'readyToMerge',
+      },
+      service: {},
       userCanApprove: false,
       userHasApproved: true,
       approvedBy: [],
@@ -53,7 +57,9 @@ import ApprovalsFooter from '~/vue_merge_request_widget/ee/components/approvals/
 
     describe('Computed properties', function () {
       it('should correctly set showUnapproveButton when the user can unapprove', function () {
-        expect(this.approvalsFooter.showUnapproveButton).toBe(true);
+        expect(this.approvalsFooter.showUnapproveButton).toBeTruthy();
+        this.approvalsFooter.mr.state = 'merged';
+        expect(this.approvalsFooter.showUnapproveButton).toBeFalsy();
       });
 
       it('should correctly set showUnapproveButton when the user can not unapprove', function (done) {