diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-10-06 13:36:20 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-10-06 13:36:20 +0000 |
commit | dd42cb5f8f4724fa899dae929975da78846f0950 (patch) | |
tree | 682d393b3e122b5fc988b78d3d188694ef317c12 /spec/features | |
parent | 050548032475458a70005ed3f7ff74211084a423 (diff) | |
parent | 555f50b3e68e82968ea2eb4916a3f5beeeef7b31 (diff) | |
download | gitlab-ce-dd42cb5f8f4724fa899dae929975da78846f0950.tar.gz |
Merge branch '36829-gpg-commit-not-verified-if-signed-with-a-subkey' into 'master'
Add support for GPG subkeys in signature verification
Closes #36829
See merge request gitlab-org/gitlab-ce!14517
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/profiles/gpg_keys_spec.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/spec/features/profiles/gpg_keys_spec.rb b/spec/features/profiles/gpg_keys_spec.rb index b0f6848bc4b..59233e92f93 100644 --- a/spec/features/profiles/gpg_keys_spec.rb +++ b/spec/features/profiles/gpg_keys_spec.rb @@ -20,6 +20,18 @@ feature 'Profile > GPG Keys' do expect(page).to have_content('bette.cartwright@example.net Unverified') expect(page).to have_content(GpgHelpers::User2.fingerprint) end + + scenario 'with multiple subkeys' do + fill_in('Key', with: GpgHelpers::User3.public_key) + click_button('Add key') + + expect(page).to have_content('john.doe@example.com Unverified') + expect(page).to have_content(GpgHelpers::User3.fingerprint) + + GpgHelpers::User3.subkey_fingerprints.each do |fingerprint| + expect(page).to have_content(fingerprint) + end + end end scenario 'User sees their key' do |