Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 1 deletions

diff --git a/spec/factories/ci/daily_report_results.rb b/spec/factories/ci/daily_report_results.rb
new file mode 100644
index 00000000000..e2255e8a134
--- /dev/null
+++ b/spec/factories/ci/daily_report_results.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :ci_daily_report_result, class: 'Ci::DailyReportResult' 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 }
+  end
+end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 34f6da682b6..0ce567e11fe 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -24,7 +24,7 @@ FactoryBot.define do
     end
 
     trait :bot do
-      bot_type { User.bot_types[:alert_bot] }
+      user_type { :alert_bot }
     end
 
     trait :external do