remove the :gpg rspec tag
since everything (except the CurrentKeyChain method) operates on a tempoary keychain anyway we don't need this anymore.
This commit is contained in:
parent
9a759c6201
commit
e9515dff84
|
|
@ -1,6 +1,6 @@
|
|||
require 'rails_helper'
|
||||
|
||||
feature 'Profile > GPG Keys', :gpg do
|
||||
feature 'Profile > GPG Keys' do
|
||||
let(:user) { create(:user, email: GpgHelpers::User2.emails.first) }
|
||||
|
||||
before do
|
||||
|
|
|
|||
|
|
@ -44,8 +44,14 @@ describe Gitlab::Gpg do
|
|||
end
|
||||
end
|
||||
|
||||
describe Gitlab::Gpg::CurrentKeyChain, :gpg do
|
||||
describe '.add', :gpg do
|
||||
describe Gitlab::Gpg::CurrentKeyChain do
|
||||
around do |example|
|
||||
Gitlab::Gpg.using_tmp_keychain do
|
||||
example.run
|
||||
end
|
||||
end
|
||||
|
||||
describe '.add' do
|
||||
it 'stores the key in the keychain' do
|
||||
expect(GPGME::Key.find(:public, GpgHelpers::User1.fingerprint)).to eq []
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ describe GpgKey do
|
|||
it { is_expected.not_to allow_value('BEGIN PGP').for(:key) }
|
||||
end
|
||||
|
||||
context 'callbacks', :gpg do
|
||||
context 'callbacks' do
|
||||
describe 'extract_fingerprint' do
|
||||
it 'extracts the fingerprint from the gpg key' do
|
||||
gpg_key = described_class.new(key: GpgHelpers::User1.public_key)
|
||||
|
|
@ -45,7 +45,7 @@ describe GpgKey do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#emails', :gpg do
|
||||
describe '#emails' do
|
||||
it 'returns the emails from the gpg key' do
|
||||
gpg_key = create :gpg_key, key: GpgHelpers::User1.public_key
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ describe GpgKey do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#emails_with_verified_status', :gpg do
|
||||
describe '#emails_with_verified_status' do
|
||||
it 'email is verified if the user has the matching email' do
|
||||
user = create :user, email: 'bette.cartwright@example.com'
|
||||
gpg_key = create :gpg_key, key: GpgHelpers::User2.public_key, user: user
|
||||
|
|
|
|||
|
|
@ -141,12 +141,6 @@ RSpec.configure do |config|
|
|||
config.around(:each, :postgresql) do |example|
|
||||
example.run if Gitlab::Database.postgresql?
|
||||
end
|
||||
|
||||
config.around(:each, :gpg) do |example|
|
||||
Gitlab::Gpg.using_tmp_keychain do
|
||||
example.run
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
FactoryGirl::SyntaxRunner.class_eval do
|
||||
|
|
|
|||
Loading…
Reference in New Issue