summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-09-28 14:41:39 +0900
committerAlessio Caiazza <acaiazza@gitlab.com>2018-10-02 17:08:13 +0200
commit54263dc1d9719f871fb2f23ecac4e0cfcabebe77 (patch)
treebe5a3d1fbbdd3344ca387b576990861af6bd387f
parentb5a591d8c2c8fff0136037f6c2a8b635f101e07e (diff)
downloadgitlab-ce-54263dc1d9719f871fb2f23ecac4e0cfcabebe77.tar.gz
Fix coding style offence
-rw-r--r--app/services/ci/process_build_service.rb1
-rw-r--r--lib/gitlab/ci/status/build/failed.rb2
-rw-r--r--spec/services/ci/process_pipeline_service_spec.rb21
-rw-r--r--spec/workers/ci/build_schedule_worker_spec.rb2
4 files changed, 15 insertions, 11 deletions
diff --git a/app/services/ci/process_build_service.rb b/app/services/ci/process_build_service.rb
index 41ea62b4e4a..8a1a524429e 100644
--- a/app/services/ci/process_build_service.rb
+++ b/app/services/ci/process_build_service.rb
@@ -11,6 +11,7 @@ module Ci
else
build.enqueue
end
+
true
else
build.skip
diff --git a/lib/gitlab/ci/status/build/failed.rb b/lib/gitlab/ci/status/build/failed.rb
index cdbcb7a47cd..014eb66a26b 100644
--- a/lib/gitlab/ci/status/build/failed.rb
+++ b/lib/gitlab/ci/status/build/failed.rb
@@ -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
diff --git a/spec/services/ci/process_pipeline_service_spec.rb b/spec/services/ci/process_pipeline_service_spec.rb
index d314d774be4..3ce3785b162 100644
--- a/spec/services/ci/process_pipeline_service_spec.rb
+++ b/spec/services/ci/process_pipeline_service_spec.rb
@@ -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
diff --git a/spec/workers/ci/build_schedule_worker_spec.rb b/spec/workers/ci/build_schedule_worker_spec.rb
index c76537b9233..4a3fe84d7f7 100644
--- a/spec/workers/ci/build_schedule_worker_spec.rb
+++ b/spec/workers/ci/build_schedule_worker_spec.rb
@@ -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