Fix specs
This commit is contained in:
parent
5a9f23e780
commit
737666a3d1
|
@ -76,7 +76,8 @@ class GitlabUploader < CarrierWave::Uploader::Base
|
|||
end
|
||||
|
||||
def open
|
||||
stream = if file_storage?
|
||||
stream =
|
||||
if file_storage?
|
||||
File.open(path, "rb") if path
|
||||
else
|
||||
::Gitlab::HttpIO.new(url, cached_size) if url
|
||||
|
|
|
@ -216,20 +216,19 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
|
|||
end
|
||||
|
||||
context 'when trace artifact is in ObjectStorage' do
|
||||
let(:url) { 'http://object-storage/trace' }
|
||||
let(:file_path) { expand_fixture_path('trace/sample_trace') }
|
||||
let!(:job) { create(:ci_build, :success, :trace_artifact, pipeline: pipeline) }
|
||||
|
||||
before do
|
||||
allow_any_instance_of(JobArtifactUploader).to receive(:file_storage?) { false }
|
||||
allow_any_instance_of(JobArtifactUploader).to receive(:url) { remote_trace_url }
|
||||
allow_any_instance_of(JobArtifactUploader).to receive(:size) { remote_trace_size }
|
||||
allow_any_instance_of(JobArtifactUploader).to receive(:url) { url }
|
||||
allow_any_instance_of(JobArtifactUploader).to receive(:size) { File.size(file_path) }
|
||||
end
|
||||
|
||||
context 'when there are no network issues' do
|
||||
let(:url) { 'http://object-storage/trace' }
|
||||
let(:file) { expand_fixture_path('trace/sample_trace') }
|
||||
|
||||
before do
|
||||
stub_remote_url_206(url, file)
|
||||
stub_remote_url_206(url, file_path)
|
||||
|
||||
get_trace
|
||||
end
|
||||
|
|
|
@ -536,13 +536,13 @@ describe API::Jobs do
|
|||
context 'when trace is in ObjectStorage' do
|
||||
let!(:job) { create(:ci_build, :trace_artifact, pipeline: pipeline) }
|
||||
let(:url) { 'http://object-storage/trace' }
|
||||
let(:file) { expand_fixture_path('trace/sample_trace') }
|
||||
let(:file_path) { expand_fixture_path('trace/sample_trace') }
|
||||
|
||||
before do
|
||||
stub_remote_url_206(url, file_path)
|
||||
allow_any_instance_of(JobArtifactUploader).to receive(:file_storage?) { false }
|
||||
allow_any_instance_of(JobArtifactUploader).to receive(:url) { url }
|
||||
allow_any_instance_of(JobArtifactUploader).to receive(:size) { File.size(file) }
|
||||
allow_any_instance_of(JobArtifactUploader).to receive(:size) { File.size(file_path) }
|
||||
end
|
||||
|
||||
it 'returns specific job trace' do
|
||||
|
|
Loading…
Reference in New Issue