add second gpg key for specs

spec/factories/gpg_keys.rb

@@ -2,6 +2,6 @@ require_relative '../support/gpg_helpers'
 
 FactoryGirl.define do
   factory :gpg_key do
-    key GpgHelpers.public_key
+    key GpgHelpers::User1.public_key
   end
 end

spec/lib/gitlab/gpg_spec.rb

@@ -4,7 +4,7 @@ describe Gitlab::Gpg do
   describe '.fingerprints_from_key' do
     it 'returns the fingerprint' do
       expect(
-        described_class.fingerprints_from_key(GpgHelpers.public_key)
+        described_class.fingerprints_from_key(GpgHelpers::User1.public_key)
       ).to eq ['4F4840A503964251CF7D7F5DC728AF10972E97C0']
     end
 
@@ -19,7 +19,7 @@ describe Gitlab::Gpg do
     it 'stores the key in the keychain' do
       expect(GPGME::Key.find(:public, '4F4840A503964251CF7D7F5DC728AF10972E97C0')).to eq []
 
-      Gitlab::Gpg.add_to_keychain(GpgHelpers.public_key)
+      Gitlab::Gpg.add_to_keychain(GpgHelpers::User1.public_key)
 
       expect(GPGME::Key.find(:public, '4F4840A503964251CF7D7F5DC728AF10972E97C0')).not_to eq []
     end
@@ -27,7 +27,7 @@ describe Gitlab::Gpg do
 
   describe '.remove_from_keychain', :gpg do
     it 'removes the key from the keychain' do
-      Gitlab::Gpg.add_to_keychain(GpgHelpers.public_key)
+      Gitlab::Gpg.add_to_keychain(GpgHelpers::User1.public_key)
       expect(GPGME::Key.find(:public, '4F4840A503964251CF7D7F5DC728AF10972E97C0')).not_to eq []
 
       Gitlab::Gpg.remove_from_keychain('4F4840A503964251CF7D7F5DC728AF10972E97C0')

spec/models/commit_spec.rb

@@ -422,11 +422,11 @@ eos
 
     context 'signed commit', :gpg do
       it 'returns a valid signature if the public key is known' do
-        GPGME::Key.import(GpgHelpers.public_key)
+        GPGME::Key.import(GpgHelpers::User1.public_key)
 
         raw_commit = double(:raw_commit, signature: [
-          GpgHelpers.signed_commit_signature,
-          GpgHelpers.signed_commit_base_data
+          GpgHelpers::User1.signed_commit_signature,
+          GpgHelpers::User1.signed_commit_base_data
         ])
         allow(raw_commit).to receive :save!
 
@@ -440,8 +440,8 @@ eos
 
       it 'returns an invalid signature if the public commit is unknown', :gpg do
         raw_commit = double(:raw_commit, signature: [
-          GpgHelpers.signed_commit_signature,
-          GpgHelpers.signed_commit_base_data
+          GpgHelpers::User1.signed_commit_signature,
+          GpgHelpers::User1.signed_commit_base_data
         ])
         allow(raw_commit).to receive :save!
 

spec/models/gpg_key_spec.rb

@@ -16,7 +16,7 @@ describe GpgKey do
   context 'callbacks', :gpg do
     describe 'extract_fingerprint' do
       it 'extracts the fingerprint from the gpg key' do
-        gpg_key = described_class.new(key: GpgHelpers.public_key)
+        gpg_key = described_class.new(key: GpgHelpers::User1.public_key)
         gpg_key.valid?
         expect(gpg_key.fingerprint).to eq '4F4840A503964251CF7D7F5DC728AF10972E97C0'
       end
@@ -24,7 +24,7 @@ describe GpgKey do
 
     describe 'add_to_keychain' do
       it 'calls add_to_keychain after create' do
-        expect(Gitlab::Gpg).to receive(:add_to_keychain).with(GpgHelpers.public_key)
+        expect(Gitlab::Gpg).to receive(:add_to_keychain).with(GpgHelpers::User1.public_key)
         create :gpg_key
       end
     end

spec/support/gpg_helpers.rb

 module GpgHelpers
+  module User1
     extend self
 
     def signed_commit_signature
@@ -219,4 +220,89 @@ module GpgHelpers
         -----END PGP PUBLIC KEY BLOCK-----
       PUBLICKEY
     end
+
+    def key_id
+      '972E97C0'
+    end
+  end
+
+  module User2
+    extend self
+
+    def private_key
+      <<~KEY.strip
+        -----BEGIN PGP PRIVATE KEY BLOCK-----
+        Version: GnuPG v1
+
+        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
+        =yEqv
+        -----END PGP PRIVATE KEY BLOCK-----
+      KEY
+    end
+
+    def public_key
+      <<~KEY.strip
+        -----BEGIN PGP PUBLIC KEY BLOCK-----
+        Version: GnuPG v1
+
+        mI0EWK6qKgEEAODjqOSIBNYzL23WenEVYnvvGJs9d1SjfosBmBnq4a6eBLNwUvjn
+        Rt0TIwwablEmnoMJiRmXBAOUz/9gSrB/QKar8CJsLmb1sevuF/mwzGXjSywnh+N3
+        NPqh2KE7S/EPYBFKu2LCQRLMXGMnnWaM590+8AZ/S5zHOB5F9SUKszeTABEBAAG0
+        L0JldHRlIENhcnR3cmlnaHQgPGJldHRlLmNhcnR3cmlnaHRAZXhhbXBsZS5jb20+
+        iLgEEwECACIFAliuqioCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEL+d
+        kl+RHv1lQhsD/0LDi008hCeoZdGMuwy2N5FMUusYg/X1tRQ6E0JcYYjvvE5oIZoX
+        bVN0yLLD99P0rt6TSlt05CC7RPVPCNpKxKbF+TZMjMJiOi13XmY5Yti77ZMdBZtD
+        7HeBzjkWCVuR6k8eIwy83niHGI6p6G87Q6XxvDjQ7wdBCNBpwkzmTYIBuI0EWK6q
+        KgEEAN7mdR1U5xtmWfE6OXQoEBP4DlubIEtRPQGYs+yYDg+5cNK2Hta+Js8LzBwJ
+        0JhWTQhExid5lSJar+jlziu2F8tHiODySu6+iZDgTh3iHIjpHQwvFdhndcy7rtW5
+        JwWBstRHDV5FnXoA13c1zVW4VbuazS8IbSJ0HyJJkGhQtorxABEBAAGInwQYAQIA
+        CQUCWK6qKgIbDAAKCRC/nZJfkR79ZUIIBADVsEMK5U9gRS1lfBcfsJYN9fpnI5E6
+        tC2lrt6LngJbqEpfd9gek6K7jIeuiaMaUg1OOMdyWwmmf+qaImLOQH3/GXshFZX5
+        FWkOyFnebKY6V2kuIqAjn5GXqZm07hO0z0FjOIgQLbiH4iRosHKVljPiiB9vNcoX
+        wnG0c8xS7AlUMQ==
+        =Erp5
+        -----END PGP PUBLIC KEY BLOCK-----
+      KEY
+    end
+
+    def key_id
+      '911EFD65'
+    end
+
+    def signature
+      '6D494CA6FC90C0CAE0910E42BF9D925F911EFD65'
+    end
+  end
 end