diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-04 12:07:17 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-04 12:07:17 +0000 |
commit | 27e18f182f7aab81fbe20e4b069e169a29c478ff (patch) | |
tree | ed671dffa7a02eaed608a95d2db55771306c1474 /spec/models/repository_spec.rb | |
parent | 22bb4872e657988bb8c133c515e8df4a0ad77785 (diff) | |
parent | 147e2b21be180d4b405c6ebe861971cb0dc9e6b2 (diff) | |
download | gitlab-ce-27e18f182f7aab81fbe20e4b069e169a29c478ff.tar.gz |
Merge branch 'gitaly-fetch-ref' into 'master'
Let fetch_ref pull from Gitaly instead of from disk
Closes gitaly#585
See merge request gitlab-org/gitlab-ce!14588
Diffstat (limited to 'spec/models/repository_spec.rb')
-rw-r--r-- | spec/models/repository_spec.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index bdcdad46390..7156c1b7aa8 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -636,18 +636,18 @@ describe Repository do describe '#fetch_ref' do describe 'when storage is broken', broken_storage: true do it 'should raise a storage error' do - path = broken_repository.path_to_repo - - expect_to_raise_storage_error { broken_repository.fetch_ref(path, '1', '2') } + expect_to_raise_storage_error do + broken_repository.fetch_ref(broken_repository, source_ref: '1', target_ref: '2') + end end end end describe '#create_ref' do - it 'redirects the call to fetch_ref' do + it 'redirects the call to write_ref' do ref, ref_path = '1', '2' - expect(repository).to receive(:fetch_ref).with(repository.path_to_repo, ref, ref_path) + expect(repository.raw_repository).to receive(:write_ref).with(ref_path, ref) repository.create_ref(ref, ref_path) end |