Merge branch 'api-fix-files' into 'master'

API: Fix file downloading

See merge request !8953
This commit is contained in:
Rémy Coutable 2017-02-06 11:18:30 +00:00
commit da359c46b5
4 changed files with 11 additions and 1 deletions

View file

@ -0,0 +1,4 @@
---
title: 'API: Fix file downloading'
merge_request: Robert Schilling
author: 8267

View file

@ -304,7 +304,7 @@ module API
header['X-Sendfile'] = path
body
else
path
file path
end
end

View file

@ -188,6 +188,7 @@ describe API::Builds, api: true do
it 'returns specific job artifacts' do
expect(response).to have_http_status(200)
expect(response.headers).to include(download_headers)
expect(response.body).to match_file(build.artifacts_file.file.file)
end
end

View file

@ -0,0 +1,5 @@
RSpec::Matchers.define :match_file do |expected|
match do |actual|
expect(Digest::MD5.hexdigest(actual)).to eq(Digest::MD5.hexdigest(File.read(expected)))
end
end