Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 12 insertions, 2 deletions

diff --git a/spec/factories/events.rb b/spec/factories/events.rb
index 5b456bb58ff..ed6cb3505f4 100644
--- a/spec/factories/events.rb
+++ b/spec/factories/events.rb
@@ -25,13 +25,23 @@ FactoryBot.define do
 
     factory :wiki_page_event do
       action { Event::CREATED }
-      project { @overrides[:wiki_page]&.project || create(:project, :wiki_repo) }
+      project { @overrides[:wiki_page]&.container || create(:project, :wiki_repo) }
       target { create(:wiki_page_meta, :for_wiki_page, wiki_page: wiki_page) }
 
       transient do
-        wiki_page { create(:wiki_page, project: project) }
+        wiki_page { create(:wiki_page, container: project) }
       end
     end
+
+    trait :for_design do
+      transient do
+        design { create(:design, issue: create(:issue, project: project)) }
+        note { create(:note, author: author, project: project, noteable: design) }
+      end
+
+      action { Event::COMMENTED }
+      target { note }
+    end
   end
 
   factory :push_event, class: 'PushEvent' do