Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 0 deletions

diff --git a/spec/factories/achievements/achievements.rb b/spec/factories/achievements/achievements.rb
index 080a0376999..3f4d0ef082a 100644
--- a/spec/factories/achievements/achievements.rb
+++ b/spec/factories/achievements/achievements.rb
@@ -5,5 +5,9 @@ FactoryBot.define do
     namespace
 
     name { generate(:name) }
+
+    trait :with_avatar do
+      avatar { fixture_file_upload('spec/fixtures/dk.png') }
+    end
   end
 end
diff --git a/spec/factories/topics.rb b/spec/factories/topics.rb
index a6e614e0c66..d5da2dd4938 100644
--- a/spec/factories/topics.rb
+++ b/spec/factories/topics.rb
@@ -4,5 +4,9 @@ FactoryBot.define do
   factory :topic, class: 'Projects::Topic' do
     name { generate(:name) }
     title { generate(:title) }
+
+    trait :with_avatar do
+      avatar { fixture_file_upload('spec/fixtures/dk.png') }
+    end
   end
 end