summaryrefslogtreecommitdiff
path: root/spec/services
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-10-12 15:35:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-10-12 15:35:06 +0000
commit012cbda407a30ab14e57ece581d720b22b47fe5a (patch)
tree62a559d2a0843d2d9700af1bb01a15cbfcee2190 /spec/services
parent92acfb1b8a9019b3fa3c817d251b2624d55da26d (diff)
downloadgitlab-ce-012cbda407a30ab14e57ece581d720b22b47fe5a.tar.gz
Add latest changes from gitlab-org/gitlab@14-3-stable-ee
Diffstat (limited to 'spec/services')
-rw-r--r--spec/services/merge_requests/mergeability_check_service_spec.rb9
1 files changed, 0 insertions, 9 deletions
diff --git a/spec/services/merge_requests/mergeability_check_service_spec.rb b/spec/services/merge_requests/mergeability_check_service_spec.rb
index 4f7be0f5965..65599b7e046 100644
--- a/spec/services/merge_requests/mergeability_check_service_spec.rb
+++ b/spec/services/merge_requests/mergeability_check_service_spec.rb
@@ -132,15 +132,6 @@ RSpec.describe MergeRequests::MergeabilityCheckService, :clean_gitlab_redis_shar
it_behaves_like 'mergeable merge request'
- it 'calls MergeToRefService with cache parameter' do
- service = instance_double(MergeRequests::MergeToRefService)
-
- expect(MergeRequests::MergeToRefService).to receive(:new).once { service }
- expect(service).to receive(:execute).once.with(merge_request, true).and_return(success: true)
-
- described_class.new(merge_request).execute(recheck: true)
- end
-
context 'when concurrent calls' do
it 'waits first lock and returns "cached" result in subsequent calls' do
threads = execute_within_threads(amount: 3)