Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

2 files changed, 5 insertions, 3 deletions

diff --git a/spec/frontend/vue_shared/security_reports/components/manage_via_mr_spec.js b/spec/frontend/vue_shared/security_reports/components/manage_via_mr_spec.js
index facbd51168c..39909e26ef0 100644
--- a/spec/frontend/vue_shared/security_reports/components/manage_via_mr_spec.js
+++ b/spec/frontend/vue_shared/security_reports/components/manage_via_mr_spec.js
@@ -16,7 +16,7 @@ jest.mock('~/lib/utils/url_utility');
 
 Vue.use(VueApollo);
 
-const projectPath = 'namespace/project';
+const projectFullPath = 'namespace/project';
 
 describe('ManageViaMr component', () => {
   let wrapper;
@@ -40,7 +40,7 @@ describe('ManageViaMr component', () => {
     wrapper = extendedWrapper(
       mount(ManageViaMr, {
         provide: {
-          projectPath,
+          projectFullPath,
         },
         propsData: {
           feature: {
@@ -65,7 +65,7 @@ describe('ManageViaMr component', () => {
   // the ones available in the current test context.
   const supportedReportTypes = Object.entries(featureToMutationMap).map(
     ([featureType, { getMutationPayload, mutationId }]) => {
-      const { mutation, variables: mutationVariables } = getMutationPayload(projectPath);
+      const { mutation, variables: mutationVariables } = getMutationPayload(projectFullPath);
       return [humanize(featureType), featureType, mutation, mutationId, mutationVariables];
     },
   );
diff --git a/spec/frontend/vue_shared/security_reports/mock_data.js b/spec/frontend/vue_shared/security_reports/mock_data.js
index 2b1513bb0f8..dac9accbbf5 100644
--- a/spec/frontend/vue_shared/security_reports/mock_data.js
+++ b/spec/frontend/vue_shared/security_reports/mock_data.js
@@ -324,7 +324,9 @@ export const secretDetectionDiffSuccessMock = {
 
 export const securityReportMergeRequestDownloadPathsQueryNoArtifactsResponse = {
   project: {
+    id: 'project-1',
     mergeRequest: {
+      id: 'mr-1',
       headPipeline: {
         id: 'gid://gitlab/Ci::Pipeline/176',
         jobs: {