Merge branch 'rs-remove-invalid-key-factories' into 'master'

Remove the invalid key factories

They're only used once each, and they're easy to build in-place.

See merge request !1766

3 files changed, 9 insertions, 22 deletions

diff --git a/spec/factories.rb b/spec/factories.rb
index b9bfd3cebb4..a5c335c82bc 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -101,12 +101,6 @@ FactoryGirl.define do
       user
     end
 
-    factory :key_with_a_space_in_the_middle do
-      key do
-        "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa ++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
-      end
-    end
-
     factory :another_key do
       key do
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDmTillFzNTrrGgwaCKaSj+QCz81E6jBc/s9av0+3b1Hwfxgkqjl4nAK/OD2NjgyrONDTDfR8cRN4eAAy6nY8GLkOyYBDyuc5nTMqs5z3yVuTwf3koGm/YQQCmo91psZ2BgDFTor8SVEE5Mm1D1k3JDMhDFxzzrOtRYFPci9lskTJaBjpqWZ4E9rDTD2q/QZntCqbC3wE9uSemRQB5f8kik7vD/AD8VQXuzKladrZKkzkONCPWsXDspUitjM8HkQdOf0PsYn1CMUC1xKYbCxkg5TkEosIwGv6CoEArUrdu/4+10LVslq494mAvEItywzrluCLCnwELfW+h/m8UHoVhZ"
@@ -115,12 +109,6 @@ FactoryGirl.define do
       factory :another_deploy_key, class: 'DeployKey' do
       end
     end
-
-    factory :invalid_key do
-      key do
-        "ssh-rsa this_is_invalid_key=="
-      end
-    end
   end
 
   factory :email do
diff --git a/spec/factories_spec.rb b/spec/factories_spec.rb
index c8e218d4d03..457859dedaf 100644
--- a/spec/factories_spec.rb
+++ b/spec/factories_spec.rb
@@ -1,12 +1,6 @@
 require 'spec_helper'
 
-INVALID_FACTORIES = [
-  :key_with_a_space_in_the_middle,
-  :invalid_key,
-]
-
 FactoryGirl.factories.map(&:name).each do |factory_name|
-  next if INVALID_FACTORIES.include?(factory_name)
   describe "#{factory_name} factory" do
     it 'should be valid' do
       expect(build(factory_name)).to be_valid
diff --git a/spec/models/key_spec.rb b/spec/models/key_spec.rb
index a212b95a7d6..2fb651bef1b 100644
--- a/spec/models/key_spec.rb
+++ b/spec/models/key_spec.rb
@@ -58,12 +58,17 @@ describe Key do
       expect(build(:key)).to be_valid
     end
 
-    it "rejects the unfingerprintable key (contains space in middle)" do
-      expect(build(:key_with_a_space_in_the_middle)).not_to be_valid
+    it 'rejects an unfingerprintable key that contains a space' do
+      key = build(:key)
+
+      # Not always the middle, but close enough
+      key.key = key.key[0..100] + ' ' + key.key[100..-1]
+
+      expect(key).not_to be_valid
     end
 
-    it "rejects the unfingerprintable key (not a key)" do
-      expect(build(:invalid_key)).not_to be_valid
+    it 'rejects the unfingerprintable key (not a key)' do
+      expect(build(:key, key: 'ssh-rsa an-invalid-key==')).not_to be_valid
     end
   end