diff options
author | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-03-10 19:56:29 +0300 |
---|---|---|
committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-03-30 17:06:31 +0300 |
commit | 1ea0ce827a619007c69010da512cb4e82224ed0f (patch) | |
tree | 8e12bae451cc61eade1b9773bc4dbb162c53e3bc /spec | |
parent | 3e1fb2a54052ca8a7483e788b70380b5c1768c71 (diff) |
Make GitLab use Gitaly for commit_is_ancestor
- Migration in Repository#is_ancestor?
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/repository_spec.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 585b87b828d..df742ee8084 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -1851,4 +1851,17 @@ describe Repository, models: true do end end end + + describe '#is_ancestor?' do + context 'Gitaly is_ancestor feature enabled' do + it 'asks Gitaly server if it\'s an ancestor' do + commit = repository.commit + allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(:is_ancestor).and_return(true) + expect(Gitlab::GitalyClient::Commit).to receive(:is_ancestor). + with(repository.raw_repository, commit.id, commit.id).and_return(true) + + expect(repository.is_ancestor?(commit.id, commit.id)).to be true + end + end + end end |