Ci::Build tag is a trait instead of an own factory
Minor annoyance of mine, and there were a couple of things wrong, for example: 1. Switching on a property is just a trait 2. It didn't inherrit from its parent Find and replace through the code based fixed all occurances.
This commit is contained in:
parent
2573818f6d
commit
8275e34e41
|
@ -119,7 +119,7 @@ FactoryGirl.define do
|
|||
finished_at nil
|
||||
end
|
||||
|
||||
factory :ci_build_tag do
|
||||
trait :tag do
|
||||
tag true
|
||||
end
|
||||
|
||||
|
|
|
@ -385,7 +385,7 @@ describe API::Runner do
|
|||
end
|
||||
|
||||
context 'when job is made for tag' do
|
||||
let!(:job) { create(:ci_build_tag, pipeline: pipeline, name: 'spinach', stage: 'test', stage_idx: 0) }
|
||||
let!(:job) { create(:ci_build, :tag, pipeline: pipeline, name: 'spinach', stage: 'test', stage_idx: 0) }
|
||||
|
||||
it 'sets branch as ref_type' do
|
||||
request_job
|
||||
|
@ -436,8 +436,8 @@ describe API::Runner do
|
|||
end
|
||||
|
||||
context 'when project and pipeline have multiple jobs' do
|
||||
let!(:job) { create(:ci_build_tag, pipeline: pipeline, name: 'spinach', stage: 'test', stage_idx: 0) }
|
||||
let!(:job2) { create(:ci_build_tag, pipeline: pipeline, name: 'rubocop', stage: 'test', stage_idx: 0) }
|
||||
let!(:job) { create(:ci_build, :tag, pipeline: pipeline, name: 'spinach', stage: 'test', stage_idx: 0) }
|
||||
let!(:job2) { create(:ci_build, :tag, pipeline: pipeline, name: 'rubocop', stage: 'test', stage_idx: 0) }
|
||||
let!(:test_job) { create(:ci_build, pipeline: pipeline, name: 'deploy', stage: 'deploy', stage_idx: 1) }
|
||||
|
||||
before do
|
||||
|
@ -458,7 +458,7 @@ describe API::Runner do
|
|||
end
|
||||
|
||||
context 'when pipeline have jobs with artifacts' do
|
||||
let!(:job) { create(:ci_build_tag, :artifacts, pipeline: pipeline, name: 'spinach', stage: 'test', stage_idx: 0) }
|
||||
let!(:job) { create(:ci_build, :tag, :artifacts, pipeline: pipeline, name: 'spinach', stage: 'test', stage_idx: 0) }
|
||||
let!(:test_job) { create(:ci_build, pipeline: pipeline, name: 'deploy', stage: 'deploy', stage_idx: 1) }
|
||||
|
||||
before do
|
||||
|
@ -478,8 +478,8 @@ describe API::Runner do
|
|||
end
|
||||
|
||||
context 'when explicit dependencies are defined' do
|
||||
let!(:job) { create(:ci_build_tag, pipeline: pipeline, name: 'spinach', stage: 'test', stage_idx: 0) }
|
||||
let!(:job2) { create(:ci_build_tag, pipeline: pipeline, name: 'rubocop', stage: 'test', stage_idx: 0) }
|
||||
let!(:job) { create(:ci_build, :tag, pipeline: pipeline, name: 'spinach', stage: 'test', stage_idx: 0) }
|
||||
let!(:job2) { create(:ci_build, :tag, pipeline: pipeline, name: 'rubocop', stage: 'test', stage_idx: 0) }
|
||||
let!(:test_job) do
|
||||
create(:ci_build, pipeline: pipeline, token: 'test-job-token', name: 'deploy',
|
||||
stage: 'deploy', stage_idx: 1,
|
||||
|
@ -502,8 +502,8 @@ describe API::Runner do
|
|||
end
|
||||
|
||||
context 'when dependencies is an empty array' do
|
||||
let!(:job) { create(:ci_build_tag, pipeline: pipeline, name: 'spinach', stage: 'test', stage_idx: 0) }
|
||||
let!(:job2) { create(:ci_build_tag, pipeline: pipeline, name: 'rubocop', stage: 'test', stage_idx: 0) }
|
||||
let!(:job) { create(:ci_build, :tag, pipeline: pipeline, name: 'spinach', stage: 'test', stage_idx: 0) }
|
||||
let!(:job2) { create(:ci_build, :tag, pipeline: pipeline, name: 'rubocop', stage: 'test', stage_idx: 0) }
|
||||
let!(:empty_dependencies_job) do
|
||||
create(:ci_build, pipeline: pipeline, token: 'test-job-token', name: 'empty_dependencies_job',
|
||||
stage: 'deploy', stage_idx: 1,
|
||||
|
|
Loading…
Reference in New Issue