From 872319738757edc0483346c75a2407f7019b963f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 5 Dec 2019 12:07:43 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/controllers/projects/pipelines_controller_spec.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'spec/controllers/projects/pipelines_controller_spec.rb') diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb index 3c7f69f0e6e..b4549e4e635 100644 --- a/spec/controllers/projects/pipelines_controller_spec.rb +++ b/spec/controllers/projects/pipelines_controller_spec.rb @@ -93,7 +93,7 @@ describe Projects::PipelinesController do end context 'when performing gitaly calls', :request_store do - it 'limits the Gitaly requests', :sidekiq_might_not_need_inline do + it 'limits the Gitaly requests' do # Isolate from test preparation (Repository#exists? is also cached in RequestStore) RequestStore.end! RequestStore.clear! @@ -101,8 +101,9 @@ describe Projects::PipelinesController do expect(::Gitlab::GitalyClient).to receive(:allow_ref_name_caching).and_call_original + # ListCommitsByOid, RepositoryExists, HasLocalBranches expect { get_pipelines_index_json } - .to change { Gitlab::GitalyClient.get_request_count }.by(2) + .to change { Gitlab::GitalyClient.get_request_count }.by(3) end end -- cgit v1.2.1