Commit da359c46 authored by Rémy Coutable's avatar Rémy Coutable

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

API: Fix file downloading

See merge request !8953
parents 572fb0be f5de8f15
---
title: 'API: Fix file downloading'
merge_request: Robert Schilling
author: 8267
......@@ -304,7 +304,7 @@ module API
header['X-Sendfile'] = path
body
else
path
file path
end
end
......
......@@ -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
......
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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment