From a43baa056e69827c342e705e2d5ea8cfc67bfd9c Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon <grzesiek.bizon@gmail.com> Date: Thu, 6 Oct 2016 14:52:00 +0200 Subject: [PATCH] Rename pipeline workers to match current convention --- app/models/commit_status.rb | 4 ++-- ...{process_pipeline_worker.rb => pipeline_process_worker.rb} | 2 +- .../{update_pipeline_worker.rb => pipeline_update_worker.rb} | 2 +- ...peline_worker_spec.rb => pipeline_proccess_worker_spec.rb} | 2 +- ...pipeline_worker_spec.rb => pipeline_update_worker_spec.rb} | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename app/workers/{process_pipeline_worker.rb => pipeline_process_worker.rb} (85%) rename app/workers/{update_pipeline_worker.rb => pipeline_update_worker.rb} (86%) rename spec/workers/{process_pipeline_worker_spec.rb => pipeline_proccess_worker_spec.rb} (93%) rename spec/workers/{update_pipeline_worker_spec.rb => pipeline_update_worker_spec.rb} (93%) diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index 5a240bcf2c6..3b575e5627d 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -89,10 +89,10 @@ class CommitStatus < ActiveRecord::Base break if transition.loopback? if commit_status.complete? - ProcessPipelineWorker.perform_async(pipeline.id) + PipelineProcessWorker.perform_async(pipeline.id) end - UpdatePipelineWorker.perform_async(pipeline.id) + PipelineUpdateWorker.perform_async(pipeline.id) end true diff --git a/app/workers/process_pipeline_worker.rb b/app/workers/pipeline_process_worker.rb similarity index 85% rename from app/workers/process_pipeline_worker.rb rename to app/workers/pipeline_process_worker.rb index 26ea5f1c24d..f44227d7086 100644 --- a/app/workers/process_pipeline_worker.rb +++ b/app/workers/pipeline_process_worker.rb @@ -1,4 +1,4 @@ -class ProcessPipelineWorker +class PipelineProcessWorker include Sidekiq::Worker sidekiq_options queue: :default diff --git a/app/workers/update_pipeline_worker.rb b/app/workers/pipeline_update_worker.rb similarity index 86% rename from app/workers/update_pipeline_worker.rb rename to app/workers/pipeline_update_worker.rb index 6ef5678073e..44a7f24e401 100644 --- a/app/workers/update_pipeline_worker.rb +++ b/app/workers/pipeline_update_worker.rb @@ -1,4 +1,4 @@ -class UpdatePipelineWorker +class PipelineUpdateWorker include Sidekiq::Worker sidekiq_options queue: :default diff --git a/spec/workers/process_pipeline_worker_spec.rb b/spec/workers/pipeline_proccess_worker_spec.rb similarity index 93% rename from spec/workers/process_pipeline_worker_spec.rb rename to spec/workers/pipeline_proccess_worker_spec.rb index 7b5f98d5763..86e9d7f6684 100644 --- a/spec/workers/process_pipeline_worker_spec.rb +++ b/spec/workers/pipeline_proccess_worker_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe ProcessPipelineWorker do +describe PipelineProcessWorker do describe '#perform' do context 'when pipeline exists' do let(:pipeline) { create(:ci_pipeline) } diff --git a/spec/workers/update_pipeline_worker_spec.rb b/spec/workers/pipeline_update_worker_spec.rb similarity index 93% rename from spec/workers/update_pipeline_worker_spec.rb rename to spec/workers/pipeline_update_worker_spec.rb index fadc42b22f0..0b456cfd0da 100644 --- a/spec/workers/update_pipeline_worker_spec.rb +++ b/spec/workers/pipeline_update_worker_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe UpdatePipelineWorker do +describe PipelineUpdateWorker do describe '#perform' do context 'when pipeline exists' do let(:pipeline) { create(:ci_pipeline) } -- GitLab