From 71d71afb3ac5f302470e66ace4f59e247249d99e Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Thu, 11 Oct 2018 16:27:04 +0200 Subject: Allow getting the merge base of multiple revisions As we now support getting the merge base for multiple revisions in gitaly, we can provide this functionality in our API --- spec/models/repository_spec.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'spec/models') diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index aed8e02cc23..6f5a4118b95 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -2386,4 +2386,15 @@ describe Repository do end end end + + describe '#merge_base' do + set(:project) { create(:project, :repository) } + subject(:repository) { project.repository } + + it 'only makes one gitaly call' do + expect(Gitlab::GitalyClient).to receive(:call).once.and_call_original + + repository.merge_base('master', 'fix') + end + end end -- cgit v1.2.1