diff options
Diffstat (limited to 'spec/requests/api/deployments_spec.rb')
| -rw-r--r-- | spec/requests/api/deployments_spec.rb | 63 |
1 files changed, 62 insertions, 1 deletions
diff --git a/spec/requests/api/deployments_spec.rb b/spec/requests/api/deployments_spec.rb index d8fc234cbae..151f67061eb 100644 --- a/spec/requests/api/deployments_spec.rb +++ b/spec/requests/api/deployments_spec.rb @@ -122,7 +122,29 @@ describe API::Deployments do describe 'POST /projects/:id/deployments' do let!(:project) { create(:project, :repository) } - let(:sha) { 'b83d6e391c22777fca1ed3012fce84f633d7fed0' } + # * ddd0f15ae83993f5cb66a927a28673882e99100b (HEAD -> master, origin/master, origin/HEAD) Merge branch 'po-fix-test-en + # |\ + # | * 2d1db523e11e777e49377cfb22d368deec3f0793 Correct test_env.rb path for adding branch + # |/ + # * 1e292f8fedd741b75372e19097c76d327140c312 Merge branch 'cherry-pick-ce369011' into 'master' + + let_it_be(:sha) { 'ddd0f15ae83993f5cb66a927a28673882e99100b' } + let_it_be(:first_deployment_sha) { '1e292f8fedd741b75372e19097c76d327140c312' } + + before do + # Creating the first deployment is an edge-case that is already covered by unit testing, + # here we want to see the behavior of a running system so we create a first deployment + post( + api("/projects/#{project.id}/deployments", user), + params: { + environment: 'production', + sha: first_deployment_sha, + ref: 'master', + tag: false, + status: 'success' + } + ) + end context 'as a maintainer' do it 'creates a new deployment' do @@ -163,6 +185,7 @@ describe API::Deployments do mr = create( :merge_request, :merged, + merge_commit_sha: sha, target_project: project, source_project: project, target_branch: 'master', @@ -215,6 +238,7 @@ describe API::Deployments do mr = create( :merge_request, :merged, + merge_commit_sha: sha, target_project: project, source_project: project, target_branch: 'master', @@ -236,6 +260,43 @@ describe API::Deployments do expect(deploy.merge_requests).to eq([mr]) end + + it 'links any picked merge requests to the deployment', :sidekiq_inline do + mr = create( + :merge_request, + :merged, + merge_commit_sha: sha, + target_project: project, + source_project: project, + target_branch: 'master', + source_branch: 'foo' + ) + + # we branch from the previous deployment and cherry-pick mr into the new branch + branch = project.repository.add_branch(developer, 'stable', first_deployment_sha) + expect(branch).not_to be_nil + + result = ::Commits::CherryPickService + .new(project, developer, commit: mr.merge_commit, start_branch: 'stable', branch_name: 'stable') + .execute + expect(result[:status]).to eq(:success), result[:message] + + pick_sha = result[:result] + + post( + api("/projects/#{project.id}/deployments", developer), + params: { + environment: 'production', + sha: pick_sha, + ref: 'stable', + tag: false, + status: 'success' + } + ) + + deploy = project.deployments.last + expect(deploy.merge_requests).to eq([mr]) + end end context 'as non member' do |