diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 12:09:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 12:09:31 +0300 |
commit | 6763d2787670bc03a36a8eb601703e88fc70dece (patch) | |
tree | edc653ffd3052e3f9898c4fa8a07621d51574767 /spec/factories | |
parent | ed9165c2abda1dca048a8d3cb8030d906c0bbb0c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/ci/daily_report_results.rb | 13 | ||||
-rw-r--r-- | spec/factories/users.rb | 2 |
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 |