diff options
author | Sean McGivern <sean@gitlab.com> | 2019-03-07 15:57:06 +0000 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-03-07 15:57:06 +0000 |
commit | b63efb09a5c864047924cd2d84527b47dd563d5f (patch) | |
tree | 410918e53075de56796cf2865ec936ce2abf7883 /spec | |
parent | 5e0beb39bb40f567ea2b13511076d70e847831b4 (diff) | |
parent | 8a68f912296983772a1034f60de7f763f167ccec (diff) | |
download | gitlab-ce-b63efb09a5c864047924cd2d84527b47dd563d5f.tar.gz |
Merge branch 'sh-rugged-get-tree-entry' into 'master'
Bring back Rugged implementation of TreeEntry
See merge request gitlab-org/gitlab-ce!25706
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/git/blob_spec.rb | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/spec/lib/gitlab/git/blob_spec.rb b/spec/lib/gitlab/git/blob_spec.rb index a1b5cea88c0..10bc82e24d1 100644 --- a/spec/lib/gitlab/git/blob_spec.rb +++ b/spec/lib/gitlab/git/blob_spec.rb @@ -18,7 +18,7 @@ describe Gitlab::Git::Blob, :seed_helper do end end - describe '.find' do + shared_examples '.find' do context 'nil path' do let(:blob) { Gitlab::Git::Blob.find(repository, SeedRepo::Commit::ID, nil) } @@ -128,6 +128,20 @@ describe Gitlab::Git::Blob, :seed_helper do end end + describe '.find with Gitaly enabled' do + it_behaves_like '.find' + end + + describe '.find with Rugged enabled', :enable_rugged do + it 'calls out to the Rugged implementation' do + allow_any_instance_of(Rugged).to receive(:rev_parse).with(SeedRepo::Commit::ID).and_call_original + + described_class.find(repository, SeedRepo::Commit::ID, 'files/images/6049019_460s.jpg') + end + + it_behaves_like '.find' + end + describe '.raw' do let(:raw_blob) { Gitlab::Git::Blob.raw(repository, SeedRepo::RubyBlob::ID) } let(:bad_blob) { Gitlab::Git::Blob.raw(repository, SeedRepo::BigCommit::ID) } |