diff options
| author | Alexis Reigel <mail@koffeinfrei.org> | 2017-02-23 12:02:36 +0100 |
|---|---|---|
| committer | Alexis Reigel <mail@koffeinfrei.org> | 2017-07-27 15:40:41 +0200 |
| commit | eb77e1068c09cf8ef45689720a2bf200542b8024 (patch) | |
| tree | 2ff4c03ed9d879a36a52e3b4f1eb97d283deac02 /spec/models | |
| parent | 87c0fd34557463528a552986a42f4ebb52d3bd56 (diff) | |
| download | gitlab-ce-eb77e1068c09cf8ef45689720a2bf200542b8024.tar.gz | |
add second gpg key for specs
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/commit_spec.rb | 10 | ||||
| -rw-r--r-- | spec/models/gpg_key_spec.rb | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb index 0fc00ab4f18..3c6ce49b48d 100644 --- a/spec/models/commit_spec.rb +++ b/spec/models/commit_spec.rb @@ -422,11 +422,11 @@ eos context 'signed commit', :gpg do it 'returns a valid signature if the public key is known' do - GPGME::Key.import(GpgHelpers.public_key) + GPGME::Key.import(GpgHelpers::User1.public_key) raw_commit = double(:raw_commit, signature: [ - GpgHelpers.signed_commit_signature, - GpgHelpers.signed_commit_base_data + GpgHelpers::User1.signed_commit_signature, + GpgHelpers::User1.signed_commit_base_data ]) allow(raw_commit).to receive :save! @@ -440,8 +440,8 @@ eos it 'returns an invalid signature if the public commit is unknown', :gpg do raw_commit = double(:raw_commit, signature: [ - GpgHelpers.signed_commit_signature, - GpgHelpers.signed_commit_base_data + GpgHelpers::User1.signed_commit_signature, + GpgHelpers::User1.signed_commit_base_data ]) allow(raw_commit).to receive :save! diff --git a/spec/models/gpg_key_spec.rb b/spec/models/gpg_key_spec.rb index facdf91550f..6bfd0b0d4f6 100644 --- a/spec/models/gpg_key_spec.rb +++ b/spec/models/gpg_key_spec.rb @@ -16,7 +16,7 @@ describe GpgKey do context 'callbacks', :gpg do describe 'extract_fingerprint' do it 'extracts the fingerprint from the gpg key' do - gpg_key = described_class.new(key: GpgHelpers.public_key) + gpg_key = described_class.new(key: GpgHelpers::User1.public_key) gpg_key.valid? expect(gpg_key.fingerprint).to eq '4F4840A503964251CF7D7F5DC728AF10972E97C0' end @@ -24,7 +24,7 @@ describe GpgKey do describe 'add_to_keychain' do it 'calls add_to_keychain after create' do - expect(Gitlab::Gpg).to receive(:add_to_keychain).with(GpgHelpers.public_key) + expect(Gitlab::Gpg).to receive(:add_to_keychain).with(GpgHelpers::User1.public_key) create :gpg_key end end |