diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-06-05 21:22:55 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-06-05 22:44:07 +0300 |
| commit | 65dbead7967937eb87ffdc987c319d7006662889 (patch) | |
| tree | 9d6a1d5414c1bf7b21511f8b319f212539d224a1 /spec/requests | |
| parent | 538110740acc1768315af097ef74213a6d8953d2 (diff) | |
Fix repository archive generation when hashed storage is enabled
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/repositories_spec.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/spec/requests/api/repositories_spec.rb b/spec/requests/api/repositories_spec.rb index 9e6d69e3874..cd135dfc32a 100644 --- a/spec/requests/api/repositories_spec.rb +++ b/spec/requests/api/repositories_spec.rb @@ -220,11 +220,10 @@ describe API::Repositories do expect(response).to have_gitlab_http_status(200) - repo_name = project.repository.name.gsub("\.git", "") type, params = workhorse_send_data expect(type).to eq('git-archive') - expect(params['ArchivePath']).to match(/#{repo_name}\-[^\.]+\.tar.gz/) + expect(params['ArchivePath']).to match(/#{project.path}\-[^\.]+\.tar.gz/) end it 'returns the repository archive archive.zip' do @@ -232,11 +231,10 @@ describe API::Repositories do expect(response).to have_gitlab_http_status(200) - repo_name = project.repository.name.gsub("\.git", "") type, params = workhorse_send_data expect(type).to eq('git-archive') - expect(params['ArchivePath']).to match(/#{repo_name}\-[^\.]+\.zip/) + expect(params['ArchivePath']).to match(/#{project.path}\-[^\.]+\.zip/) end it 'returns the repository archive archive.tar.bz2' do @@ -244,11 +242,10 @@ describe API::Repositories do expect(response).to have_gitlab_http_status(200) - repo_name = project.repository.name.gsub("\.git", "") type, params = workhorse_send_data expect(type).to eq('git-archive') - expect(params['ArchivePath']).to match(/#{repo_name}\-[^\.]+\.tar.bz2/) + expect(params['ArchivePath']).to match(/#{project.path}\-[^\.]+\.tar.bz2/) end context 'when sha does not exist' do |