Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

15 files changed, 29 insertions, 27 deletions

diff --git a/spec/contracts/consumer/.node-version b/spec/contracts/consumer/.node-version
deleted file mode 100644
index 18711d290ea..00000000000
--- a/spec/contracts/consumer/.node-version
+++ /dev/null
@@ -1 +0,0 @@
-14.17.5
diff --git a/spec/contracts/consumer/fixtures/project/merge_request/diffs_batch.fixture.js b/spec/contracts/consumer/fixtures/project/merge_requests/diffs_batch.fixture.js
index 673aad721b3..673aad721b3 100644
--- a/spec/contracts/consumer/fixtures/project/merge_request/diffs_batch.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/merge_requests/diffs_batch.fixture.js
diff --git a/spec/contracts/consumer/fixtures/project/merge_request/diffs_metadata.fixture.js b/spec/contracts/consumer/fixtures/project/merge_requests/diffs_metadata.fixture.js
index 2fee4a02023..2fee4a02023 100644
--- a/spec/contracts/consumer/fixtures/project/merge_request/diffs_metadata.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/merge_requests/diffs_metadata.fixture.js
diff --git a/spec/contracts/consumer/fixtures/project/merge_request/discussions.fixture.js b/spec/contracts/consumer/fixtures/project/merge_requests/discussions.fixture.js
index 8c392395e1c..8c392395e1c 100644
--- a/spec/contracts/consumer/fixtures/project/merge_request/discussions.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/merge_requests/discussions.fixture.js
diff --git a/spec/contracts/consumer/fixtures/project/pipeline_schedule/update_pipeline_schedule.fixture.js b/spec/contracts/consumer/fixtures/project/pipeline_schedules/update_pipeline_schedule.fixture.js
index acfab14851a..acfab14851a 100644
--- a/spec/contracts/consumer/fixtures/project/pipeline_schedule/update_pipeline_schedule.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/pipeline_schedules/update_pipeline_schedule.fixture.js
diff --git a/spec/contracts/consumer/fixtures/project/pipeline/create_a_new_pipeline.fixture.js b/spec/contracts/consumer/fixtures/project/pipelines/create_a_new_pipeline.fixture.js
index 68063d2fb0c..68063d2fb0c 100644
--- a/spec/contracts/consumer/fixtures/project/pipeline/create_a_new_pipeline.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/pipelines/create_a_new_pipeline.fixture.js
diff --git a/spec/contracts/consumer/fixtures/project/pipeline/delete_pipeline.fixture.js b/spec/contracts/consumer/fixtures/project/pipelines/delete_pipeline.fixture.js
index 2e3e7355b99..2e3e7355b99 100644
--- a/spec/contracts/consumer/fixtures/project/pipeline/delete_pipeline.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/pipelines/delete_pipeline.fixture.js
diff --git a/spec/contracts/consumer/fixtures/project/pipeline/get_list_project_pipelines.fixture.js b/spec/contracts/consumer/fixtures/project/pipelines/get_list_project_pipelines.fixture.js
index a982e927572..a982e927572 100644
--- a/spec/contracts/consumer/fixtures/project/pipeline/get_list_project_pipelines.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/pipelines/get_list_project_pipelines.fixture.js
diff --git a/spec/contracts/consumer/fixtures/project/pipeline/get_pipeline_header_data.fixture.js b/spec/contracts/consumer/fixtures/project/pipelines/get_pipeline_header_data.fixture.js
index b14a230d2e0..b14a230d2e0 100644
--- a/spec/contracts/consumer/fixtures/project/pipeline/get_pipeline_header_data.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/pipelines/get_pipeline_header_data.fixture.js
diff --git a/spec/contracts/consumer/package.json b/spec/contracts/consumer/package.json
index 6d3feaa6d4c..60f268806de 100644
--- a/spec/contracts/consumer/package.json
+++ b/spec/contracts/consumer/package.json
@@ -22,5 +22,8 @@
   "devDependencies": {
     "@babel/preset-env": "^7.18.2",
     "babel-jest": "^28.1.1"
+  },
+  "config": {
+    "pact_do_not_track": true
   }
 }
diff --git a/spec/contracts/consumer/specs/project/merge_request/show.spec.js b/spec/contracts/consumer/specs/project/merge_requests/show.spec.js
index 4183e19435a..fcc0e117e2d 100644
--- a/spec/contracts/consumer/specs/project/merge_request/show.spec.js
+++ b/spec/contracts/consumer/specs/project/merge_requests/show.spec.js
@@ -1,32 +1,32 @@
 import { pactWith } from 'jest-pact';
 
-import { DiffsBatch } from '../../../fixtures/project/merge_request/diffs_batch.fixture';
-import { Discussions } from '../../../fixtures/project/merge_request/discussions.fixture';
-import { DiffsMetadata } from '../../../fixtures/project/merge_request/diffs_metadata.fixture';
+import { DiffsBatch } from '../../../fixtures/project/merge_requests/diffs_batch.fixture';
+import { Discussions } from '../../../fixtures/project/merge_requests/discussions.fixture';
+import { DiffsMetadata } from '../../../fixtures/project/merge_requests/diffs_metadata.fixture';
 import {
   getDiffsBatch,
   getDiffsMetadata,
   getDiscussions,
 } from '../../../resources/api/project/merge_requests';
 
-const CONSUMER_NAME = 'MergeRequest#show';
+const CONSUMER_NAME = 'MergeRequests#show';
 const CONSUMER_LOG = '../logs/consumer.log';
-const CONTRACT_DIR = '../contracts/project/merge_request/show';
-const DIFFS_BATCH_PROVIDER_NAME = 'Merge Request Diffs Batch Endpoint';
-const DISCUSSIONS_PROVIDER_NAME = 'Merge Request Discussions Endpoint';
-const DIFFS_METADATA_PROVIDER_NAME = 'Merge Request Diffs Metadata Endpoint';
+const CONTRACT_DIR = '../contracts/project/merge_requests/show';
+const GET_DIFFS_BATCH_PROVIDER_NAME = 'GET diffs batch';
+const GET_DISCUSSIONS_PROVIDER_NAME = 'GET discussions';
+const GET_DIFFS_METADATA_PROVIDER_NAME = 'GET diffs metadata';
 
 // API endpoint: /merge_requests/:id/diffs_batch.json
 pactWith(
   {
     consumer: CONSUMER_NAME,
-    provider: DIFFS_BATCH_PROVIDER_NAME,
+    provider: GET_DIFFS_BATCH_PROVIDER_NAME,
     log: CONSUMER_LOG,
     dir: CONTRACT_DIR,
   },
 
   (provider) => {
-    describe(DIFFS_BATCH_PROVIDER_NAME, () => {
+    describe(GET_DIFFS_BATCH_PROVIDER_NAME, () => {
       beforeEach(() => {
         const interaction = {
           ...DiffsBatch.scenario,
@@ -50,13 +50,13 @@ pactWith(
 pactWith(
   {
     consumer: CONSUMER_NAME,
-    provider: DISCUSSIONS_PROVIDER_NAME,
+    provider: GET_DISCUSSIONS_PROVIDER_NAME,
     log: CONSUMER_LOG,
     dir: CONTRACT_DIR,
   },
 
   (provider) => {
-    describe(DISCUSSIONS_PROVIDER_NAME, () => {
+    describe(GET_DISCUSSIONS_PROVIDER_NAME, () => {
       beforeEach(() => {
         const interaction = {
           ...Discussions.scenario,
@@ -80,13 +80,13 @@ pactWith(
 pactWith(
   {
     consumer: CONSUMER_NAME,
-    provider: DIFFS_METADATA_PROVIDER_NAME,
+    provider: GET_DIFFS_METADATA_PROVIDER_NAME,
     log: CONSUMER_LOG,
     dir: CONTRACT_DIR,
   },
 
   (provider) => {
-    describe(DIFFS_METADATA_PROVIDER_NAME, () => {
+    describe(GET_DIFFS_METADATA_PROVIDER_NAME, () => {
       beforeEach(() => {
         const interaction = {
           ...DiffsMetadata.scenario,
diff --git a/spec/contracts/consumer/specs/project/pipeline_schedule/edit.spec.js b/spec/contracts/consumer/specs/project/pipeline_schedules/edit.spec.js
index 117e6754255..0924b1b3b3d 100644
--- a/spec/contracts/consumer/specs/project/pipeline_schedule/edit.spec.js
+++ b/spec/contracts/consumer/specs/project/pipeline_schedules/edit.spec.js
@@ -1,12 +1,12 @@
 import { pactWith } from 'jest-pact';
 
-import { UpdatePipelineSchedule } from '../../../fixtures/project/pipeline_schedule/update_pipeline_schedule.fixture';
+import { UpdatePipelineSchedule } from '../../../fixtures/project/pipeline_schedules/update_pipeline_schedule.fixture';
 import { updatePipelineSchedule } from '../../../resources/api/pipeline_schedules';
 
 const CONSUMER_NAME = 'PipelineSchedules#edit';
 const CONSUMER_LOG = '../logs/consumer.log';
-const CONTRACT_DIR = '../contracts/project/pipeline_schedule/edit';
-const PROVIDER_NAME = 'PUT Edit a pipeline schedule';
+const CONTRACT_DIR = '../contracts/project/pipeline_schedules/edit';
+const PROVIDER_NAME = 'PUT edit a pipeline schedule';
 
 // API endpoint: /pipelines.json
 pactWith(
diff --git a/spec/contracts/consumer/specs/project/pipeline/index.spec.js b/spec/contracts/consumer/specs/project/pipelines/index.spec.js
index 1453435d637..14bad31a763 100644
--- a/spec/contracts/consumer/specs/project/pipeline/index.spec.js
+++ b/spec/contracts/consumer/specs/project/pipelines/index.spec.js
@@ -1,12 +1,12 @@
 import { pactWith } from 'jest-pact';
 
-import { ProjectPipelines } from '../../../fixtures/project/pipeline/get_list_project_pipelines.fixture';
+import { ProjectPipelines } from '../../../fixtures/project/pipelines/get_list_project_pipelines.fixture';
 import { getProjectPipelines } from '../../../resources/api/project/pipelines';
 
 const CONSUMER_NAME = 'Pipelines#index';
 const CONSUMER_LOG = '../logs/consumer.log';
-const CONTRACT_DIR = '../contracts/project/pipeline/index';
-const PROVIDER_NAME = 'GET List project pipelines';
+const CONTRACT_DIR = '../contracts/project/pipelines/index';
+const PROVIDER_NAME = 'GET list project pipelines';
 
 // API endpoint: /pipelines.json
 pactWith(
diff --git a/spec/contracts/consumer/specs/project/pipeline/new.spec.js b/spec/contracts/consumer/specs/project/pipelines/new.spec.js
index c3824d5979e..9e381a61670 100644
--- a/spec/contracts/consumer/specs/project/pipeline/new.spec.js
+++ b/spec/contracts/consumer/specs/project/pipelines/new.spec.js
@@ -1,12 +1,12 @@
 import { pactWith } from 'jest-pact';
 
-import { NewProjectPipeline } from '../../../fixtures/project/pipeline/create_a_new_pipeline.fixture';
+import { NewProjectPipeline } from '../../../fixtures/project/pipelines/create_a_new_pipeline.fixture';
 import { postProjectPipelines } from '../../../resources/api/project/pipelines';
 
 const CONSUMER_NAME = 'Pipelines#new';
 const CONSUMER_LOG = '../logs/consumer.log';
-const CONTRACT_DIR = '../contracts/project/pipeline/new';
-const PROVIDER_NAME = 'POST Create a new pipeline';
+const CONTRACT_DIR = '../contracts/project/pipelines/new';
+const PROVIDER_NAME = 'POST create a new pipeline';
 
 // API endpoint: /pipelines.json
 pactWith(
diff --git a/spec/contracts/consumer/specs/project/pipeline/show.spec.js b/spec/contracts/consumer/specs/project/pipelines/show.spec.js
index be6abb78eb5..97ad9dbbc9d 100644
--- a/spec/contracts/consumer/specs/project/pipeline/show.spec.js
+++ b/spec/contracts/consumer/specs/project/pipelines/show.spec.js
@@ -3,14 +3,14 @@ import { GraphQLInteraction } from '@pact-foundation/pact';
 
 import { extractGraphQLQuery } from '../../../helpers/graphql_query_extractor';
 
-import { PipelineHeaderData } from '../../../fixtures/project/pipeline/get_pipeline_header_data.fixture';
-import { DeletePipeline } from '../../../fixtures/project/pipeline/delete_pipeline.fixture';
+import { PipelineHeaderData } from '../../../fixtures/project/pipelines/get_pipeline_header_data.fixture';
+import { DeletePipeline } from '../../../fixtures/project/pipelines/delete_pipeline.fixture';
 
 import { getPipelineHeaderDataRequest, deletePipeline } from '../../../resources/graphql/pipelines';
 
 const CONSUMER_NAME = 'Pipelines#show';
 const CONSUMER_LOG = '../logs/consumer.log';
-const CONTRACT_DIR = '../contracts/project/pipeline/show';
+const CONTRACT_DIR = '../contracts/project/pipelines/show';
 const GET_PIPELINE_HEADER_DATA_PROVIDER_NAME = 'GET pipeline header data';
 const DELETE_PIPELINE_PROVIDER_NAME = 'DELETE pipeline';