From ea9fd004d6ce2e794ab59ca94f844b09129c0e06 Mon Sep 17 00:00:00 2001
From: Rick Bradley <rick@rickbradley.com>
Date: Wed, 1 Jun 2016 14:15:59 -0500
Subject: [PATCH] (maint) Lift #redis definition into spec helper library

---
 spec/helpers.rb                          | 9 +++++----
 spec/vmpooler/api/v1/token_spec.rb       | 4 ----
 spec/vmpooler/api/v1/vm_hostname_spec.rb | 4 ----
 spec/vmpooler/api/v1/vm_spec.rb          | 4 ----
 spec/vmpooler/api/v1/vm_template_spec.rb | 4 ----
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/spec/helpers.rb b/spec/helpers.rb
index 890cfd1..924d8df 100644
--- a/spec/helpers.rb
+++ b/spec/helpers.rb
@@ -1,7 +1,8 @@
-def expect_json(
-  ok = true,
-  http = 200
-)
+def redis
+  @redis ||= Redis.new
+end
+
+def expect_json(ok = true, http = 200)
   expect(last_response.header['Content-Type']).to eq('application/json')
 
   if (ok == true) then
diff --git a/spec/vmpooler/api/v1/token_spec.rb b/spec/vmpooler/api/v1/token_spec.rb
index 4cd0a2b..d386457 100644
--- a/spec/vmpooler/api/v1/token_spec.rb
+++ b/spec/vmpooler/api/v1/token_spec.rb
@@ -11,10 +11,6 @@ module Vmpooler
   end
 end
 
-def redis
-  @redis ||= Redis.new
-end
-
 describe Vmpooler::API::V1 do
   include Rack::Test::Methods
 
diff --git a/spec/vmpooler/api/v1/vm_hostname_spec.rb b/spec/vmpooler/api/v1/vm_hostname_spec.rb
index 4d62c2a..6ad79cb 100644
--- a/spec/vmpooler/api/v1/vm_hostname_spec.rb
+++ b/spec/vmpooler/api/v1/vm_hostname_spec.rb
@@ -11,10 +11,6 @@ module Vmpooler
   end
 end
 
-def redis
-  @redis ||= Redis.new
-end
-
 describe Vmpooler::API::V1 do
   include Rack::Test::Methods
 
diff --git a/spec/vmpooler/api/v1/vm_spec.rb b/spec/vmpooler/api/v1/vm_spec.rb
index 29e6b19..fe5e544 100644
--- a/spec/vmpooler/api/v1/vm_spec.rb
+++ b/spec/vmpooler/api/v1/vm_spec.rb
@@ -11,10 +11,6 @@ module Vmpooler
   end
 end
 
-def redis
-  @redis ||= Redis.new
-end
-
 describe Vmpooler::API::V1 do
   include Rack::Test::Methods
 
diff --git a/spec/vmpooler/api/v1/vm_template_spec.rb b/spec/vmpooler/api/v1/vm_template_spec.rb
index cdb2e37..71a1c63 100644
--- a/spec/vmpooler/api/v1/vm_template_spec.rb
+++ b/spec/vmpooler/api/v1/vm_template_spec.rb
@@ -11,10 +11,6 @@ module Vmpooler
   end
 end
 
-def redis
-  @redis ||= Redis.new
-end
-
 describe Vmpooler::API::V1 do
   include Rack::Test::Methods