Merge branch 'rubocop' into 'master'

Style fixes based on Rubocop

See merge request leap/nickserver!19

1 files changed, 26 insertions, 10 deletions

diff --git a/test/support/http_stub_helper.rb b/test/support/http_stub_helper.rb
index cc9196e..b0ec069 100644
--- a/test/support/http_stub_helper.rb
+++ b/test/support/http_stub_helper.rb
@@ -1,6 +1,7 @@
 require 'nickserver/reel_server'
 
 module HttpStubHelper
+  protected
 
   def stubbing_http
     Nickserver::ReelServer::DEFAULT_ADAPTER_CLASS.stub :new, adapter do
@@ -11,18 +12,35 @@ module HttpStubHelper
 
   def stub_nicknym_available_response(domain, response = {})
     stub_http_get "https://#{domain}/provider.json",
-      response,
-      Hash
+                  response,
+                  Hash
   end
 
   def stub_sks_vindex_reponse(uid, response = {})
-    stub_http_get config.hkp_url, response,
-      query: {op: 'vindex', search: uid, exact: 'on', options: 'mr', fingerprint: 'on'}
+    stub_http_get config.hkp_url,
+                  response,
+                  query: vindex_query(uid)
+  end
+
+  def vindex_query(uid)
+    { op: 'vindex',
+      search: uid,
+      exact: 'on',
+      options: 'mr',
+      fingerprint: 'on' }
   end
 
   def stub_sks_get_reponse(key_id, response = {})
-    stub_http_get config.hkp_url, response,
-      query: {op: 'get', search: "0x"+key_id, exact: 'on', options: 'mr'}
+    stub_http_get config.hkp_url,
+                  response,
+                  query: sks_get_query(key_id)
+  end
+
+  def sks_get_query(key_id)
+    { op: 'get',
+      search: '0x' + key_id,
+      exact: 'on',
+      options: 'mr' }
   end
 
   def stub_couch_response(uid, response = {})
@@ -30,12 +48,10 @@ module HttpStubHelper
     stub_http_get(/#{Regexp.escape(config.couch_url)}.*#{query}/, response)
   end
 
-  private
-
   def stub_http_get(url, response, options = nil)
-    response = {status: 200, body: ""}.merge(response || {})
+    response = { status: 200, body: '' }.merge(response || {})
     adapter.expect :get, [response[:status], response[:body]],
-      [url, options].compact
+                   [url, options].compact
   end
 
   def adapter