about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-05-02 15:45:24 +0200
committerGitHub <noreply@github.com>2018-05-02 15:45:24 +0200
commitc5dcd7d836d53ede4751405ec5701f9f3b48102c (patch)
treead8705b51c70cb7f80eff4724f0de708cad10762 /app/models
parent965345316fb3fef640a6bcc463d09d4a38b28608 (diff)
Speed up test suite by not generating RSA keys in test environment (#7296)
One RSA keypair for all fabricated test accounts is enough
Diffstat (limited to 'app/models')
-rw-r--r--app/models/account.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/account.rb b/app/models/account.rb
index 647b5c358..0cd2a10d5 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -406,9 +406,9 @@ class Account < ApplicationRecord
   end
 
   def generate_keys
-    return unless local?
+    return unless local? && !Rails.env.test?
 
-    keypair = OpenSSL::PKey::RSA.new(Rails.env.test? ? 512 : 2048)
+    keypair = OpenSSL::PKey::RSA.new(2048)
     self.private_key = keypair.to_pem
     self.public_key  = keypair.public_key.to_pem
   end