Merge branch 'refactor/clarify-response' into 'master'

Refactor/clarify response

See merge request leap/nickserver!20

1 files changed, 17 insertions, 14 deletions

diff --git a/test/remote/hkp_source_test.rb b/test/remote/hkp_source_test.rb
index 8232dce..469941b 100644
--- a/test/remote/hkp_source_test.rb
+++ b/test/remote/hkp_source_test.rb
@@ -7,32 +7,27 @@ class RemoteHkpSourceTest < CelluloidTest
   include HttpAdapterHelper
 
   def test_key_info
-    uid = 'elijah@riseup.net'
-    assert_key_info_for_uid uid do |keys|
-      assert_equal 1, keys.size
-      assert keys.first.keyid =~ /00440025$/
-    end
+    assert_key_found 'elijah@riseup.net', /00440025$/
   end
 
   def test_tls_validation
-    hkp_url = 'https://keys.mayfirst.org/pks/lookup'
-    ca_file = file_path('mayfirst-ca.pem')
-
     config.stub(:hkp_url, hkp_url) do
-      # config.stub(:hkp_ca_file, file_path('autistici-ca.pem')) do
       config.stub(:hkp_ca_file, ca_file) do
         assert File.exist?(Nickserver::Config.hkp_ca_file)
-        uid = 'elijah@riseup.net'
-        assert_key_info_for_uid uid do |keys|
-          assert_equal 1, keys.size
-          assert keys.first.keyid =~ /00440025$/
-        end
+        assert_key_found 'elijah@riseup.net', /00440025$/
       end
     end
   end
 
   protected
 
+  def assert_key_found(uid, fingerprint_regexp)
+    assert_key_info_for_uid uid do |keys|
+      assert_equal 1, keys.size
+      assert keys.first.keyid =~ fingerprint_regexp
+    end
+  end
+
   def assert_key_info_for_uid(uid)
     status, keys = source.search uid
     assert_equal 200, status
@@ -44,4 +39,12 @@ class RemoteHkpSourceTest < CelluloidTest
   def source
     Nickserver::Hkp::Source.new adapter
   end
+
+  def hkp_url
+    'https://keys.mayfirst.org/pks/lookup'
+  end
+
+  def ca_file
+    file_path('mayfirst-ca.pem')
+  end
 end