Add latest changes from gitlab-org/gitlab@master

29 files changed, 138 insertions, 194 deletions

diff --git a/spec/contracts/consumer/endpoints/project/pipelines.js b/spec/contracts/consumer/endpoints/project/pipelines.js
deleted file mode 100644
index 33758dee75b..00000000000
--- a/spec/contracts/consumer/endpoints/project/pipelines.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { request } from 'axios';
-
-export function getProjectPipelines(endpoint) {
-  const { url } = endpoint;
-
-  return request({
-    method: 'GET',
-    baseURL: url,
-    url: '/gitlab-org/gitlab-qa/-/pipelines.json',
-    headers: { Accept: '*/*' },
-    params: {
-      scope: 'all',
-      page: 1,
-    },
-  }).then((response) => response.data);
-}
diff --git a/spec/contracts/consumer/fixtures/project/merge_request/diffs_batch.fixture.js b/spec/contracts/consumer/fixtures/project/merge_request/diffs_batch.fixture.js
index b53e4bb335d..673aad721b3 100644
--- a/spec/contracts/consumer/fixtures/project/merge_request/diffs_batch.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/merge_request/diffs_batch.fixture.js
@@ -1,5 +1,3 @@
-/* eslint-disable @gitlab/require-i18n-strings */
-
 import { Matchers } from '@pact-foundation/pact';
 
 const body = {
@@ -73,8 +71,12 @@ const DiffsBatch = {
     body,
   },
 
-  request: {
+  scenario: {
+    state: 'a merge request with diffs exists',
     uponReceiving: 'a request for diff lines',
+  },
+
+  request: {
     withRequest: {
       method: 'GET',
       path: '/gitlab-org/gitlab-qa/-/merge_requests/1/diffs_batch.json',
@@ -87,5 +89,3 @@ const DiffsBatch = {
 };
 
 export { DiffsBatch };
-
-/* eslint-enable @gitlab/require-i18n-strings */
diff --git a/spec/contracts/consumer/fixtures/project/merge_request/diffs_metadata.fixture.js b/spec/contracts/consumer/fixtures/project/merge_request/diffs_metadata.fixture.js
index 39dbcf78ee7..2fee4a02023 100644
--- a/spec/contracts/consumer/fixtures/project/merge_request/diffs_metadata.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/merge_request/diffs_metadata.fixture.js
@@ -1,5 +1,3 @@
-/* eslint-disable @gitlab/require-i18n-strings */
-
 import { Matchers } from '@pact-foundation/pact';
 
 const body = {
@@ -81,8 +79,12 @@ const DiffsMetadata = {
     body,
   },
 
+  scenario: {
+    state: 'a merge request exists',
+    uponReceiving: 'a request for diffs metadata',
+  },
+
   request: {
-    uponReceiving: 'a request for Diffs Metadata',
     withRequest: {
       method: 'GET',
       path: '/gitlab-org/gitlab-qa/-/merge_requests/1/diffs_metadata.json',
@@ -94,5 +96,3 @@ const DiffsMetadata = {
 };
 
 export { DiffsMetadata };
-
-/* eslint-enable @gitlab/require-i18n-strings */
diff --git a/spec/contracts/consumer/fixtures/project/merge_request/discussions.fixture.js b/spec/contracts/consumer/fixtures/project/merge_request/discussions.fixture.js
index af0962a01cb..8c392395e1c 100644
--- a/spec/contracts/consumer/fixtures/project/merge_request/discussions.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/merge_request/discussions.fixture.js
@@ -1,5 +1,3 @@
-/* eslint-disable @gitlab/require-i18n-strings */
-
 import { Matchers } from '@pact-foundation/pact';
 
 const body = Matchers.eachLike({
@@ -70,8 +68,12 @@ const Discussions = {
     body,
   },
 
-  request: {
+  scenario: {
+    state: 'a merge request with discussions exists',
     uponReceiving: 'a request for discussions',
+  },
+
+  request: {
     withRequest: {
       method: 'GET',
       path: '/gitlab-org/gitlab-qa/-/merge_requests/1/discussions.json',
@@ -83,5 +85,3 @@ const Discussions = {
 };
 
 export { Discussions };
-
-/* eslint-enable @gitlab/require-i18n-strings */
diff --git a/spec/contracts/consumer/fixtures/project/pipeline/create_a_new_pipeline.fixture.js b/spec/contracts/consumer/fixtures/project/pipeline/create_a_new_pipeline.fixture.js
index a732189e6fb..68063d2fb0c 100644
--- a/spec/contracts/consumer/fixtures/project/pipeline/create_a_new_pipeline.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/pipeline/create_a_new_pipeline.fixture.js
@@ -1,5 +1,3 @@
-/* eslint-disable @gitlab/require-i18n-strings */
-
 import { Matchers } from '@pact-foundation/pact';
 import { REDIRECT_HTML } from '../../../helpers/common_regex_patterns';
 
@@ -39,5 +37,3 @@ const NewProjectPipeline = {
 };
 
 export { NewProjectPipeline };
-
-/* eslint-enable @gitlab/require-i18n-strings */
diff --git a/spec/contracts/consumer/fixtures/project/pipeline/delete_pipeline.fixture.js b/spec/contracts/consumer/fixtures/project/pipeline/delete_pipeline.fixture.js
index 4dbb694064b..2e3e7355b99 100644
--- a/spec/contracts/consumer/fixtures/project/pipeline/delete_pipeline.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/pipeline/delete_pipeline.fixture.js
@@ -6,6 +6,11 @@ const DeletePipeline = {
     },
   },
 
+  scenario: {
+    state: 'a pipeline for a project exists',
+    uponReceiving: 'a request to delete the pipeline',
+  },
+
   request: {
     method: 'POST',
     path: '/api/graphql',
diff --git a/spec/contracts/consumer/fixtures/project/pipeline/get_list_project_pipelines.fixture.js b/spec/contracts/consumer/fixtures/project/pipeline/get_list_project_pipelines.fixture.js
index 8a7663325b9..a982e927572 100644
--- a/spec/contracts/consumer/fixtures/project/pipeline/get_list_project_pipelines.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/pipeline/get_list_project_pipelines.fixture.js
@@ -1,5 +1,3 @@
-/* eslint-disable @gitlab/require-i18n-strings */
-
 import { Matchers } from '@pact-foundation/pact';
 import {
   URL,
@@ -225,8 +223,12 @@ const ProjectPipelines = {
     body,
   },
 
-  request: {
+  scenario: {
+    state: 'a few pipelines for a project exists',
     uponReceiving: 'a request for a list of project pipelines',
+  },
+
+  request: {
     withRequest: {
       method: 'GET',
       path: '/gitlab-org/gitlab-qa/-/pipelines.json',
@@ -239,5 +241,3 @@ const ProjectPipelines = {
 };
 
 export { ProjectPipelines };
-
-/* eslint-enable @gitlab/require-i18n-strings */
diff --git a/spec/contracts/consumer/fixtures/project/pipeline/get_pipeline_header_data.fixture.js b/spec/contracts/consumer/fixtures/project/pipeline/get_pipeline_header_data.fixture.js
index f51ed9c2c74..b14a230d2e0 100644
--- a/spec/contracts/consumer/fixtures/project/pipeline/get_pipeline_header_data.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/pipeline/get_pipeline_header_data.fixture.js
@@ -1,5 +1,3 @@
-/* eslint-disable @gitlab/require-i18n-strings */
-
 import { Matchers } from '@pact-foundation/pact';
 import {
   JOB_STATUSES,
@@ -83,6 +81,11 @@ const PipelineHeaderData = {
     body,
   },
 
+  scenario: {
+    state: 'a pipeline for a project exists',
+    uponReceiving: 'a request for the pipeline header data',
+  },
+
   request: {
     method: 'POST',
     path: '/api/graphql',
@@ -95,5 +98,3 @@ const PipelineHeaderData = {
 };
 
 export { PipelineHeaderData };
-
-/* eslint-enable @gitlab/require-i18n-strings */
diff --git a/spec/contracts/consumer/fixtures/project/pipeline_schedule/update_pipeline_schedule.fixture.js b/spec/contracts/consumer/fixtures/project/pipeline_schedule/update_pipeline_schedule.fixture.js
index acdc94d5c6e..acfab14851a 100644
--- a/spec/contracts/consumer/fixtures/project/pipeline_schedule/update_pipeline_schedule.fixture.js
+++ b/spec/contracts/consumer/fixtures/project/pipeline_schedule/update_pipeline_schedule.fixture.js
@@ -1,5 +1,3 @@
-/* eslint-disable @gitlab/require-i18n-strings */
-
 import { Matchers } from '@pact-foundation/pact';
 import { REDIRECT_HTML } from '../../../helpers/common_regex_patterns';
 
@@ -44,5 +42,3 @@ const UpdatePipelineSchedule = {
 };
 
 export { UpdatePipelineSchedule };
-
-/* eslint-enable @gitlab/require-i18n-strings */
diff --git a/spec/contracts/consumer/endpoints/project/merge_requests.js b/spec/contracts/consumer/resources/api/project/merge_requests.js
index 38773e5fb10..e52743cede2 100644
--- a/spec/contracts/consumer/endpoints/project/merge_requests.js
+++ b/spec/contracts/consumer/resources/api/project/merge_requests.js
@@ -1,9 +1,9 @@
-import { request } from 'axios';
+import axios from 'axios';
 
-export function getDiffsMetadata(endpoint) {
+export async function getDiffsMetadata(endpoint) {
   const { url } = endpoint;
 
-  return request({
+  return axios({
     method: 'GET',
     baseURL: url,
     url: '/gitlab-org/gitlab-qa/-/merge_requests/1/diffs_metadata.json',
@@ -11,10 +11,10 @@ export function getDiffsMetadata(endpoint) {
   }).then((response) => response.data);
 }
 
-export function getDiscussions(endpoint) {
+export async function getDiscussions(endpoint) {
   const { url } = endpoint;
 
-  return request({
+  return axios({
     method: 'GET',
     baseURL: url,
     url: '/gitlab-org/gitlab-qa/-/merge_requests/1/discussions.json',
@@ -22,10 +22,10 @@ export function getDiscussions(endpoint) {
   }).then((response) => response.data);
 }
 
-export function getDiffsBatch(endpoint) {
+export async function getDiffsBatch(endpoint) {
   const { url } = endpoint;
 
-  return request({
+  return axios({
     method: 'GET',
     baseURL: url,
     url: '/gitlab-org/gitlab-qa/-/merge_requests/1/diffs_batch.json?page=0',
diff --git a/spec/contracts/consumer/resources/api/project/pipelines.js b/spec/contracts/consumer/resources/api/project/pipelines.js
index f58a7a5fb0f..8c6f5199666 100644
--- a/spec/contracts/consumer/resources/api/project/pipelines.js
+++ b/spec/contracts/consumer/resources/api/project/pipelines.js
@@ -1,5 +1,20 @@
 import axios from 'axios';
 
+export async function getProjectPipelines(endpoint) {
+  const { url } = endpoint;
+
+  return axios({
+    method: 'GET',
+    baseURL: url,
+    url: '/gitlab-org/gitlab-qa/-/pipelines.json',
+    headers: { Accept: '*/*' },
+    params: {
+      scope: 'all',
+      page: 1,
+    },
+  }).then((response) => response.data);
+}
+
 export async function postProjectPipelines(endpoint) {
   const { url } = endpoint;
 
diff --git a/spec/contracts/consumer/specs/project/merge_request/show.spec.js b/spec/contracts/consumer/specs/project/merge_request/show.spec.js
index 8c6e029cb12..4183e19435a 100644
--- a/spec/contracts/consumer/specs/project/merge_request/show.spec.js
+++ b/spec/contracts/consumer/specs/project/merge_request/show.spec.js
@@ -1,5 +1,3 @@
-/* eslint-disable @gitlab/require-i18n-strings */
-
 import { pactWith } from 'jest-pact';
 
 import { DiffsBatch } from '../../../fixtures/project/merge_request/diffs_batch.fixture';
@@ -9,7 +7,7 @@ import {
   getDiffsBatch,
   getDiffsMetadata,
   getDiscussions,
-} from '../../../endpoints/project/merge_requests';
+} from '../../../resources/api/project/merge_requests';
 
 const CONSUMER_NAME = 'MergeRequest#show';
 const CONSUMER_LOG = '../logs/consumer.log';
@@ -31,19 +29,19 @@ pactWith(
     describe(DIFFS_BATCH_PROVIDER_NAME, () => {
       beforeEach(() => {
         const interaction = {
-          state: 'a merge request with diffs exists',
+          ...DiffsBatch.scenario,
           ...DiffsBatch.request,
           willRespondWith: DiffsBatch.success,
         };
         provider.addInteraction(interaction);
       });
 
-      it('returns a successful body', () => {
-        return getDiffsBatch({
+      it('returns a successful body', async () => {
+        const diffsBatch = await getDiffsBatch({
           url: provider.mockService.baseUrl,
-        }).then((diffsBatch) => {
-          expect(diffsBatch).toEqual(DiffsBatch.body);
         });
+
+        expect(diffsBatch).toEqual(DiffsBatch.body);
       });
     });
   },
@@ -61,19 +59,19 @@ pactWith(
     describe(DISCUSSIONS_PROVIDER_NAME, () => {
       beforeEach(() => {
         const interaction = {
-          state: 'a merge request with discussions exists',
+          ...Discussions.scenario,
           ...Discussions.request,
           willRespondWith: Discussions.success,
         };
         provider.addInteraction(interaction);
       });
 
-      it('return a successful body', () => {
-        return getDiscussions({
+      it('return a successful body', async () => {
+        const discussions = await getDiscussions({
           url: provider.mockService.baseUrl,
-        }).then((discussions) => {
-          expect(discussions).toEqual(Discussions.body);
         });
+
+        expect(discussions).toEqual(Discussions.body);
       });
     });
   },
@@ -91,22 +89,20 @@ pactWith(
     describe(DIFFS_METADATA_PROVIDER_NAME, () => {
       beforeEach(() => {
         const interaction = {
-          state: 'a merge request exists',
+          ...DiffsMetadata.scenario,
           ...DiffsMetadata.request,
           willRespondWith: DiffsMetadata.success,
         };
         provider.addInteraction(interaction);
       });
 
-      it('return a successful body', () => {
-        return getDiffsMetadata({
+      it('return a successful body', async () => {
+        const diffsMetadata = await getDiffsMetadata({
           url: provider.mockService.baseUrl,
-        }).then((diffsMetadata) => {
-          expect(diffsMetadata).toEqual(DiffsMetadata.body);
         });
+
+        expect(diffsMetadata).toEqual(DiffsMetadata.body);
       });
     });
   },
 );
-
-/* eslint-enable @gitlab/require-i18n-strings */
diff --git a/spec/contracts/consumer/specs/project/pipeline/index.spec.js b/spec/contracts/consumer/specs/project/pipeline/index.spec.js
index 1c0358a3e28..1453435d637 100644
--- a/spec/contracts/consumer/specs/project/pipeline/index.spec.js
+++ b/spec/contracts/consumer/specs/project/pipeline/index.spec.js
@@ -1,9 +1,7 @@
-/* eslint-disable @gitlab/require-i18n-strings */
-
 import { pactWith } from 'jest-pact';
 
 import { ProjectPipelines } from '../../../fixtures/project/pipeline/get_list_project_pipelines.fixture';
-import { getProjectPipelines } from '../../../endpoints/project/pipelines';
+import { getProjectPipelines } from '../../../resources/api/project/pipelines';
 
 const CONSUMER_NAME = 'Pipelines#index';
 const CONSUMER_LOG = '../logs/consumer.log';
@@ -23,22 +21,20 @@ pactWith(
     describe(PROVIDER_NAME, () => {
       beforeEach(() => {
         const interaction = {
-          state: 'a few pipelines for a project exists',
+          ...ProjectPipelines.scenario,
           ...ProjectPipelines.request,
           willRespondWith: ProjectPipelines.success,
         };
         provider.addInteraction(interaction);
       });
 
-      it('returns a successful body', () => {
-        return getProjectPipelines({
+      it('returns a successful body', async () => {
+        const pipelines = await getProjectPipelines({
           url: provider.mockService.baseUrl,
-        }).then((pipelines) => {
-          expect(pipelines).toEqual(ProjectPipelines.body);
         });
+
+        expect(pipelines).toEqual(ProjectPipelines.body);
       });
     });
   },
 );
-
-/* eslint-enable @gitlab/require-i18n-strings */
diff --git a/spec/contracts/consumer/specs/project/pipeline/new.spec.js b/spec/contracts/consumer/specs/project/pipeline/new.spec.js
index 621b31af52d..c3824d5979e 100644
--- a/spec/contracts/consumer/specs/project/pipeline/new.spec.js
+++ b/spec/contracts/consumer/specs/project/pipeline/new.spec.js
@@ -1,5 +1,3 @@
-/* eslint-disable @gitlab/require-i18n-strings */
-
 import { pactWith } from 'jest-pact';
 
 import { NewProjectPipeline } from '../../../fixtures/project/pipeline/create_a_new_pipeline.fixture';
@@ -41,5 +39,3 @@ pactWith(
     });
   },
 );
-
-/* eslint-enable @gitlab/require-i18n-strings */
diff --git a/spec/contracts/consumer/specs/project/pipeline/show.spec.js b/spec/contracts/consumer/specs/project/pipeline/show.spec.js
index 2c5ba964e2e..be6abb78eb5 100644
--- a/spec/contracts/consumer/specs/project/pipeline/show.spec.js
+++ b/spec/contracts/consumer/specs/project/pipeline/show.spec.js
@@ -1,5 +1,3 @@
-/* eslint-disable @gitlab/require-i18n-strings */
-
 import { pactWith } from 'jest-pact';
 import { GraphQLInteraction } from '@pact-foundation/pact';
 
@@ -32,8 +30,8 @@ pactWith(
           'app/assets/javascripts/pipelines/graphql/queries/get_pipeline_header_data.query.graphql',
         );
         const graphqlQuery = new GraphQLInteraction()
-          .given('a pipeline for a project exists')
-          .uponReceiving('a request for the pipeline header data')
+          .given(PipelineHeaderData.scenario.state)
+          .uponReceiving(PipelineHeaderData.scenario.uponReceiving)
           .withQuery(query)
           .withRequest(PipelineHeaderData.request)
           .withVariables(PipelineHeaderData.variables)
@@ -69,8 +67,8 @@ pactWith(
           'app/assets/javascripts/pipelines/graphql/mutations/delete_pipeline.mutation.graphql',
         );
         const graphqlQuery = new GraphQLInteraction()
-          .given('a pipeline for a project exists')
-          .uponReceiving('a request to delete the pipeline')
+          .given(DeletePipeline.scenario.state)
+          .uponReceiving(DeletePipeline.scenario.uponReceiving)
           .withQuery(query)
           .withRequest(DeletePipeline.request)
           .withVariables(DeletePipeline.variables)
@@ -89,5 +87,3 @@ pactWith(
     });
   },
 );
-
-/* eslint-enable @gitlab/require-i18n-strings */
diff --git a/spec/contracts/consumer/specs/project/pipeline_schedule/edit.spec.js b/spec/contracts/consumer/specs/project/pipeline_schedule/edit.spec.js
index 7d89825bcd4..117e6754255 100644
--- a/spec/contracts/consumer/specs/project/pipeline_schedule/edit.spec.js
+++ b/spec/contracts/consumer/specs/project/pipeline_schedule/edit.spec.js
@@ -1,5 +1,3 @@
-/* eslint-disable @gitlab/require-i18n-strings */
-
 import { pactWith } from 'jest-pact';
 
 import { UpdatePipelineSchedule } from '../../../fixtures/project/pipeline_schedule/update_pipeline_schedule.fixture';
@@ -41,5 +39,3 @@ pactWith(
     });
   },
 );
-
-/* eslint-enable @gitlab/require-i18n-strings */
diff --git a/spec/contracts/contracts/project/merge_request/show/mergerequest#show-merge_request_diffs_metadata_endpoint.json b/spec/contracts/contracts/project/merge_request/show/mergerequest#show-merge_request_diffs_metadata_endpoint.json
index b98a0127e54..c59a3d55f43 100644
--- a/spec/contracts/contracts/project/merge_request/show/mergerequest#show-merge_request_diffs_metadata_endpoint.json
+++ b/spec/contracts/contracts/project/merge_request/show/mergerequest#show-merge_request_diffs_metadata_endpoint.json
@@ -7,7 +7,7 @@
   },
   "interactions": [
     {
-      "description": "a request for Diffs Metadata",
+      "description": "a request for diffs metadata",
       "providerState": "a merge request exists",
       "request": {
         "method": "GET",
@@ -220,4 +220,4 @@
       "version": "2.0.0"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/spec/contracts/provider/pact_helpers/project/merge_request/diffs_batch_helper.rb b/spec/contracts/provider/pact_helpers/project/merge_request/show/diffs_batch_helper.rb
index 7d1fbe91e86..f94ce47b1f3 100644
--- a/spec/contracts/provider/pact_helpers/project/merge_request/diffs_batch_helper.rb
+++ b/spec/contracts/provider/pact_helpers/project/merge_request/show/diffs_batch_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../../spec_helper'
-require_relative '../../../states/project/merge_request/diffs_batch_state'
+require_relative '../../../../spec_helper'
+require_relative '../../../../states/project/merge_request/show_state'
 
 module Provider
   module DiffsBatchHelper
diff --git a/spec/contracts/provider/pact_helpers/project/merge_request/diffs_metadata_helper.rb b/spec/contracts/provider/pact_helpers/project/merge_request/show/diffs_metadata_helper.rb
index 5f0c58d18d4..61567214b7a 100644
--- a/spec/contracts/provider/pact_helpers/project/merge_request/diffs_metadata_helper.rb
+++ b/spec/contracts/provider/pact_helpers/project/merge_request/show/diffs_metadata_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../../spec_helper'
-require_relative '../../../states/project/merge_request/diffs_metadata_state'
+require_relative '../../../../spec_helper'
+require_relative '../../../../states/project/merge_request/show_state'
 
 module Provider
   module DiffsMetadataHelper
diff --git a/spec/contracts/provider/pact_helpers/project/merge_request/discussions_helper.rb b/spec/contracts/provider/pact_helpers/project/merge_request/show/discussions_helper.rb
index 0f4244ba40a..fa76ce8889a 100644
--- a/spec/contracts/provider/pact_helpers/project/merge_request/discussions_helper.rb
+++ b/spec/contracts/provider/pact_helpers/project/merge_request/show/discussions_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../../spec_helper'
-require_relative '../../../states/project/merge_request/discussions_state'
+require_relative '../../../../spec_helper'
+require_relative '../../../../states/project/merge_request/show_state'
 
 module Provider
   module DiscussionsHelper
diff --git a/spec/contracts/provider/pact_helpers/project/pipeline/create_a_new_pipeline_helper.rb b/spec/contracts/provider/pact_helpers/project/pipeline/index/create_a_new_pipeline_helper.rb
index e7d9b1452d3..247a7c4ca8e 100644
--- a/spec/contracts/provider/pact_helpers/project/pipeline/create_a_new_pipeline_helper.rb
+++ b/spec/contracts/provider/pact_helpers/project/pipeline/index/create_a_new_pipeline_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../../spec_helper'
-require_relative '../../../states/project/pipeline/new_state'
+require_relative '../../../../spec_helper'
+require_relative '../../../../states/project/pipeline/new_state'
 
 module Provider
   module CreateNewPipelineHelper
diff --git a/spec/contracts/provider/pact_helpers/project/pipeline/get_list_project_pipelines_helper.rb b/spec/contracts/provider/pact_helpers/project/pipeline/index/get_list_project_pipelines_helper.rb
index 5307468b7c6..80cbbe3b4dd 100644
--- a/spec/contracts/provider/pact_helpers/project/pipeline/get_list_project_pipelines_helper.rb
+++ b/spec/contracts/provider/pact_helpers/project/pipeline/index/get_list_project_pipelines_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../../spec_helper'
-require_relative '../../../states/project/pipeline/pipelines_state'
+require_relative '../../../../spec_helper'
+require_relative '../../../../states/project/pipeline/index_state'
 
 module Provider
   module GetListProjectPipelinesHelper
diff --git a/spec/contracts/provider/pact_helpers/project/pipeline/show/get_pipeline_header_data_helper.rb b/spec/contracts/provider/pact_helpers/project/pipeline/show/get_pipeline_header_data_helper.rb
index 4bc7dff2ef9..bc8c04cc455 100644
--- a/spec/contracts/provider/pact_helpers/project/pipeline/show/get_pipeline_header_data_helper.rb
+++ b/spec/contracts/provider/pact_helpers/project/pipeline/show/get_pipeline_header_data_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../../../../spec_helper'
-require_relative '../../../../states/project/pipeline/pipeline_state'
+require_relative '../../../../states/project/pipeline/show_state'
 
 module Provider
   module GetPipelinesHeaderDataHelper
diff --git a/spec/contracts/provider/states/project/merge_request/diffs_batch_state.rb b/spec/contracts/provider/states/project/merge_request/diffs_batch_state.rb
deleted file mode 100644
index ac20c17c187..00000000000
--- a/spec/contracts/provider/states/project/merge_request/diffs_batch_state.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-Pact.provider_states_for "MergeRequest#show" do
-  provider_state "a merge request with diffs exists" do
-    set_up do
-      user = User.find_by(name: Provider::UsersHelper::CONTRACT_USER_NAME)
-      namespace = create(:namespace, name: 'gitlab-org')
-      project = create(:project, :custom_repo, name: 'gitlab-qa', namespace: namespace, files: {})
-
-      project.add_maintainer(user)
-
-      merge_request = create(:merge_request_with_multiple_diffs, source_project: project)
-      merge_request_diff = create(:merge_request_diff, merge_request: merge_request)
-
-      create(:merge_request_diff_file, :new_file, merge_request_diff: merge_request_diff)
-    end
-  end
-end
diff --git a/spec/contracts/provider/states/project/merge_request/diffs_metadata_state.rb b/spec/contracts/provider/states/project/merge_request/diffs_metadata_state.rb
deleted file mode 100644
index 8754232690c..00000000000
--- a/spec/contracts/provider/states/project/merge_request/diffs_metadata_state.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-Pact.provider_states_for "MergeRequest#show" do
-  provider_state "a merge request exists" do
-    set_up do
-      user = User.find_by(name: Provider::UsersHelper::CONTRACT_USER_NAME)
-      namespace = create(:namespace, name: 'gitlab-org')
-      project = create(:project, :custom_repo, name: 'gitlab-qa', namespace: namespace, files: {})
-
-      project.add_maintainer(user)
-
-      merge_request = create(:merge_request, source_project: project)
-      merge_request_diff = create(:merge_request_diff, merge_request: merge_request)
-
-      create(:merge_request_diff_file, :new_file, merge_request_diff: merge_request_diff)
-    end
-  end
-end
diff --git a/spec/contracts/provider/states/project/merge_request/discussions_state.rb b/spec/contracts/provider/states/project/merge_request/discussions_state.rb
deleted file mode 100644
index 2d64f85eedf..00000000000
--- a/spec/contracts/provider/states/project/merge_request/discussions_state.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-Pact.provider_states_for "MergeRequest#show" do
-  provider_state "a merge request with discussions exists" do
-    set_up do
-      user = User.find_by(name: Provider::UsersHelper::CONTRACT_USER_NAME)
-      namespace = create(:namespace, name: 'gitlab-org')
-      project = create(:project, name: 'gitlab-qa', namespace: namespace)
-
-      project.add_maintainer(user)
-
-      merge_request = create(:merge_request_with_diffs, source_project: project, author: user)
-
-      create(:discussion_note_on_merge_request, noteable: merge_request, project: project, author: user)
-    end
-  end
-end
diff --git a/spec/contracts/provider/states/project/merge_request/show_state.rb b/spec/contracts/provider/states/project/merge_request/show_state.rb
new file mode 100644
index 00000000000..46f322f723a
--- /dev/null
+++ b/spec/contracts/provider/states/project/merge_request/show_state.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+Pact.provider_states_for "MergeRequest#show" do
+  provider_state "a merge request with diffs exists" do
+    set_up do
+      user = User.find_by(name: Provider::UsersHelper::CONTRACT_USER_NAME)
+      namespace = create(:namespace, name: 'gitlab-org')
+      project = create(:project, :custom_repo, name: 'gitlab-qa', namespace: namespace, files: {})
+
+      project.add_maintainer(user)
+
+      merge_request = create(:merge_request_with_multiple_diffs, source_project: project)
+      merge_request_diff = create(:merge_request_diff, merge_request: merge_request)
+
+      create(:merge_request_diff_file, :new_file, merge_request_diff: merge_request_diff)
+    end
+  end
+
+  provider_state "a merge request exists" do
+    set_up do
+      user = User.find_by(name: Provider::UsersHelper::CONTRACT_USER_NAME)
+      namespace = create(:namespace, name: 'gitlab-org')
+      project = create(:project, :custom_repo, name: 'gitlab-qa', namespace: namespace, files: {})
+
+      project.add_maintainer(user)
+
+      merge_request = create(:merge_request, source_project: project)
+      merge_request_diff = create(:merge_request_diff, merge_request: merge_request)
+
+      create(:merge_request_diff_file, :new_file, merge_request_diff: merge_request_diff)
+    end
+  end
+
+  provider_state "a merge request with discussions exists" do
+    set_up do
+      user = User.find_by(name: Provider::UsersHelper::CONTRACT_USER_NAME)
+      namespace = create(:namespace, name: 'gitlab-org')
+      project = create(:project, name: 'gitlab-qa', namespace: namespace)
+
+      project.add_maintainer(user)
+
+      merge_request = create(:merge_request_with_diffs, source_project: project, author: user)
+
+      create(:discussion_note_on_merge_request, noteable: merge_request, project: project, author: user)
+    end
+  end
+end
diff --git a/spec/contracts/provider/states/project/pipeline/pipelines_state.rb b/spec/contracts/provider/states/project/pipeline/index_state.rb
index 639c25e9894..639c25e9894 100644
--- a/spec/contracts/provider/states/project/pipeline/pipelines_state.rb
+++ b/spec/contracts/provider/states/project/pipeline/index_state.rb
diff --git a/spec/contracts/provider/states/project/pipeline/pipeline_state.rb b/spec/contracts/provider/states/project/pipeline/pipeline_state.rb
deleted file mode 100644
index d1a4cd34bdd..00000000000
--- a/spec/contracts/provider/states/project/pipeline/pipeline_state.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-Pact.provider_states_for "Pipelines#show" do
-  provider_state "a pipeline for a project exists" do
-    set_up do
-      user = User.find_by(name: Provider::UsersHelper::CONTRACT_USER_NAME)
-      namespace = create(:namespace, name: 'gitlab-org')
-      project = create(:project, :repository, name: 'gitlab-qa', namespace: namespace, creator: user)
-      scheduled_job = create(:ci_build, :scheduled)
-      manual_job = create(:ci_build, :manual)
-
-      project.add_maintainer(user)
-
-      create(
-        :ci_pipeline,
-        :with_job,
-        :success,
-        iid: 1,
-        project: project,
-        user: user,
-        duration: 10,
-        finished_at: '2022-06-01T02:47:31.432Z',
-        builds: [scheduled_job, manual_job]
-      )
-    end
-  end
-end