diff options
author | Douwe Maan <douwe@gitlab.com> | 2019-03-07 14:36:12 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2019-03-07 14:36:12 +0300 |
commit | d655ed379fba815029a97e5443e6034e7a4b9842 (patch) | |
tree | ed0217f55618e157b10a89e16e81312f21e09763 /spec | |
parent | d0588225106bf329bcd08e1365702f7fe6a81a23 (diff) | |
parent | 9d294467bda78c358c868bd2ba3e39c01aea44f8 (diff) |
Merge branch 'sh-rugged-commit-is-ancestor' into 'master'
Bring back Rugged implementation of CommitIsAncestor
See merge request gitlab-org/gitlab-ce!25702
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/repository_spec.rb | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 17201d8b90a..70630467d24 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -2237,7 +2237,7 @@ describe Repository do rugged.references.create("refs/remotes/#{remote_name}/#{branch_name}", target.id) end - describe '#ancestor?' do + shared_examples '#ancestor?' do let(:commit) { repository.commit } let(:ancestor) { commit.parents.first } @@ -2261,6 +2261,20 @@ describe Repository do end end + describe '#ancestor? with Gitaly enabled' do + it_behaves_like "#ancestor?" + end + + describe '#ancestor? with Rugged enabled', :enable_rugged do + it 'calls out to the Rugged implementation' do + allow_any_instance_of(Rugged).to receive(:merge_base).with(repository.commit.id, Gitlab::Git::BLANK_SHA).and_call_original + + repository.ancestor?(repository.commit.id, Gitlab::Git::BLANK_SHA) + end + + it_behaves_like '#ancestor?' + end + describe '#archive_metadata' do let(:ref) { 'master' } let(:storage_path) { '/tmp' } |