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

1 files changed, 18 insertions, 0 deletions

diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 7e121b10632..1a8c5d7e40c 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -81,6 +81,14 @@ FactoryBot.define do
       end
     end
 
+    trait :two_factor_via_webauthn do
+      transient { registrations_count { 5 } }
+
+      after(:create) do |user, evaluator|
+        create_list(:webauthn_registration, evaluator.registrations_count, user: user)
+      end
+    end
+
     trait :readme do
       project_view { :readme }
     end
@@ -128,6 +136,16 @@ FactoryBot.define do
       end
     end
 
+    factory :atlassian_user do
+      transient do
+        extern_uid { generate(:username) }
+      end
+
+      after(:create) do |user, evaluator|
+        create(:atlassian_identity, user: user, extern_uid: evaluator.extern_uid)
+      end
+    end
+
     factory :admin, traits: [:admin]
   end
 end