Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 24 deletions

diff --git a/spec/serializers/build_artifact_entity_spec.rb b/spec/serializers/build_artifact_entity_spec.rb
index 5f1d5093e0a..09fe094fff1 100644
--- a/spec/serializers/build_artifact_entity_spec.rb
+++ b/spec/serializers/build_artifact_entity_spec.rb
@@ -4,8 +4,6 @@ require 'spec_helper'
 
 describe BuildArtifactEntity do
   let(:job) { create(:ci_build, name: 'test:job', artifacts_expire_at: 1.hour.from_now) }
-  let!(:archive) { create(:ci_job_artifact, :archive, job: job) }
-  let!(:metadata) { create(:ci_job_artifact, :metadata, job: job) }
 
   let(:entity) do
     described_class.new(job, request: double)
diff --git a/spec/serializers/build_details_entity_spec.rb b/spec/serializers/build_details_entity_spec.rb
index 6fe9eaedfeb..91c5fd6bf2c 100644
--- a/spec/serializers/build_details_entity_spec.rb
+++ b/spec/serializers/build_details_entity_spec.rb
@@ -176,27 +176,5 @@ describe BuildDetailsEntity do
         expect(subject[:reports].first[:file_type]).to eq('codequality')
       end
     end
-
-    context 'when the build has no archive type artifacts' do
-      let!(:report) { create(:ci_job_artifact, :codequality, job: build) }
-
-      it 'does not expose any artifact actions path' do
-        expect(subject[:artifact].keys).not_to include(:download_path, :browse_path, :keep_path)
-      end
-    end
-
-    context 'when the build has archive type artifacts' do
-      let!(:report) { create(:ci_job_artifact, :codequality, job: build) }
-      let!(:archive) { create(:ci_job_artifact, :archive, job: build) }
-      let!(:metadata) { create(:ci_job_artifact, :metadata, job: build) }
-
-      before do
-        build.update(artifacts_expire_at: 7.days.from_now)
-      end
-
-      it 'exposes artifact details' do
-        expect(subject[:artifact].keys).to include(:download_path, :browse_path, :keep_path, :expire_at, :expired)
-      end
-    end
   end
 end