Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 4 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 875371d26c9..26786aab12c 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -320,6 +320,12 @@ FactoryBot.define do
       end
     end
 
+    trait :accessibility_reports do
+      after(:build) do |build|
+        build.job_artifacts << create(:ci_job_artifact, :accessibility, job: build)
+      end
+    end
+
     trait :coverage_reports do
       after(:build) do |build|
         build.job_artifacts << create(:ci_job_artifact, :cobertura, job: build)
diff --git a/spec/factories/ci/daily_report_results.rb b/spec/factories/ci/daily_build_group_report_results.rb
index e2255e8a134..7f72991b3eb 100644
--- a/spec/factories/ci/daily_report_results.rb
+++ b/spec/factories/ci/daily_build_group_report_results.rb
@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :ci_daily_report_result, class: 'Ci::DailyReportResult' do
+  factory :ci_daily_build_group_report_result, class: 'Ci::DailyBuildGroupReportResult' do
     ref_path { Gitlab::Git::BRANCH_REF_PREFIX + 'master' }
     date { Time.zone.now.to_date }
     project
     last_pipeline factory: :ci_pipeline
-    param_type { Ci::DailyReportResult.param_types[:coverage] }
-    title { 'rspec' }
-    value { 77.0 }
+    group_name { 'rspec' }
+    data do
+      { coverage: 77.0 }
+    end
   end
 end