Commit 54263dc1 authored by Shinya Maeda's avatar Shinya Maeda Committed by Alessio Caiazza

Fix coding style offence

parent b5a591d8
......@@ -11,6 +11,7 @@ module Ci
else
build.enqueue
end
true
else
build.skip
......
......@@ -11,7 +11,7 @@ module Gitlab
runner_system_failure: 'runner system failure',
missing_dependency_failure: 'missing dependency failure',
runner_unsupported: 'unsupported runner',
schedule_expired: 'schedule expired',
schedule_expired: 'schedule expired'
}.freeze
private_constant :REASONS
......
......@@ -257,7 +257,7 @@ describe Ci::ProcessPipelineService, '#execute' do
it 'properly processes the pipeline' do
expect(process_pipeline).to be_truthy
expect(builds_names_and_statuses).to eq({ 'build': 'pending' })
succeed_pending
expect(builds_names_and_statuses).to eq({ 'build': 'success', 'rollout10%': 'scheduled' })
......@@ -283,7 +283,7 @@ describe Ci::ProcessPipelineService, '#execute' do
it 'properly processes the pipeline' do
expect(process_pipeline).to be_truthy
expect(builds_names_and_statuses).to eq({ 'build': 'pending' })
fail_running_or_pending
expect(builds_names_and_statuses).to eq({ 'build': 'failed' })
......@@ -295,11 +295,11 @@ describe Ci::ProcessPipelineService, '#execute' do
it 'properly processes the pipeline' do
expect(process_pipeline).to be_truthy
expect(builds_names_and_statuses).to eq({ 'build': 'pending' })
succeed_pending
expect(builds_names_and_statuses).to eq({ 'build': 'success', 'rollout10%': 'scheduled' })
unschedule
expect(builds_names_and_statuses).to eq({ 'build': 'success', 'rollout10%': 'manual' })
......@@ -324,11 +324,11 @@ describe Ci::ProcessPipelineService, '#execute' do
it 'properly processes the pipeline' do
expect(process_pipeline).to be_truthy
expect(builds_names_and_statuses).to eq({ 'build': 'pending' })
succeed_pending
expect(builds_names_and_statuses).to eq({ 'build': 'success', 'rollout10%': 'scheduled' })
enqueue_scheduled('rollout10%')
fail_running_or_pending
......@@ -354,11 +354,11 @@ describe Ci::ProcessPipelineService, '#execute' do
it 'properly processes the pipeline' do
expect(process_pipeline).to be_truthy
expect(builds_names_and_statuses).to eq({ 'build': 'pending' })
succeed_pending
expect(builds_names_and_statuses).to eq({ 'build': 'success', 'rollout10%': 'scheduled' })
play_manual_action('rollout10%')
expect(builds_names_and_statuses).to eq({ 'build': 'success', 'rollout10%': 'pending' })
......@@ -718,7 +718,10 @@ describe Ci::ProcessPipelineService, '#execute' do
end
def builds_names_and_statuses
builds.inject({}) { |h, b| h[b.name.to_sym] = b.status; h }
builds.each_with_object({}) do |h, b|
h[b.name.to_sym] = b.status
h
end
end
def all_builds_names
......
......@@ -10,7 +10,7 @@ describe Ci::BuildScheduleWorker do
it 'executes RunScheduledBuildService' do
expect_any_instance_of(Ci::RunScheduledBuildService)
.to receive(:execute).once
subject
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