Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 3 deletions

diff --git a/spec/factories/keys.rb b/spec/factories/keys.rb
index a7478ce2657..ccf835fe56e 100644
--- a/spec/factories/keys.rb
+++ b/spec/factories/keys.rb
@@ -3,8 +3,13 @@
 FactoryBot.define do
   factory :key do
     title
-    key { SSHData::PrivateKey::RSA.generate(1024, unsafe_allow_small_key: true).public_key.openssh(comment: 'dummy@gitlab.com') }
-
+    key do
+      # Larger keys take longer to generate, and since this factory gets called frequently,
+      # let's only create the smallest one we need.
+      SSHData::PrivateKey::RSA.generate(
+        ::Gitlab::SSHPublicKey.supported_sizes(:rsa).min, unsafe_allow_small_key: true
+      ).public_key.openssh(comment: 'dummy@gitlab.com')
+    end
     trait :expired do
       to_create { |key| key.save!(validate: false) }
       expires_at { 2.days.ago }
@@ -16,7 +21,7 @@ FactoryBot.define do
     end
 
     factory :key_without_comment do
-      key { SSHData::PrivateKey::RSA.generate(1024, unsafe_allow_small_key: true).public_key.openssh }
+      key { SSHData::PrivateKey::RSA.generate(3072, unsafe_allow_small_key: true).public_key.openssh }
     end
 
     factory :deploy_key, class: 'DeployKey'