From c5dcd7d836d53ede4751405ec5701f9f3b48102c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 2 May 2018 15:45:24 +0200
Subject: Speed up test suite by not generating RSA keys in test environment
 (#7296)

One RSA keypair for all fabricated test accounts is enough
---
 app/models/account.rb                  | 4 ++--
 spec/fabricators/account_fabricator.rb | 8 +++++++-
 spec/models/account_spec.rb            | 3 ++-
 3 files changed, 11 insertions(+), 4 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
diff --git a/spec/fabricators/account_fabricator.rb b/spec/fabricators/account_fabricator.rb
index 446f8ea27..7aa983f82 100644
--- 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 fb7ddfa83..3aaaa55eb 100644
--- 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
-- 
cgit