Add latest changes from gitlab-org/gitlab@master

3 files changed, 25 insertions, 24 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 24abad66530..c85918a3187 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -308,12 +308,6 @@ FactoryBot.define do
       end
     end
 
-    trait :codequality_report do
-      after(:build) do |build|
-        build.job_artifacts << create(:ci_job_artifact, :codequality, job: build)
-      end
-    end
-
     trait :test_reports do
       after(:build) do |build|
         build.job_artifacts << create(:ci_job_artifact, :junit, job: build)
diff --git a/spec/factories/ci/pipeline_artifacts.rb b/spec/factories/ci/pipeline_artifacts.rb
index 8e1a64c7d40..ab4a16dbb90 100644
--- a/spec/factories/ci/pipeline_artifacts.rb
+++ b/spec/factories/ci/pipeline_artifacts.rb
@@ -4,18 +4,30 @@ FactoryBot.define do
   factory :ci_pipeline_artifact, class: 'Ci::PipelineArtifact' do
     pipeline factory: :ci_pipeline
     project { pipeline.project }
-    file_type { :code_coverage }
     file_format { :raw }
     file_store { ObjectStorage::SUPPORTED_STORES.first }
-    size { 1.megabytes }
-
+    size { 1.megabyte }
+    file_type { :code_coverage }
     after(:build) do |artifact, _evaluator|
       artifact.file = fixture_file_upload(
         Rails.root.join('spec/fixtures/pipeline_artifacts/code_coverage.json'), 'application/json')
     end
 
-    trait :with_multibyte_characters do
+    trait :with_coverage_report do
+      file_type { :code_coverage }
+
+      after(:build) do |artifact, _evaluator|
+        artifact.file = fixture_file_upload(
+          Rails.root.join('spec/fixtures/pipeline_artifacts/code_coverage.json'), 'application/json')
+      end
+
+      size { file.size }
+    end
+
+    trait :with_coverage_multibyte_characters do
+      file_type { :code_coverage }
       size { { "utf8" => "✓" }.to_json.bytesize }
+
       after(:build) do |artifact, _evaluator|
         artifact.file = CarrierWaveStringFile.new_file(
           file_content: { "utf8" => "✓" }.to_json,
@@ -26,23 +38,26 @@ FactoryBot.define do
     end
 
     trait :with_code_coverage_with_multiple_files do
+      file_type { :code_coverage }
+
       after(:build) do |artifact, _evaluator|
         artifact.file = fixture_file_upload(
           Rails.root.join('spec/fixtures/pipeline_artifacts/code_coverage_with_multiple_files.json'), 'application/json'
         )
       end
 
-      size { file.size }
+      size { 1.megabyte }
     end
 
-    trait :codequality_report do
+    trait :with_codequality_report do
       file_type { :code_quality }
-      size { 2.megabytes }
 
       after(:build) do |artifact, _evaluator|
         artifact.file = fixture_file_upload(
           Rails.root.join('spec/fixtures/pipeline_artifacts/code_quality.json'), 'application/json')
       end
+
+      size { file.size }
     end
   end
 end
diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb
index d9ef9e6f679..436d309a2ce 100644
--- a/spec/factories/ci/pipelines.rb
+++ b/spec/factories/ci/pipelines.rb
@@ -93,14 +93,6 @@ FactoryBot.define do
         end
       end
 
-      trait :with_codequality_report do
-        status { :success }
-
-        after(:build) do |pipeline, evaluator|
-          pipeline.builds << build(:ci_build, :codequality_report, pipeline: pipeline, project: pipeline.project)
-        end
-      end
-
       trait :with_test_reports do
         status { :success }
 
@@ -159,13 +151,13 @@ FactoryBot.define do
 
       trait :with_coverage_report_artifact do
         after(:build) do |pipeline, evaluator|
-          pipeline.pipeline_artifacts << build(:ci_pipeline_artifact, pipeline: pipeline, project: pipeline.project)
+          pipeline.pipeline_artifacts << build(:ci_pipeline_artifact, :with_coverage_report, pipeline: pipeline, project: pipeline.project)
         end
       end
 
-      trait :with_codequality_report_artifact do
+      trait :with_quality_report_artifact do
         after(:build) do |pipeline, evaluator|
-          pipeline.pipeline_artifacts << build(:ci_pipeline_artifact, :codequality_report, pipeline: pipeline, project: pipeline.project)
+          pipeline.pipeline_artifacts << build(:ci_pipeline_artifact, :with_codequality_report, pipeline: pipeline, project: pipeline.project)
         end
       end