Add latest changes from gitlab-org/gitlab@master

1 files changed, 99 insertions, 10 deletions

diff --git a/spec/services/deployments/link_merge_requests_service_spec.rb b/spec/services/deployments/link_merge_requests_service_spec.rb
index 307fe22a192..605f2cfdc51 100644
--- a/spec/services/deployments/link_merge_requests_service_spec.rb
+++ b/spec/services/deployments/link_merge_requests_service_spec.rb
@@ -5,6 +5,19 @@ require 'spec_helper'
 describe Deployments::LinkMergeRequestsService do
   let(:project) { create(:project, :repository) }
 
+  # *   ddd0f15 Merge branch 'po-fix-test-env-path' into 'master'
+  # |\
+  # | * 2d1db52 Correct test_env.rb path for adding branch
+  # |/
+  # *   1e292f8 Merge branch 'cherry-pick-ce369011' into 'master'
+  # |\
+  # | * c1c67ab Add file with a _flattable_ path
+  # |/
+  # *   7975be0 Merge branch 'rd-add-file-larger-than-1-mb' into 'master'
+  let_it_be(:first_deployment_sha) { '7975be0116940bf2ad4321f79d02a55c5f7779aa' }
+  let_it_be(:mr1_merge_commit_sha) { '1e292f8fedd741b75372e19097c76d327140c312' }
+  let_it_be(:mr2_merge_commit_sha) { 'ddd0f15ae83993f5cb66a927a28673882e99100b' }
+
   describe '#execute' do
     context 'when the deployment is for a review environment' do
       it 'does nothing' do
@@ -25,7 +38,7 @@ describe Deployments::LinkMergeRequestsService do
           :deployment,
           :success,
           project: project,
-          sha: '7975be0116940bf2ad4321f79d02a55c5f7779aa'
+          sha: first_deployment_sha
         )
 
         deploy2 = create(
@@ -33,17 +46,14 @@ describe Deployments::LinkMergeRequestsService do
           :success,
           project: deploy1.project,
           environment: deploy1.environment,
-          sha: 'ddd0f15ae83993f5cb66a927a28673882e99100b'
+          sha: mr2_merge_commit_sha
         )
 
         service = described_class.new(deploy2)
 
         expect(service)
           .to receive(:link_merge_requests_for_range)
-          .with(
-            '7975be0116940bf2ad4321f79d02a55c5f7779aa',
-            'ddd0f15ae83993f5cb66a927a28673882e99100b'
-          )
+          .with(first_deployment_sha, mr2_merge_commit_sha)
 
         service.execute
       end
@@ -70,7 +80,7 @@ describe Deployments::LinkMergeRequestsService do
       mr1 = create(
         :merge_request,
         :merged,
-        merge_commit_sha: '1e292f8fedd741b75372e19097c76d327140c312',
+        merge_commit_sha: mr1_merge_commit_sha,
         source_project: project,
         target_project: project
       )
@@ -78,18 +88,97 @@ describe Deployments::LinkMergeRequestsService do
       mr2 = create(
         :merge_request,
         :merged,
-        merge_commit_sha: '2d1db523e11e777e49377cfb22d368deec3f0793',
+        merge_commit_sha: mr2_merge_commit_sha,
         source_project: project,
         target_project: project
       )
 
       described_class.new(deploy).link_merge_requests_for_range(
-        '7975be0116940bf2ad4321f79d02a55c5f7779aa',
-        'ddd0f15ae83993f5cb66a927a28673882e99100b'
+        first_deployment_sha,
+        mr2_merge_commit_sha
       )
 
       expect(deploy.merge_requests).to include(mr1, mr2)
     end
+
+    it 'links picked merge requests' do
+      environment = create(:environment, project: project)
+      deploy =
+        create(:deployment, :success, project: project, environment: environment)
+
+      picked_mr = create(
+        :merge_request,
+        :merged,
+        merge_commit_sha: '123abc',
+        source_project: project,
+        target_project: project
+      )
+
+      mr1 = create(
+        :merge_request,
+        :merged,
+        merge_commit_sha: mr1_merge_commit_sha,
+        source_project: project,
+        target_project: project
+      )
+
+      # mr1 includes c1c67abba which is a cherry-pick of the fake picked_mr merge request
+      create(:track_mr_picking_note, noteable: picked_mr, project: project, commit_id: 'c1c67abbaf91f624347bb3ae96eabe3a1b742478')
+
+      described_class.new(deploy).link_merge_requests_for_range(
+        first_deployment_sha,
+        mr1_merge_commit_sha
+      )
+
+      expect(deploy.merge_requests).to include(mr1, picked_mr)
+    end
+
+    context 'when :track_mr_picking feature flag is disabled' do
+      before do
+        stub_feature_flags(track_mr_picking: false)
+      end
+
+      it 'does not link picked merge requests' do
+        environment = create(:environment, project: project)
+        deploy =
+          create(:deployment, :success, project: project, environment: environment)
+
+        picked_mr = create(
+          :merge_request,
+          :merged,
+          merge_commit_sha: '123abc',
+          source_project: project,
+          target_project: project
+        )
+
+        mr1 = create(
+          :merge_request,
+          :merged,
+          merge_commit_sha: mr1_merge_commit_sha,
+          source_project: project,
+          target_project: project
+        )
+
+        # mr1 includes c1c67abba which is a cherry-pick of the fake picked_mr merge request
+        create(:track_mr_picking_note, noteable: picked_mr, project: project, commit_id: 'c1c67abbaf91f624347bb3ae96eabe3a1b742478')
+
+        mr2 = create(
+          :merge_request,
+          :merged,
+          merge_commit_sha: mr2_merge_commit_sha,
+          source_project: project,
+          target_project: project
+        )
+
+        described_class.new(deploy).link_merge_requests_for_range(
+          first_deployment_sha,
+          mr2_merge_commit_sha
+        )
+
+        expect(deploy.merge_requests).to include(mr1, mr2)
+        expect(deploy.merge_requests).not_to include(picked_mr)
+      end
+    end
   end
 
   describe '#link_all_merged_merge_requests' do