diff options
| -rw-r--r-- | lib/gitlab/testing/request_inspector_middleware.rb | 6 | ||||
| -rw-r--r-- | spec/features/projects/artifacts/user_downloads_artifacts_spec.rb | 11 | ||||
| -rw-r--r-- | spec/features/projects/jobs_spec.rb | 13 |
3 files changed, 10 insertions, 20 deletions
diff --git a/lib/gitlab/testing/request_inspector_middleware.rb b/lib/gitlab/testing/request_inspector_middleware.rb index e387667480d..c251e78f5c5 100644 --- a/lib/gitlab/testing/request_inspector_middleware.rb +++ b/lib/gitlab/testing/request_inspector_middleware.rb @@ -35,11 +35,15 @@ module Gitlab request_headers = env_http_headers(env) status, headers, body = @app.call(env) + full_body = '' + body.each { |b| full_body << b } + request = OpenStruct.new( url: url, status_code: status, request_headers: request_headers, - response_headers: headers + response_headers: headers, + body: full_body ) log_request request diff --git a/spec/features/projects/artifacts/user_downloads_artifacts_spec.rb b/spec/features/projects/artifacts/user_downloads_artifacts_spec.rb index f07bb1bb981..554f0b49052 100644 --- a/spec/features/projects/artifacts/user_downloads_artifacts_spec.rb +++ b/spec/features/projects/artifacts/user_downloads_artifacts_spec.rb @@ -30,16 +30,5 @@ describe "User downloads artifacts" do it_behaves_like "downloading" end - - context "via clicking the `Download` button", :js do - let(:url) { project_job_path(project, job) } - - before do - wait_for_all_requests - click_link("Download") - end - - it_behaves_like "downloading" - end end end diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index 6a6a86e3167..d0bf4975b81 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -220,13 +220,13 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do click_link 'Download' end - wait_for_requests + artifact_request = requests.find { |req| req.url.match(%r{artifacts/download}) } - expect(requests.first.response_headers["Content-Disposition"]).to eq(%Q{attachment; filename="#{job.artifacts_file.filename}"}) - expect(requests.first.response_headers['Content-Transfer-Encoding']).to eq("binary") - expect(requests.first.response_headers['Content-Type']).to eq("application/zip") + expect(artifact_request.response_headers["Content-Disposition"]).to eq(%Q{attachment; filename="#{job.artifacts_file.filename}"}) + expect(artifact_request.response_headers['Content-Transfer-Encoding']).to eq("binary") + expect(artifact_request.response_headers['Content-Type']).to eq("image/gif") + expect(artifact_request.body).to eq(job.artifacts_file.file.read.b) end - end context 'Artifacts expire date', :js do @@ -583,9 +583,6 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do expect(requests.first.status_code).to eq(404) end end - - - end describe 'GET /:project/jobs/:id/raw', :js do |