Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/factories/events.rb b/spec/factories/events.rb
index b4285627de3..5b456bb58ff 100644
--- a/spec/factories/events.rb
+++ b/spec/factories/events.rb
@@ -25,12 +25,12 @@ FactoryBot.define do
 
     factory :wiki_page_event do
       action { Event::CREATED }
+      project { @overrides[:wiki_page]&.project || 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) }
       end
-
-      target { create(:wiki_page_meta, :for_wiki_page, wiki_page: wiki_page) }
     end
   end
 
diff --git a/spec/factories/evidences.rb b/spec/factories/evidences.rb
index 964f232a1c9..77116d8e9ed 100644
--- a/spec/factories/evidences.rb
+++ b/spec/factories/evidences.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :evidence do
+  factory :evidence, class: 'Releases::Evidence' do
     release
   end
 end