diff options
author | Matija Čupić <matteeyah@gmail.com> | 2019-07-17 01:36:49 +0200 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2019-07-21 20:45:23 +0200 |
commit | f29e5a96c5efeb112d27ab504216a8cb981f2bfb (patch) | |
tree | 205302ab7f3be04535fd641939342bfcf854429e | |
parent | 4e814c257b74ac78a50f54ec57b1e1c7f78d43b7 (diff) | |
download | gitlab-ce-f29e5a96c5efeb112d27ab504216a8cb981f2bfb.tar.gz |
Add specs for specifying pipeline behaviorgsemet/gitlab-ce-gsemet-master-patch-33258
Adds specs for testing the new behavior of specifying a pipeline when
POSTing a status.
-rw-r--r-- | app/models/project.rb | 12 | ||||
-rw-r--r-- | changelogs/unreleased/21671-multiple-pipeline-status-api.yml | 2 | ||||
-rw-r--r-- | lib/api/commit_statuses.rb | 3 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 20 | ||||
-rw-r--r-- | spec/requests/api/commit_statuses_spec.rb | 24 |
5 files changed, 53 insertions, 8 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 2906aca75fc..aad24a5534c 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1496,12 +1496,20 @@ class Project < ApplicationRecord !namespace.share_with_group_lock end - def pipeline_for(ref, sha = nil) + def pipeline_for(ref, sha = nil, id = nil) + if id.present? + pipelines_for(ref, sha).find_by(id: id) + else + pipelines_for(ref, sha).take + end + end + + def pipelines_for(ref, sha = nil) sha ||= commit(ref).try(:sha) return unless sha - ci_pipelines.order(id: :desc).find_by(sha: sha, ref: ref) + ci_pipelines.order(id: :desc).where(sha: sha, ref: ref) end def latest_successful_pipeline_for_default_branch diff --git a/changelogs/unreleased/21671-multiple-pipeline-status-api.yml b/changelogs/unreleased/21671-multiple-pipeline-status-api.yml index f87366803e2..b7b0f5fa0c7 100644 --- a/changelogs/unreleased/21671-multiple-pipeline-status-api.yml +++ b/changelogs/unreleased/21671-multiple-pipeline-status-api.yml @@ -1,5 +1,5 @@ --- title: Multiple pipeline support for Commit status -merge_request: 21671 +merge_request: 30828 author: Gaetan Semet type: changed diff --git a/lib/api/commit_statuses.rb b/lib/api/commit_statuses.rb index 61cf929bcdc..fd3680e47bb 100644 --- a/lib/api/commit_statuses.rb +++ b/lib/api/commit_statuses.rb @@ -73,8 +73,9 @@ module API not_found! 'References for commit' unless ref name = params[:name] || params[:context] || 'default' + pipeline = if params[:pipeline_id] - @project.ci_pipelines.find_by(id: params[:pipeline_id]) + @project.pipeline_for(ref, commit.sha, params[:pipeline_id]) else @project.pipeline_for(ref, commit.sha) end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 927c072be10..3a8ad5a3066 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -1190,6 +1190,14 @@ describe Project do subject { project.pipeline_for('master', pipeline.sha) } it_behaves_like 'giving the correct pipeline' + + context 'with supplied id' do + let!(:other_pipeline) { create_pipeline(project) } + + subject { project.pipeline_for('master', pipeline.sha, other_pipeline.id) } + + it { is_expected.to eq(other_pipeline) } + end end context 'with implicit sha' do @@ -1199,6 +1207,18 @@ describe Project do end end + describe '#pipelines_for' do + let(:project) { create(:project, :repository) } + let!(:pipeline) { create_pipeline(project) } + let!(:other_pipeline) { create_pipeline(project) } + + context 'with implicit sha' do + subject { project.pipelines_for('master') } + + it { is_expected.to contain_exactly(pipeline, other_pipeline) } + end + end + describe '#builds_enabled' do let(:project) { create(:project) } diff --git a/spec/requests/api/commit_statuses_spec.rb b/spec/requests/api/commit_statuses_spec.rb index b5e45f99109..1be8883bd3c 100644 --- a/spec/requests/api/commit_statuses_spec.rb +++ b/spec/requests/api/commit_statuses_spec.rb @@ -8,10 +8,6 @@ describe API::CommitStatuses do let(:developer) { create_user(:developer) } let(:sha) { commit.id } - let(:commit_status) do - create(:commit_status, status: :pending, pipeline: pipeline) - end - describe "GET /projects/:id/repository/commits/:sha/statuses" do let(:get_url) { "/projects/#{project.id}/repository/commits/#{sha}/statuses" } @@ -239,6 +235,26 @@ describe API::CommitStatuses do expect(CommitStatus.count).to eq 1 end end + + context 'when a pipeline id is specified' do + let!(:first_pipeline) { project.ci_pipelines.create(source: :push, sha: commit.id, ref: 'master', status: 'created') } + let!(:other_pipeline) { project.ci_pipelines.create(source: :push, sha: commit.id, ref: 'master', status: 'created') } + + subject do + post api(post_url, developer), params: { + pipeline_id: other_pipeline.id, + state: 'success', + ref: 'master' + } + end + + it 'update the correct pipeline' do + subject + + expect(first_pipeline.reload.status).to eq('created') + expect(other_pipeline.reload.status).to eq('success') + end + end end context 'when retrying a commit status' do |