Add latest changes from gitlab-org/gitlab@master

3 files changed, 16 insertions, 4 deletions

diff --git a/spec/frontend/vue_shared/components/source_viewer/components/chunk_line_spec.js b/spec/frontend/vue_shared/components/source_viewer/components/chunk_line_spec.js
index eb2eec92534..525f8983971 100644
--- a/spec/frontend/vue_shared/components/source_viewer/components/chunk_line_spec.js
+++ b/spec/frontend/vue_shared/components/source_viewer/components/chunk_line_spec.js
@@ -11,6 +11,7 @@ const DEFAULT_PROPS = {
   number: 2,
   content: '// Line content',
   language: 'javascript',
+  blamePath: 'blame/file.js',
 };
 
 describe('Chunk Line component', () => {
@@ -20,7 +21,7 @@ describe('Chunk Line component', () => {
     wrapper = shallowMountExtended(ChunkLine, { propsData: { ...DEFAULT_PROPS, ...props } });
   };
 
-  const findLink = () => wrapper.findComponent(GlLink);
+  const findLinks = () => wrapper.findAllComponents(GlLink);
   const findContent = () => wrapper.findByTestId('content');
   const findWrappedBidiChars = () => wrapper.findAllByTestId('bidi-wrapper');
 
@@ -47,14 +48,22 @@ describe('Chunk Line component', () => {
       });
     });
 
+    it('renders a blame link', () => {
+      expect(findLinks().at(0).attributes()).toMatchObject({
+        href: `${DEFAULT_PROPS.blamePath}#L${DEFAULT_PROPS.number}`,
+      });
+
+      expect(findLinks().at(0).text()).toBe('');
+    });
+
     it('renders a line number', () => {
-      expect(findLink().attributes()).toMatchObject({
+      expect(findLinks().at(1).attributes()).toMatchObject({
         'data-line-number': `${DEFAULT_PROPS.number}`,
         to: `#L${DEFAULT_PROPS.number}`,
         id: `L${DEFAULT_PROPS.number}`,
       });
 
-      expect(findLink().text()).toBe(DEFAULT_PROPS.number.toString());
+      expect(findLinks().at(1).text()).toBe(DEFAULT_PROPS.number.toString());
     });
 
     it('renders content', () => {
diff --git a/spec/frontend/vue_shared/components/source_viewer/components/chunk_spec.js b/spec/frontend/vue_shared/components/source_viewer/components/chunk_spec.js
index 42c4f2eacb8..8dc3348acfa 100644
--- a/spec/frontend/vue_shared/components/source_viewer/components/chunk_spec.js
+++ b/spec/frontend/vue_shared/components/source_viewer/components/chunk_spec.js
@@ -10,6 +10,7 @@ const DEFAULT_PROPS = {
   startingFrom: 140,
   totalLines: 50,
   language: 'javascript',
+  blamePath: 'blame/file.js',
 };
 
 describe('Chunk component', () => {
@@ -76,6 +77,7 @@ describe('Chunk component', () => {
         number: DEFAULT_PROPS.startingFrom + 1,
         content: splitContent[0],
         language: DEFAULT_PROPS.language,
+        blamePath: DEFAULT_PROPS.blamePath,
       });
     });
   });
diff --git a/spec/frontend/vue_shared/components/source_viewer/source_viewer_spec.js b/spec/frontend/vue_shared/components/source_viewer/source_viewer_spec.js
index 9d389db4060..86b1506cf61 100644
--- a/spec/frontend/vue_shared/components/source_viewer/source_viewer_spec.js
+++ b/spec/frontend/vue_shared/components/source_viewer/source_viewer_spec.js
@@ -40,7 +40,8 @@ describe('Source Viewer component', () => {
   const chunk2 = generateContent('// Some source code 2', 70);
   const content = chunk1 + chunk2;
   const path = 'some/path.js';
-  const DEFAULT_BLOB_DATA = { language, rawTextBlob: content, path };
+  const blamePath = 'some/blame/path.js';
+  const DEFAULT_BLOB_DATA = { language, rawTextBlob: content, path, blamePath };
   const highlightedContent = `<span data-testid='test-highlighted' id='LC1'>${content}</span><span id='LC2'></span>`;
 
   const createComponent = async (blob = {}) => {