Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 5 deletions

diff --git a/spec/factories/ci/pipeline_artifacts.rb b/spec/factories/ci/pipeline_artifacts.rb
index ab4a16dbb90..05ff7afed7c 100644
--- a/spec/factories/ci/pipeline_artifacts.rb
+++ b/spec/factories/ci/pipeline_artifacts.rb
@@ -49,12 +49,12 @@ FactoryBot.define do
       size { 1.megabyte }
     end
 
-    trait :with_codequality_report do
-      file_type { :code_quality }
+    trait :with_codequality_mr_diff_report do
+      file_type { :code_quality_mr_diff }
 
       after(:build) do |artifact, _evaluator|
         artifact.file = fixture_file_upload(
-          Rails.root.join('spec/fixtures/pipeline_artifacts/code_quality.json'), 'application/json')
+          Rails.root.join('spec/fixtures/pipeline_artifacts/code_quality_mr_diff.json'), 'application/json')
       end
 
       size { file.size }
diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb
index 436d309a2ce..530bb0cd25b 100644
--- a/spec/factories/ci/pipelines.rb
+++ b/spec/factories/ci/pipelines.rb
@@ -155,9 +155,9 @@ FactoryBot.define do
         end
       end
 
-      trait :with_quality_report_artifact do
+      trait :with_codequality_mr_diff_report do
         after(:build) do |pipeline, evaluator|
-          pipeline.pipeline_artifacts << build(:ci_pipeline_artifact, :with_codequality_report, pipeline: pipeline, project: pipeline.project)
+          pipeline.pipeline_artifacts << build(:ci_pipeline_artifact, :with_codequality_mr_diff_report, pipeline: pipeline, project: pipeline.project)
         end
       end