summaryrefslogtreecommitdiff
path: root/spec/models/commit_spec.rb
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-06-13 14:26:42 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2017-07-27 15:42:53 +0200
commit2f956fae0399f6f2eb370ed186c7bb4a9486178b (patch)
tree17586eca89b12af582e25a7b645deff0d25c8572 /spec/models/commit_spec.rb
parent3c42d730986222d891c9b7985edf3942021afcef (diff)
downloadgitlab-ce-2f956fae0399f6f2eb370ed186c7bb4a9486178b.tar.gz
verify gpg commit using tmp keyring and db query
Diffstat (limited to 'spec/models/commit_spec.rb')
-rw-r--r--spec/models/commit_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 3c6ce49b48d..96af675c3f4 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -422,7 +422,7 @@ eos
context 'signed commit', :gpg do
it 'returns a valid signature if the public key is known' do
- GPGME::Key.import(GpgHelpers::User1.public_key)
+ create :gpg_key, key: GpgHelpers::User1.public_key
raw_commit = double(:raw_commit, signature: [
GpgHelpers::User1.signed_commit_signature,
@@ -438,7 +438,7 @@ eos
expect(commit.signature.valid?).to be_truthy
end
- it 'returns an invalid signature if the public commit is unknown', :gpg do
+ it 'returns an invalid signature if the public key is unknown', :gpg do
raw_commit = double(:raw_commit, signature: [
GpgHelpers::User1.signed_commit_signature,
GpgHelpers::User1.signed_commit_base_data