move current keychain methods to namespace

1 files changed, 17 insertions, 17 deletions

diff --git a/spec/lib/gitlab/gpg_spec.rb b/spec/lib/gitlab/gpg_spec.rb
index 2a55e7d89de..c0df719c0c2 100644
--- a/spec/lib/gitlab/gpg_spec.rb
+++ b/spec/lib/gitlab/gpg_spec.rb
@@ -28,37 +28,37 @@ describe Gitlab::Gpg do
       ).to eq []
     end
   end
+end
+
+describe Gitlab::Gpg::CurrentKeyChain, :gpg do
+  describe '.emails' do
+    it 'returns the emails' do
+      Gitlab::Gpg::CurrentKeyChain.add(GpgHelpers::User2.public_key)
+
+      expect(
+        described_class.emails(GpgHelpers::User2.fingerprint)
+      ).to match_array GpgHelpers::User2.emails
+    end
+  end
 
-  describe '.add_to_keychain', :gpg do
+  describe '.add', :gpg do
     it 'stores the key in the keychain' do
       expect(GPGME::Key.find(:public, GpgHelpers::User1.fingerprint)).to eq []
 
-      Gitlab::Gpg.add_to_keychain(GpgHelpers::User1.public_key)
+      Gitlab::Gpg::CurrentKeyChain.add(GpgHelpers::User1.public_key)
 
       expect(GPGME::Key.find(:public, GpgHelpers::User1.fingerprint)).not_to eq []
     end
   end
 
-  describe '.remove_from_keychain', :gpg do
+  describe '.remove', :gpg do
     it 'removes the key from the keychain' do
-      Gitlab::Gpg.add_to_keychain(GpgHelpers::User1.public_key)
+      Gitlab::Gpg::CurrentKeyChain.add(GpgHelpers::User1.public_key)
       expect(GPGME::Key.find(:public, GpgHelpers::User1.fingerprint)).not_to eq []
 
-      Gitlab::Gpg.remove_from_keychain(GpgHelpers::User1.fingerprint)
+      Gitlab::Gpg::CurrentKeyChain.remove(GpgHelpers::User1.fingerprint)
 
       expect(GPGME::Key.find(:public, GpgHelpers::User1.fingerprint)).to eq []
     end
   end
 end
-
-describe Gitlab::Gpg::CurrentKeyChain, :gpg do
-  describe '.emails' do
-    it 'returns the emails' do
-      Gitlab::Gpg.add_to_keychain(GpgHelpers::User2.public_key)
-
-      expect(
-        described_class.emails(GpgHelpers::User2.fingerprint)
-      ).to match_array GpgHelpers::User2.emails
-    end
-  end
-end