Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 1 deletions

diff --git a/spec/factories/events.rb b/spec/factories/events.rb
index 021d2070b87..60bb3044191 100644
--- a/spec/factories/events.rb
+++ b/spec/factories/events.rb
@@ -17,6 +17,7 @@ FactoryBot.define do
     trait(:left)      { action { :left } }
     trait(:destroyed) { action { :destroyed } }
     trait(:expired)   { action { :expired } }
+    trait(:archived)  { action { :archived } }
 
     factory :closed_issue_event do
       action { :closed }
@@ -33,15 +34,27 @@ 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 { :commented }
       target { note }
     end
+
+    factory :design_event, traits: [:has_design] do
+      action { :created }
+      target { design }
+    end
   end
 
   factory :push_event, class: 'PushEvent' do