From e9515dff845dfbbb51e556e4e6a4f9cf951cf239 Mon Sep 17 00:00:00 2001
From: Alexis Reigel <mail@koffeinfrei.org>
Date: Wed, 28 Jun 2017 13:08:29 +0200
Subject: [PATCH] remove the :gpg rspec tag
since everything (except the CurrentKeyChain method) operates on a
tempoary keychain anyway we don't need this anymore.
---
spec/features/profiles/gpg_keys_spec.rb | 2 +-
spec/lib/gitlab/gpg_spec.rb | 10 ++++++++--
spec/models/gpg_key_spec.rb | 6 +++---
spec/spec_helper.rb | 6 ------
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/spec/features/profiles/gpg_keys_spec.rb b/spec/features/profiles/gpg_keys_spec.rb
index 552cca4a84e..350126523b0 100644
--- a/spec/features/profiles/gpg_keys_spec.rb
+++ b/spec/features/profiles/gpg_keys_spec.rb
@@ -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
diff --git a/spec/lib/gitlab/gpg_spec.rb b/spec/lib/gitlab/gpg_spec.rb
index edf7405d7f1..497fbeab5d5 100644
--- a/spec/lib/gitlab/gpg_spec.rb
+++ b/spec/lib/gitlab/gpg_spec.rb
@@ -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 []
diff --git a/spec/models/gpg_key_spec.rb b/spec/models/gpg_key_spec.rb
index 3cb1723cc12..312e026a78e 100644
--- a/spec/models/gpg_key_spec.rb
+++ b/spec/models/gpg_key_spec.rb
@@ -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
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a0df233507b..e7329210896 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -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
--
GitLab