diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /spec/factories/events.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'spec/factories/events.rb')
-rw-r--r-- | spec/factories/events.rb | 49 |
1 files changed, 31 insertions, 18 deletions
diff --git a/spec/factories/events.rb b/spec/factories/events.rb index ed6cb3505f4..60bb3044191 100644 --- a/spec/factories/events.rb +++ b/spec/factories/events.rb @@ -4,27 +4,28 @@ FactoryBot.define do factory :event do project author(factory: :user) { project.creator } - action { Event::JOINED } - - trait(:created) { action { Event::CREATED } } - trait(:updated) { action { Event::UPDATED } } - trait(:closed) { action { Event::CLOSED } } - trait(:reopened) { action { Event::REOPENED } } - trait(:pushed) { action { Event::PUSHED } } - trait(:commented) { action { Event::COMMENTED } } - trait(:merged) { action { Event::MERGED } } - trait(:joined) { action { Event::JOINED } } - trait(:left) { action { Event::LEFT } } - trait(:destroyed) { action { Event::DESTROYED } } - trait(:expired) { action { Event::EXPIRED } } + action { :joined } + + trait(:created) { action { :created } } + trait(:updated) { action { :updated } } + trait(:closed) { action { :closed } } + trait(:reopened) { action { :reopened } } + trait(:pushed) { action { :pushed } } + trait(:commented) { action { :commented } } + trait(:merged) { action { :merged } } + trait(:joined) { action { :joined } } + trait(:left) { action { :left } } + trait(:destroyed) { action { :destroyed } } + trait(:expired) { action { :expired } } + trait(:archived) { action { :archived } } factory :closed_issue_event do - action { Event::CLOSED } + action { :closed } target factory: :closed_issue end factory :wiki_page_event do - action { Event::CREATED } + action { :created } project { @overrides[:wiki_page]&.container || create(:project, :wiki_repo) } target { create(:wiki_page_meta, :for_wiki_page, wiki_page: wiki_page) } @@ -33,21 +34,33 @@ FactoryBot.define do end end - trait :for_design do + trait :has_design do transient do design { create(:design, issue: create(:issue, project: project)) } + end + end + + trait :for_design do + has_design + + transient do note { create(:note, author: author, project: project, noteable: design) } end - action { Event::COMMENTED } + action { :commented } target { note } end + + factory :design_event, traits: [:has_design] do + action { :created } + target { design } + end end factory :push_event, class: 'PushEvent' do project factory: :project_empty_repo author(factory: :user) { project.creator } - action { Event::PUSHED } + action { :pushed } end factory :push_event_payload do |