Commit c1cc252b authored by Grzegorz Bizon's avatar Grzegorz Bizon

Move helpers to the end of process pipeline specs

parent fda61998
...@@ -10,22 +10,6 @@ describe Ci::ProcessPipelineService, services: true do ...@@ -10,22 +10,6 @@ describe Ci::ProcessPipelineService, services: true do
end end
describe '#execute' do describe '#execute' do
def all_builds
pipeline.builds
end
def builds
all_builds.where.not(status: [:created, :skipped])
end
def process_pipeline
described_class.new(pipeline.project, user).execute(pipeline)
end
def succeed_pending
builds.pending.update_all(status: 'success')
end
context 'start queuing next builds' do context 'start queuing next builds' do
before do before do
create(:ci_build, :created, pipeline: pipeline, name: 'linux', stage_idx: 0) create(:ci_build, :created, pipeline: pipeline, name: 'linux', stage_idx: 0)
...@@ -223,10 +207,6 @@ describe Ci::ProcessPipelineService, services: true do ...@@ -223,10 +207,6 @@ describe Ci::ProcessPipelineService, services: true do
pipeline.builds.running_or_pending.each(&:success) pipeline.builds.running_or_pending.each(&:success)
expect(manual_actions).to be_many # production and clear cache expect(manual_actions).to be_many # production and clear cache
end end
def manual_actions
pipeline.manual_actions
end
end end
end end
...@@ -282,15 +262,6 @@ describe Ci::ProcessPipelineService, services: true do ...@@ -282,15 +262,6 @@ describe Ci::ProcessPipelineService, services: true do
expect(builds.map(&:status)).to eq(%w[success skipped pending]) expect(builds.map(&:status)).to eq(%w[success skipped pending])
end end
end end
def create_build(name, stage_idx, when_value = nil)
create(:ci_build,
:created,
pipeline: pipeline,
name: name,
stage_idx: stage_idx,
when: when_value)
end
end end
context 'when failed build in the middle stage is retried' do context 'when failed build in the middle stage is retried' do
...@@ -381,4 +352,33 @@ describe Ci::ProcessPipelineService, services: true do ...@@ -381,4 +352,33 @@ describe Ci::ProcessPipelineService, services: true do
end end
end end
end end
def all_builds
pipeline.builds
end
def builds
all_builds.where.not(status: [:created, :skipped])
end
def process_pipeline
described_class.new(pipeline.project, user).execute(pipeline)
end
def succeed_pending
builds.pending.update_all(status: 'success')
end
def manual_actions
pipeline.manual_actions
end
def create_build(name, stage_idx, when_value = nil)
create(:ci_build,
:created,
pipeline: pipeline,
name: name,
stage_idx: stage_idx,
when: when_value)
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment