From 48aff82709769b098321c738f3444b9bdaa694c6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 21 Oct 2020 07:08:36 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-5-stable-ee --- spec/lib/gitlab/workhorse_spec.rb | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) (limited to 'spec/lib/gitlab/workhorse_spec.rb') diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb index e9733851590..9662ad13631 100644 --- a/spec/lib/gitlab/workhorse_spec.rb +++ b/spec/lib/gitlab/workhorse_spec.rb @@ -54,12 +54,44 @@ RSpec.describe Gitlab::Workhorse do commit_id: metadata['CommitId'], prefix: metadata['ArchivePrefix'], format: Gitaly::GetArchiveRequest::Format::ZIP, - path: path + path: path, + include_lfs_blobs: true ).to_proto ) }.deep_stringify_keys) end + context 'when include_lfs_blobs_in_archive is disabled' do + before do + stub_feature_flags(include_lfs_blobs_in_archive: false) + end + + it 'sets include_lfs_blobs to false' 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 eq({ + 'GitalyServer' => { + features: { 'gitaly-feature-foobar' => 'true' }, + address: Gitlab::GitalyClient.address(project.repository_storage), + token: Gitlab::GitalyClient.token(project.repository_storage) + }, + 'ArchivePath' => metadata['ArchivePath'], + 'GetArchiveRequest' => Base64.encode64( + Gitaly::GetArchiveRequest.new( + repository: repository.gitaly_repository, + commit_id: metadata['CommitId'], + prefix: metadata['ArchivePrefix'], + format: Gitaly::GetArchiveRequest::Format::ZIP, + path: path, + include_lfs_blobs: false + ).to_proto + ) + }.deep_stringify_keys) + end + end + context 'when archive caching is disabled' do let(:cache_disabled) { true } -- cgit v1.2.3