Speed up test suite by not generating RSA keys in test environment (#7296)

One RSA keypair for all fabricated test accounts is enough

diff --git a/app/models/account.rb b/app/models/account.rb
index 647b5c358a558228208c0ed39f208388ba9d6e75..0cd2a10d5b0372cfc3b72293bd196abb0777f4db 100644 (file)
--- 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

diff --git a/spec/fabricators/account_fabricator.rb b/spec/fabricators/account_fabricator.rb
index 446f8ea27931f4aad5190173e7faa9537a8c65ee..7aa983f821f15cb4a85c9e171ef3002e40b7a1af 100644 (file)
--- a/spec/fabricators/account_fabricator.rb
+++ b/spec/fabricators/account_fabricator.rb
@@ -1,4 +1,10 @@
+keypair     = OpenSSL::PKey::RSA.new(2048)
+public_key  = keypair.public_key.to_pem
+private_key = keypair.to_pem
+
 Fabricator(:account) do
-  username { sequence(:username) { |i| "#{Faker::Internet.user_name(nil, %w(_))}#{i}" } }
+  username            { sequence(:username) { |i| "#{Faker::Internet.user_name(nil, %w(_))}#{i}" } }
   last_webfingered_at { Time.now.utc }
+  public_key          { public_key }
+  private_key         { private_key}
 end

diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index fb7ddfa83ef920b92d906c8dca30979dab3179e1..3aaaa55eb1333d235a1d9b24cf5a967e3491db26 100644 (file)
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -815,7 +815,8 @@ RSpec.describe Account, type: :model do
   end
 
   context 'when is local' do
-    it 'generates keys' do
+    # Test disabled because test environment omits autogenerating keys for performance
+    xit 'generates keys' do
       account = Account.create!(domain: nil, username: Faker::Internet.user_name(nil, ['_']))
       expect(account.keypair.private?).to eq true
     end