diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-07-10 10:22:05 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-07-10 10:22:05 +0000 |
commit | 937d916b5ffe450cdb5e886b8a1099775cec8d29 (patch) | |
tree | 2a647424b28960977a637ddb1e2e1195d0c7cf00 /spec/lib/gitlab/workhorse_spec.rb | |
parent | c7b8afcd9093bbb56a405a15290ce8f1625988b1 (diff) | |
parent | a4e75e7a83082c190474595ed9894ec86061d37f (diff) | |
download | gitlab-ce-937d916b5ffe450cdb5e886b8a1099775cec8d29.tar.gz |
Merge branch 'gitaly-mandatory-20180709-jv' into 'master'
Use Gitaly for fetches and creating bundles
Closes gitaly#387, gitaly#874, gitaly#750, and gitaly#665
See merge request gitlab-org/gitlab-ce!20490
Diffstat (limited to 'spec/lib/gitlab/workhorse_spec.rb')
-rw-r--r-- | spec/lib/gitlab/workhorse_spec.rb | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb index 7802ff1f5f6..98a1865d347 100644 --- a/spec/lib/gitlab/workhorse_spec.rb +++ b/spec/lib/gitlab/workhorse_spec.rb @@ -36,22 +36,20 @@ describe Gitlab::Workhorse do allow(described_class).to receive(:git_archive_cache_disabled?).and_return(cache_disabled) end - context 'when Gitaly workhorse_archive feature is enabled' do - it 'sets the header correctly' do - key, command, params = decode_workhorse_header(subject) + it 'sets the header correctly' do + key, command, params = decode_workhorse_header(subject) - expect(key).to eq('Gitlab-Workhorse-Send-Data') - expect(command).to eq('git-archive') - expect(params).to include(gitaly_params) - end + expect(key).to eq('Gitlab-Workhorse-Send-Data') + expect(command).to eq('git-archive') + expect(params).to include(gitaly_params) + end - context 'when archive caching is disabled' do - let(:cache_disabled) { true } + context 'when archive caching is disabled' do + let(:cache_disabled) { true } - it 'tells workhorse not to use the cache' do - _, _, params = decode_workhorse_header(subject) - expect(params).to include({ 'DisableCache' => true }) - end + it 'tells workhorse not to use the cache' do + _, _, params = decode_workhorse_header(subject) + expect(params).to include({ 'DisableCache' => true }) end end |