diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-07-09 18:13:34 +0200 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-07-09 18:13:34 +0200 |
commit | 737666a3d121b1bf89861de4445f857256a47949 (patch) | |
tree | dae905ec23c56a1724a6df529091769f48b30dca /spec/controllers | |
parent | 5a9f23e780222218cc8418fd859669befcaed1b2 (diff) | |
download | gitlab-ce-737666a3d121b1bf89861de4445f857256a47949.tar.gz |
Fix specs
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/projects/jobs_controller_spec.rb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb index 38431fb1598..6be27126383 100644 --- a/spec/controllers/projects/jobs_controller_spec.rb +++ b/spec/controllers/projects/jobs_controller_spec.rb @@ -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 |