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

4 files changed, 22 insertions, 4 deletions

diff --git a/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap b/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap
index 2ac6e0d5d24..005b2c5da1c 100644
--- a/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap
+++ b/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap
@@ -14,7 +14,7 @@ exports[`Blob Header Filepath rendering matches the snapshot 1`] = `
    
   <strong
     class="file-title-name mr-1 js-blob-header-filepath"
-    data-qa-selector="file_title_name"
+    data-qa-selector="file_title_content"
   >
     foo/bar/dummy.md
   </strong>
diff --git a/spec/frontend/blob/components/blob_header_default_actions_spec.js b/spec/frontend/blob/components/blob_header_default_actions_spec.js
index 684840afe1c..0247a12d8d3 100644
--- a/spec/frontend/blob/components/blob_header_default_actions_spec.js
+++ b/spec/frontend/blob/components/blob_header_default_actions_spec.js
@@ -66,5 +66,13 @@ describe('Blob Header Default Actions', () => {
 
       expect(buttons.at(0).attributes('disabled')).toBeTruthy();
     });
+
+    it('does not render the copy button if a rendering error is set', () => {
+      createComponent({
+        hasRenderError: true,
+      });
+
+      expect(wrapper.find('[data-testid="copyContentsButton"]').exists()).toBe(false);
+    });
   });
 });
diff --git a/spec/frontend/blob/components/blob_header_filepath_spec.js b/spec/frontend/blob/components/blob_header_filepath_spec.js
index 3a53208f357..43057353051 100644
--- a/spec/frontend/blob/components/blob_header_filepath_spec.js
+++ b/spec/frontend/blob/components/blob_header_filepath_spec.js
@@ -4,9 +4,8 @@ import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import { Blob as MockBlob } from './mock_data';
 import { numberToHumanSize } from '~/lib/utils/number_utils';
 
-const mockHumanReadableSize = 'a lot';
 jest.mock('~/lib/utils/number_utils', () => ({
-  numberToHumanSize: jest.fn(() => mockHumanReadableSize),
+  numberToHumanSize: jest.fn(() => 'a lot'),
 }));
 
 describe('Blob Header Filepath', () => {
@@ -57,7 +56,7 @@ describe('Blob Header Filepath', () => {
     it('renders filesize in a human-friendly format', () => {
       createComponent();
       expect(numberToHumanSize).toHaveBeenCalled();
-      expect(wrapper.vm.blobSize).toBe(mockHumanReadableSize);
+      expect(wrapper.vm.blobSize).toBe('a lot');
     });
 
     it('renders a slot and prepends its contents to the existing one', () => {
diff --git a/spec/frontend/blob/components/blob_header_spec.js b/spec/frontend/blob/components/blob_header_spec.js
index 0e7d2f6516a..01d4bf834d2 100644
--- a/spec/frontend/blob/components/blob_header_spec.js
+++ b/spec/frontend/blob/components/blob_header_spec.js
@@ -87,6 +87,17 @@ describe('Blob Header Default Actions', () => {
         expect(wrapper.text()).toContain(slotContent);
       });
     });
+
+    it('passes information about render error down to default actions', () => {
+      createComponent(
+        {},
+        {},
+        {
+          hasRenderError: true,
+        },
+      );
+      expect(wrapper.find(DefaultActions).props('hasRenderError')).toBe(true);
+    });
   });
 
   describe('functionality', () => {