Merge branch 'fix_expired_gpg_key_specs' into 'master'

Fix broken specs : Generate new GPG key in place of expired one Closes #32956 See merge request gitlab-org/gitlab!17853

Merge branch 'fix_expired_gpg_key_specs' into 'master'
5a54a8d9 · Stan Hu · Robert Speicher · d3cda7c1 · 5a54a8d9 · 5a54a8d9
Unverified Commit 5a54a8d9 authored 5 years ago by Stan Hu Committed by Robert Speicher 5 years ago
--- a/spec/lib/gitlab/gpg/commit_spec.rb
+++ b/spec/lib/gitlab/gpg/commit_spec.rb
@@ -202,7 +202,7 @@ describe Gitlab::Gpg::Commit do
          end
  
          let(:gpg_key_subkey) do
-            gpg_key.subkeys.find_by(fingerprint: '0522DD29B98F167CD8421752E38FFCAF75ABD92A')
+            gpg_key.subkeys.find_by(fingerprint: GpgHelpers::User3.subkey_fingerprints.last)
          end
  
          before do

--- a/spec/support/helpers/gpg_helpers.rb
+++ b/spec/support/helpers/gpg_helpers.rb