Add latest changes from gitlab-org/gitlab@master

2 files changed, 45 insertions, 0 deletions

diff --git a/spec/serializers/ci/downloadable_artifact_entity_spec.rb b/spec/serializers/ci/downloadable_artifact_entity_spec.rb
new file mode 100644
index 00000000000..34a271e7422
--- /dev/null
+++ b/spec/serializers/ci/downloadable_artifact_entity_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Ci::DownloadableArtifactEntity do
+  let(:pipeline) { create(:ci_pipeline, :with_codequality_reports) }
+  let(:user) { create(:user) }
+  let(:request) { EntityRequest.new({ current_user: user }) }
+  let(:entity) { described_class.new(pipeline, request: request) }
+
+  describe '#as_json' do
+    subject { entity.as_json }
+
+    it 'contains required fields', :aggregate_failures do
+      expect(subject).to include(:artifacts)
+      expect(subject[:artifacts].size).to eq(1)
+    end
+
+    context 'when user cannot read job artifact' do
+      let!(:build) { create(:ci_build, :success, :artifacts, :non_public_artifacts, pipeline: pipeline) }
+
+      it 'returns only artifacts readable by user', :aggregate_failures do
+        expect(subject[:artifacts].size).to eq(1)
+        expect(subject[:artifacts].first[:name]).to eq("test:codequality")
+      end
+    end
+  end
+end
diff --git a/spec/serializers/ci/downloadable_artifact_serializer_spec.rb b/spec/serializers/ci/downloadable_artifact_serializer_spec.rb
new file mode 100644
index 00000000000..90f159a06f9
--- /dev/null
+++ b/spec/serializers/ci/downloadable_artifact_serializer_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Ci::DownloadableArtifactSerializer do
+  let(:pipeline) { create(:ci_pipeline, :with_codequality_reports) }
+  let(:user) { create(:user) }
+  let(:serializer) { described_class.new(current_user: user).represent(pipeline) }
+
+  describe '#as_json' do
+    subject { serializer.as_json }
+
+    it 'matches schema' do
+      expect(subject).to match_schema('entities/downloadable_artifact')
+    end
+  end
+end