From dd93376bdb899bb7ffdad1194ea98f6fb9c37427 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Sat, 6 May 2017 14:18:21 +0200 Subject: Remove redundant expire pipeline cache service --- app/services/ci/expire_pipeline_cache_service.rb | 64 ---------------------- .../ci/expire_pipeline_cache_service_spec.rb | 28 ---------- 2 files changed, 92 deletions(-) delete mode 100644 app/services/ci/expire_pipeline_cache_service.rb delete mode 100644 spec/services/ci/expire_pipeline_cache_service_spec.rb diff --git a/app/services/ci/expire_pipeline_cache_service.rb b/app/services/ci/expire_pipeline_cache_service.rb deleted file mode 100644 index e2299d1a79d..00000000000 --- a/app/services/ci/expire_pipeline_cache_service.rb +++ /dev/null @@ -1,64 +0,0 @@ -module Ci - class ExpirePipelineCacheService < BaseService - include Gitlab::Routing - - attr_reader :pipeline - - def execute(pipeline) - @pipeline = pipeline - - Gitlab::EtagCaching::Store.new.tap do |store| - store.touch(project_pipeline_path) - store.touch(project_pipelines_path) - store.touch(commit_pipelines_path) if pipeline.commit - store.touch(new_merge_request_pipelines_path) - - merge_requests_pipelines_paths.each { |path| store.touch(path) } - end - - Gitlab::Cache::Ci::ProjectPipelineStatus.update_for_pipeline(pipeline) - end - - private - - def project_pipelines_path - namespace_project_pipelines_path( - project.namespace, - project, - format: :json) - end - - def commit_pipelines_path - pipelines_namespace_project_commit_path( - project.namespace, - project, - pipeline.commit.id, - format: :json) - end - - def new_merge_request_pipelines_path - new_namespace_project_merge_request_path( - project.namespace, - project, - format: :json) - end - - def merge_requests_pipelines_paths - pipeline.merge_requests.collect do |merge_request| - pipelines_namespace_project_merge_request_path( - project.namespace, - project, - merge_request, - format: :json) - end - end - - def project_pipeline_path - namespace_project_pipeline_path( - project.namespace, - project, - pipeline, - format: :json) - end - end -end diff --git a/spec/services/ci/expire_pipeline_cache_service_spec.rb b/spec/services/ci/expire_pipeline_cache_service_spec.rb deleted file mode 100644 index 94f2352a7d6..00000000000 --- a/spec/services/ci/expire_pipeline_cache_service_spec.rb +++ /dev/null @@ -1,28 +0,0 @@ -require 'spec_helper' - -describe Ci::ExpirePipelineCacheService, services: true do - let(:project) { pipeline.project } - let(:pipeline) { create(:ci_pipeline) } - - before do - stub_ci_pipeline_to_return_yaml_file - end - - subject { described_class.new(project, nil).execute(pipeline) } - - describe '#execute' do - it 'creates a new Store' do - expect(Gitlab::EtagCaching::Store).to receive(:new) - .and_call_original - - subject - end - - it 'updates the ProjectPipelineStatus cache' do - expect(Gitlab::Cache::Ci::ProjectPipelineStatus) - .to receive(:update_for_pipeline).with(pipeline) - - subject - end - end -end -- cgit v1.2.1