diff options
author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-10-04 21:46:03 +0200 |
---|---|---|
committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-10-04 21:54:01 +0200 |
commit | cf0a61c20229f4415991ea55262ba78275320daf (patch) | |
tree | e75808491f6a2a3f1668dca299c002b9d41dc7b7 /spec | |
parent | d031e0e88f4c26fc7c77e246ab28c8490ca00183 (diff) | |
download | gitlab-ce-cf0a61c20229f4415991ea55262ba78275320daf.tar.gz |
Rails5: fix artifacts controller download spec
Rails5 has params[:file_type] as '' if file_type is included as nil
in the request
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/projects/artifacts_controller_spec.rb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/spec/controllers/projects/artifacts_controller_spec.rb b/spec/controllers/projects/artifacts_controller_spec.rb index 436f4525093..6091185e252 100644 --- a/spec/controllers/projects/artifacts_controller_spec.rb +++ b/spec/controllers/projects/artifacts_controller_spec.rb @@ -19,15 +19,17 @@ describe Projects::ArtifactsController do end describe 'GET download' do - subject { get :download, namespace_id: project.namespace, project_id: project, job_id: job, file_type: file_type } + def download_artifact(extra_params = {}) + params = { namespace_id: project.namespace, project_id: project, job_id: job }.merge(extra_params) - context 'when no file type is supplied' do - let(:file_type) { nil } + get :download, params + end + context 'when no file type is supplied' do it 'sends the artifacts file' do expect(controller).to receive(:send_file).with(job.artifacts_file.path, hash_including(disposition: 'attachment')).and_call_original - subject + download_artifact end end @@ -36,7 +38,7 @@ describe Projects::ArtifactsController do let(:file_type) { 'invalid' } it 'returns 404' do - subject + download_artifact(file_type: file_type) expect(response).to have_gitlab_http_status(404) end @@ -52,7 +54,7 @@ describe Projects::ArtifactsController do it 'sends the codequality report' do expect(controller).to receive(:send_file).with(job.job_artifacts_codequality.file.path, hash_including(disposition: 'attachment')).and_call_original - subject + download_artifact(file_type: file_type) end end end |