diff options
-rw-r--r-- | lib/api/entities.rb | 4 | ||||
-rw-r--r-- | lib/api/runner.rb | 2 | ||||
-rw-r--r-- | spec/factories/ci/builds.rb | 7 | ||||
-rw-r--r-- | spec/services/ci/retry_build_service_spec.rb | 5 | ||||
-rw-r--r-- | spec/services/projects/update_pages_service_spec.rb | 2 |
5 files changed, 14 insertions, 6 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 8c671e7badd..84453666606 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1072,7 +1072,7 @@ module API end class Job < JobBasic - expose :artifacts_file, using: JobArtifactFile, if: -> (job, opts) { job.artifacts_archive? } + expose :artifacts_file, using: JobArtifactFile, if: -> (job, opts) { job.artifacts? } expose :runner, with: Runner expose :artifacts_expire_at end @@ -1242,7 +1242,7 @@ module API class Dependency < Grape::Entity expose :id, :name, :token - expose :artifacts_file, using: JobArtifactFile, if: ->(job, _) { job.artifacts_archive? } + expose :artifacts_file, using: JobArtifactFile, if: ->(job, _) { job.artifacts? } end class Response < Grape::Entity diff --git a/lib/api/runner.rb b/lib/api/runner.rb index 03bfcd50be0..80a12788714 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -236,7 +236,7 @@ module API optional :artifact_type, type: String, desc: %q(The type of artifact), default: 'archive', values: Ci::JobArtifact.file_types.keys optional :artifact_format, type: String, desc: %q(The format of artifact), - default: 'zip', values: Ci::JobArtifact.file_formats.keys + default: 'zip', values: Ci::JobArtifact.file_formats.keys optional 'file.path', type: String, desc: %q(path to locally stored body (generated by Workhorse)) optional 'file.name', type: String, desc: %q(real filename as send in Content-Disposition (generated by Workhorse)) optional 'file.type', type: String, desc: %q(real content type as send in Content-Type (generated by Workhorse)) diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb index 99f14a08039..db280bded6c 100644 --- a/spec/factories/ci/builds.rb +++ b/spec/factories/ci/builds.rb @@ -187,6 +187,13 @@ FactoryBot.define do end end + trait :test_reports do + after(:create) do |build| + create(:ci_job_artifact, :junit, job: build) + build.reload + end + end + trait :expired do artifacts_expire_at 1.minute.ago end diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb index 41899740081..a69032507dd 100644 --- a/spec/services/ci/retry_build_service_spec.rb +++ b/spec/services/ci/retry_build_service_spec.rb @@ -24,7 +24,7 @@ describe Ci::RetryBuildService do artifacts_file artifacts_metadata artifacts_size created_at updated_at started_at finished_at queued_at erased_by erased_at auto_canceled_by job_artifacts job_artifacts_archive - job_artifacts_archive_metadata job_artifacts_trace].freeze + job_artifacts_archive_metadata job_artifacts_trace job_artifacts_junit].freeze IGNORE_ACCESSORS = %i[type lock_version target_url base_tags trace_sections @@ -38,7 +38,7 @@ describe Ci::RetryBuildService do let(:another_pipeline) { create(:ci_empty_pipeline, project: project) } let(:build) do - create(:ci_build, :failed, :artifacts, :expired, :erased, + create(:ci_build, :failed, :artifacts, :test_reports, :expired, :erased, :queued, :coverage, :tags, :allowed_to_fail, :on_tag, :triggered, :trace_artifact, :teardown_environment, description: 'my-job', stage: 'test', stage_id: stage.id, @@ -76,6 +76,7 @@ describe Ci::RetryBuildService do describe 'reject acessors' do REJECT_ACCESSORS.each do |attribute| it "does not clone #{attribute} build attribute" do + binding.pry expect(new_build.send(attribute)).not_to eq build.send(attribute) end end diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb index a4c103e6f30..d9174e6846c 100644 --- a/spec/services/projects/update_pages_service_spec.rb +++ b/spec/services/projects/update_pages_service_spec.rb @@ -79,7 +79,7 @@ describe Projects::UpdatePagesService do context "for a valid job" do before do create(:ci_job_artifact, file: file, job: build) - create(:ci_job_artifact, file_type: :metadata, file: metadata, job: build) + create(:ci_job_artifact, file_type: :archive_metadata, file: metadata, job: build) build.reload end |