1 files changed, 10 insertions, 13 deletions

diff --git a/lib/tasks/contracts/merge_requests.rake b/lib/tasks/contracts/merge_requests.rake
index 05ed9c30495..2ee7ec07a96 100644
--- a/lib/tasks/contracts/merge_requests.rake
+++ b/lib/tasks/contracts/merge_requests.rake
@@ -4,38 +4,36 @@ return if Rails.env.production?
 
 require 'pact/tasks/verification_task'
 
-contracts = File.expand_path('../../../spec/contracts', __dir__)
-provider = File.expand_path('provider', contracts)
+contracts = File.expand_path('../../../spec/contracts/contracts/project/merge_request', __dir__)
+provider = File.expand_path('../../../spec/contracts/provider', __dir__)
 
-# rubocop:disable Rails/RakeEnvironment
 namespace :contracts do
   namespace :merge_requests do
     Pact::VerificationTask.new(:diffs_batch) do |pact|
       pact.uri(
-        "#{contracts}/contracts/project/merge_request/show/mergerequest#show-merge_request_diffs_batch_endpoint.json",
-        pact_helper: "#{provider}/pact_helpers/project/merge_request/diffs_batch_helper.rb"
+        "#{contracts}/show/mergerequest#show-merge_request_diffs_batch_endpoint.json",
+        pact_helper: "#{provider}/pact_helpers/project/merge_request/show/diffs_batch_helper.rb"
       )
     end
 
     Pact::VerificationTask.new(:diffs_metadata) do |pact|
       pact.uri(
-        "#{contracts}/contracts/project/merge_request/show/" \
-          "mergerequest#show-merge_request_diffs_metadata_endpoint.json",
-        pact_helper: "#{provider}/pact_helpers/project/merge_request/diffs_metadata_helper.rb"
+        "#{contracts}/show/mergerequest#show-merge_request_diffs_metadata_endpoint.json",
+        pact_helper: "#{provider}/pact_helpers/project/merge_request/show/diffs_metadata_helper.rb"
       )
     end
 
     Pact::VerificationTask.new(:discussions) do |pact|
       pact.uri(
-        "#{contracts}/contracts/project/merge_request/show/mergerequest#show-merge_request_discussions_endpoint.json",
-        pact_helper: "#{provider}/pact_helpers/project/merge_request/discussions_helper.rb"
+        "#{contracts}/show/mergerequest#show-merge_request_discussions_endpoint.json",
+        pact_helper: "#{provider}/pact_helpers/project/merge_request/show/discussions_helper.rb"
       )
     end
 
     desc 'Run all merge request contract tests'
-    task 'test:merge_requests', :contract_mr do |_t, arg|
+    task 'test:merge_requests', :contract_merge_requests do |_t, arg|
       errors = %w[diffs_batch diffs_metadata discussions].each_with_object([]) do |task, err|
-        Rake::Task["contracts:mr:pact:verify:#{task}"].execute
+        Rake::Task["contracts:merge_requests:pact:verify:#{task}"].execute
       rescue StandardError, SystemExit
         err << "contracts:merge_requests:pact:verify:#{task}"
       end
@@ -44,4 +42,3 @@ namespace :contracts do
     end
   end
 end
-# rubocop:enable Rails/RakeEnvironment