Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 3 deletions

diff --git a/spec/workers/expire_pipeline_cache_worker_spec.rb b/spec/workers/expire_pipeline_cache_worker_spec.rb
index e162a227a66..8d898ffc13e 100644
--- a/spec/workers/expire_pipeline_cache_worker_spec.rb
+++ b/spec/workers/expire_pipeline_cache_worker_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 describe ExpirePipelineCacheWorker do
-  let(:user) { create(:user) }
-  let(:project) { create(:project) }
-  let(:pipeline) { create(:ci_pipeline, project: project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:pipeline) { create(:ci_pipeline, project: project) }
 
   subject { described_class.new }
 
@@ -22,5 +22,14 @@ describe ExpirePipelineCacheWorker do
 
       subject.perform(617748)
     end
+
+    it "doesn't do anything if the pipeline cannot be cached" do
+      allow_any_instance_of(Ci::Pipeline).to receive(:cacheable?).and_return(false)
+
+      expect_any_instance_of(Ci::ExpirePipelineCacheService).not_to receive(:execute)
+      expect_any_instance_of(Gitlab::EtagCaching::Store).not_to receive(:touch)
+
+      subject.perform(pipeline.id)
+    end
   end
 end