diff options
author | Alexis Reigel <mail@koffeinfrei.org> | 2017-02-22 15:37:49 +0100 |
---|---|---|
committer | Alexis Reigel <mail@koffeinfrei.org> | 2017-07-27 15:40:40 +0200 |
commit | 7b7cd6f69d59092a55fc8b293edf09638fba20d9 (patch) | |
tree | 301427683e57800aeda05affc1057df192638437 | |
parent | fbf1fd1a204a24aef2b80473ec64a520ed2a2dfc (diff) | |
download | gitlab-ce-7b7cd6f69d59092a55fc8b293edf09638fba20d9.tar.gz |
add emails method to GgpKey
-rw-r--r-- | app/models/gpg_key.rb | 5 | ||||
-rw-r--r-- | spec/factories/gpg_keys.rb | 7 | ||||
-rw-r--r-- | spec/models/gpg_key_spec.rb | 8 |
3 files changed, 20 insertions, 0 deletions
diff --git a/app/models/gpg_key.rb b/app/models/gpg_key.rb index 16de0b542d7..d77051850f3 100644 --- a/app/models/gpg_key.rb +++ b/app/models/gpg_key.rb @@ -21,6 +21,11 @@ class GpgKey < ActiveRecord::Base write_attribute(:key, value) end + def emails + raw_key = GPGME::Key.get(fingerprint) + raw_key.uids.map(&:email) + end + private def extract_fingerprint diff --git a/spec/factories/gpg_keys.rb b/spec/factories/gpg_keys.rb new file mode 100644 index 00000000000..e43a3c19672 --- /dev/null +++ b/spec/factories/gpg_keys.rb @@ -0,0 +1,7 @@ +require_relative '../support/gpg_helpers' + +FactoryGirl.define do + factory :gpg_key do + key GpgHelpers.public_key + end +end diff --git a/spec/models/gpg_key_spec.rb b/spec/models/gpg_key_spec.rb index 02623c52fa6..24ef291a021 100644 --- a/spec/models/gpg_key_spec.rb +++ b/spec/models/gpg_key_spec.rb @@ -38,4 +38,12 @@ describe GpgKey do expect(described_class.new(key: " #{key} ").key).to eq(key) end end + + describe '#emails' do + it 'returns the emails from the gpg key' do + gpg_key = create :gpg_key + + expect(gpg_key.emails).to match_array %w(mail@koffeinfrei.org lex@panter.ch) + end + end end |