diff options
author | Valery Sizov <valery@gitlab.com> | 2017-09-20 15:42:15 +0300 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2017-09-20 15:42:15 +0300 |
commit | 8238245660b55a3e844aa5cc0727ada552839526 (patch) | |
tree | 0e9898264183d0f4d4dbd51e061f646a507cce49 /spec/requests | |
parent | c37c7c7f8bc5ec89db62991b3a029713eac45b14 (diff) | |
parent | e4ca9ae96d80dfadccd3d9bb0308c869e8ebb797 (diff) |
Merge branch 'rails5' of gitlab.com:gitlab-org/gitlab-ce into rails5
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/jobs_spec.rb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/spec/requests/api/jobs_spec.rb b/spec/requests/api/jobs_spec.rb index 66948c5ad4d..4229fcda785 100644 --- a/spec/requests/api/jobs_spec.rb +++ b/spec/requests/api/jobs_spec.rb @@ -26,7 +26,7 @@ describe API::Jobs do let(:query) { Hash.new } before do - get api("/projects/#{project.id}/jobs", api_user), query + get api("/projects/#{project.id}/jobs", api_user), params: query end context 'authorized user' do @@ -89,7 +89,7 @@ describe API::Jobs do let(:query) { Hash.new } before do - get api("/projects/#{project.id}/pipelines/#{pipeline.id}/jobs", api_user), query + get api("/projects/#{project.id}/pipelines/#{pipeline.id}/jobs", api_user), params: query end context 'authorized user' do @@ -245,9 +245,8 @@ describe API::Jobs do get_artifact_file(artifact) expect(response).to have_http_status(200) - expect(response.headers) - .to include('Content-Type' => 'application/json', - 'Gitlab-Workhorse-Send-Data' => /artifacts-entry/) + expect(response.headers['Content-Type']).to eq('application/json') + expect(response.headers['Gitlab-Workhorse-Send-Data']).to match(/artifacts-entry/) end end end @@ -311,7 +310,7 @@ describe API::Jobs do end def get_for_ref(ref = pipeline.ref, job_name = job.name) - get api("/projects/#{project.id}/jobs/artifacts/#{ref}/download", api_user), job: job_name + get api("/projects/#{project.id}/jobs/artifacts/#{ref}/download", api_user), params: { job: job_name } end context 'when not logged in' do |