diff options
author | Steve Azzopardi <steveazz@outlook.com> | 2018-08-21 14:47:55 +0200 |
---|---|---|
committer | Steve Azzopardi <steveazz@outlook.com> | 2018-09-03 18:49:51 +0200 |
commit | 4ee2ae14f5bb4349ac4a42388321f49786501484 (patch) | |
tree | 64e9376c52b453d96425ed9a3eabb827f5e8bf69 | |
parent | d79218fcea1fb4a85f4155e0cc3638e17a600249 (diff) | |
download | gitlab-ce-4ee2ae14f5bb4349ac4a42388321f49786501484.tar.gz |
Add artifact information for job controller
gitlab-org/gitlab-ce#50101
-rw-r--r-- | app/serializers/build_details_entity.rb | 22 | ||||
-rw-r--r-- | changelogs/unreleased/50101-add-artifact-information-to-job-api.yml | 5 | ||||
-rw-r--r-- | spec/controllers/projects/jobs_controller_spec.rb | 53 |
3 files changed, 77 insertions, 3 deletions
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index b887b99d31c..271ff668eda 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -9,6 +9,28 @@ class BuildDetailsEntity < JobEntity expose :metadata, using: BuildMetadataEntity + expose :artifact, if: -> (*) { can?(current_user, :read_build, build) } do + expose :download_path, if: -> (*) { build.artifacts? } do |build| + download_project_job_artifacts_path(project, build) + end + + expose :browse_path, if: -> (*) { build.browsable_artifacts? } do |build| + browse_project_job_artifacts_path(project, build) + end + + expose :keep_path, if: -> (*) { build.has_expiring_artifacts? && can?(current_user, :update_build, build) } do |build| + keep_project_job_artifacts_path(project, build) + end + + expose :expire_at, if: -> (*) { build.artifacts_expire_at.present? } do |build| + build.artifacts_expire_at + end + + expose :expired, if: -> (*) { build.artifacts_expire_at.present? } do |build| + build.artifacts_expired? + end + end + expose :erased_by, if: -> (*) { build.erased? }, using: UserEntity expose :erase_path, if: -> (*) { build.erasable? && can?(current_user, :erase_build, build) } do |build| erase_project_job_path(project, build) diff --git a/changelogs/unreleased/50101-add-artifact-information-to-job-api.yml b/changelogs/unreleased/50101-add-artifact-information-to-job-api.yml new file mode 100644 index 00000000000..f98d111a337 --- /dev/null +++ b/changelogs/unreleased/50101-add-artifact-information-to-job-api.yml @@ -0,0 +1,5 @@ +--- +title: Send artifact information in job API +merge_request: 50460 +author: +type: other diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb index 1aca44c6e74..a0676ab7fda 100644 --- a/spec/controllers/projects/jobs_controller_spec.rb +++ b/spec/controllers/projects/jobs_controller_spec.rb @@ -135,7 +135,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do end end - context 'when requesting JSON' do + context 'when requesting JSON with failed job' do let(:merge_request) { create(:merge_request, source_project: project) } before do @@ -150,9 +150,56 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do it 'exposes needed information' do expect(response).to have_gitlab_http_status(:ok) expect(json_response['raw_path']).to match(%r{jobs/\d+/raw\z}) + expect(json_response['merge_request']['path']).to match(%r{merge_requests/\d+\z}) + expect(json_response['new_issue_path']).to include('/issues/new') + end + end + + context 'when request JSON for successful job' do + let(:merge_request) { create(:merge_request, source_project: project) } + let(:job) { create(:ci_build, :success, :artifacts, pipeline: pipeline) } + + before do + project.add_developer(user) + sign_in(user) + + allow_any_instance_of(Ci::Build).to receive(:merge_request).and_return(merge_request) + + get_show(id: job.id, format: :json) + end + + it 'exposes needed information' do + expect(response).to have_gitlab_http_status(:ok) + expect(json_response['artifact']['download_path']).to match(%r{artifacts/download}) + expect(json_response['artifact']['browse_path']).to match(%r{artifacts/browse}) + expect(json_response['artifact']).not_to have_key(:expired) + expect(json_response['artifact']).not_to have_key(:expired_at) + expect(json_response['raw_path']).to match(%r{jobs/\d+/raw\z}) expect(json_response.dig('merge_request', 'path')).to match(%r{merge_requests/\d+\z}) - expect(json_response['new_issue_path']) - .to include('/issues/new') + end + + context 'when request JSON for successful job and expired artifacts' do + let(:merge_request) { create(:merge_request, source_project: project) } + let(:job) { create(:ci_build, :success, :artifacts, :expired, pipeline: pipeline) } + + before do + project.add_developer(user) + sign_in(user) + + allow_any_instance_of(Ci::Build).to receive(:merge_request).and_return(merge_request) + + get_show(id: job.id, format: :json) + end + + it 'exposes needed information' do + expect(response).to have_gitlab_http_status(:ok) + expect(json_response['artifact']).not_to have_key(:download_path) + expect(json_response['artifact']).not_to have_key(:browse_path) + expect(json_response['artifact']['expired']).to eq(true) + expect(json_response['artifact']['expire_at']).not_to be_empty + expect(json_response['raw_path']).to match(%r{jobs/\d+/raw\z}) + expect(json_response.dig('merge_request', 'path')).to match(%r{merge_requests/\d+\z}) + end end end |