store gpg user name and email on the signature

2 files changed, 14 insertions, 6 deletions

diff --git a/spec/lib/gitlab/gpg/commit_spec.rb b/spec/lib/gitlab/gpg/commit_spec.rb
index 661956b7bb7..ddb8dd9f0f4 100644
--- a/spec/lib/gitlab/gpg/commit_spec.rb
+++ b/spec/lib/gitlab/gpg/commit_spec.rb
@@ -32,6 +32,8 @@ RSpec.describe Gitlab::Gpg::Commit do
           project: project,
           gpg_key: gpg_key,
           gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
+          gpg_key_user_name: GpgHelpers::User1.names.first,
+          gpg_key_user_email: GpgHelpers::User1.emails.first,
           valid_signature: true
         )
       end
@@ -67,6 +69,8 @@ RSpec.describe Gitlab::Gpg::Commit do
           project: project,
           gpg_key: gpg_key,
           gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
+          gpg_key_user_name: GpgHelpers::User1.names.first,
+          gpg_key_user_email: GpgHelpers::User1.emails.first,
           valid_signature: false
         )
       end
@@ -102,6 +106,8 @@ RSpec.describe Gitlab::Gpg::Commit do
           project: project,
           gpg_key: nil,
           gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
+          gpg_key_user_name: nil,
+          gpg_key_user_email: nil,
           valid_signature: false
         )
       end
diff --git a/spec/lib/gitlab/gpg_spec.rb b/spec/lib/gitlab/gpg_spec.rb
index ebb7720eaea..8041518117d 100644
--- a/spec/lib/gitlab/gpg_spec.rb
+++ b/spec/lib/gitlab/gpg_spec.rb
@@ -28,16 +28,18 @@ describe Gitlab::Gpg do
     end
   end
 
-  describe '.emails_from_key' do
-    it 'returns the emails' do
-      expect(
-        described_class.emails_from_key(GpgHelpers::User1.public_key)
-      ).to eq GpgHelpers::User1.emails
+  describe '.user_infos_from_key' do
+    it 'returns the names and emails' do
+      user_infos = described_class.user_infos_from_key(GpgHelpers::User1.public_key)
+      expect(user_infos).to eq([{
+        name: GpgHelpers::User1.names.first,
+        email: GpgHelpers::User1.emails.first
+      }])
     end
 
     it 'returns an empty array when the key is invalid' do
       expect(
-        described_class.emails_from_key('bogus')
+        described_class.user_infos_from_key('bogus')
       ).to eq []
     end
   end