Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 2 deletions

diff --git a/spec/frontend/vue_shared/components/source_viewer/components/blame_info_spec.js b/spec/frontend/vue_shared/components/source_viewer/components/blame_info_spec.js
index 884ea621ec7..121bc691041 100644
--- a/spec/frontend/vue_shared/components/source_viewer/components/blame_info_spec.js
+++ b/spec/frontend/vue_shared/components/source_viewer/components/blame_info_spec.js
@@ -24,10 +24,11 @@ describe('BlameInfo component', () => {
 
   it.each(BLAME_DATA_MOCK)(
     'sets the correct data and positioning for the commitInfo',
-    ({ commit, index, blameOffset }) => {
+    ({ commit, commitData, index, blameOffset }) => {
       const commitInfoComponent = findCommitInfoComponents().at(index);
 
       expect(commitInfoComponent.props('commit')).toEqual(commit);
+      expect(commitInfoComponent.props('prevBlameLink')).toBe(commitData?.projectBlameLink || null);
       expect(commitInfoComponent.element.style.top).toBe(blameOffset);
     },
   );
diff --git a/spec/frontend/vue_shared/components/source_viewer/mock_data.js b/spec/frontend/vue_shared/components/source_viewer/mock_data.js
index 8e8f374b45d..cfff3a15b77 100644
--- a/spec/frontend/vue_shared/components/source_viewer/mock_data.js
+++ b/spec/frontend/vue_shared/components/source_viewer/mock_data.js
@@ -42,8 +42,16 @@ export const SOURCE_CODE_CONTENT_MOCK = `
   </div>
 </div>`;
 
+const COMMIT_DATA_MOCK = { projectBlameLink: 'project/blame/link' };
+
 export const BLAME_DATA_MOCK = [
-  { lineno: 1, commit: { author: 'Peter', sha: 'abc' }, index: 0, blameOffset: '0px' },
+  {
+    lineno: 1,
+    commit: { author: 'Peter', sha: 'abc' },
+    index: 0,
+    blameOffset: '0px',
+    commitData: COMMIT_DATA_MOCK,
+  },
   { lineno: 2, commit: { author: 'Sarah', sha: 'def' }, index: 1, blameOffset: '1px' },
   { lineno: 3, commit: { author: 'Peter', sha: 'ghi' }, index: 2, blameOffset: '2px' },
 ];
@@ -76,6 +84,7 @@ export const BLAME_DATA_QUERY_RESPONSE_MOCK = {
                       author: {},
                       sha: '13b0aca4142d1d55931577f69289a792f216f805',
                     },
+                    commitData: COMMIT_DATA_MOCK,
                   },
                 ],
               },