Merge branch '29249-show-download-diff-even-when-merge-request-is-closed' into 'master'

Resolve "Show download diff even when merge request is closed"

Closes #29249

See merge request gitlab-org/gitlab-ce!26772

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue

@@ -109,7 +109,8 @@ export default {
         ></div>
       </div>
 
-      <div v-if="mr.isOpen" class="branch-actions d-flex">
+      <div class="branch-actions d-flex">
+        <template v-if="mr.isOpen">
           <a
             v-if="!mr.sourceBranchRemoved"
             v-tooltip
@@ -132,6 +133,7 @@ export default {
           >
             {{ s__('mrWidget|Check out branch') }}
           </button>
+        </template>
         <span class="dropdown">
           <button
             type="button"

changelogs/unreleased/29249-show-download-diff-even-when-merge-request-is-closed.yml

+---
+title: Show download diff links for closed MRs
+merge_request: 26772
+author:
+type: changed

spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js

@@ -15,6 +15,16 @@ describe('MRWidgetHeader', () => {
     gon.relative_url_root = '';
   });
 
+  const expectDownloadDropdownItems = () => {
+    const downloadEmailPatchesEl = vm.$el.querySelector('.js-download-email-patches');
+    const downloadPlainDiffEl = vm.$el.querySelector('.js-download-plain-diff');
+
+    expect(downloadEmailPatchesEl.textContent.trim()).toEqual('Email patches');
+    expect(downloadEmailPatchesEl.getAttribute('href')).toEqual('/mr/email-patches');
+    expect(downloadPlainDiffEl.textContent.trim()).toEqual('Plain diff');
+    expect(downloadPlainDiffEl.getAttribute('href')).toEqual('/mr/plainDiffPath');
+  };
+
   describe('computed', () => {
     describe('shouldShowCommitsBehindText', () => {
       it('return true when there are divergedCommitsCount', () => {
@@ -207,21 +217,7 @@ describe('MRWidgetHeader', () => {
       });
 
       it('renders download dropdown with links', () => {
-        expect(vm.$el.querySelector('.js-download-email-patches').textContent.trim()).toEqual(
-          'Email patches',
-        );
-
-        expect(vm.$el.querySelector('.js-download-email-patches').getAttribute('href')).toEqual(
-          '/mr/email-patches',
-        );
-
-        expect(vm.$el.querySelector('.js-download-plain-diff').textContent.trim()).toEqual(
-          'Plain diff',
-        );
-
-        expect(vm.$el.querySelector('.js-download-plain-diff').getAttribute('href')).toEqual(
-          '/mr/plainDiffPath',
-        );
+        expectDownloadDropdownItems();
       });
     });
 
@@ -250,10 +246,8 @@ describe('MRWidgetHeader', () => {
         expect(button).toEqual(null);
       });
 
-      it('does not render download dropdown with links', () => {
-        expect(vm.$el.querySelector('.js-download-email-patches')).toEqual(null);
-
-        expect(vm.$el.querySelector('.js-download-plain-diff')).toEqual(null);
+      it('renders download dropdown with links', () => {
+        expectDownloadDropdownItems();
       });
     });