Merge pull request #385 from paybyphone/kitchen_tests

Fit kitchen test failures
sous-chefs · Dec 16, 2016 · e75cfca · e75cfca
2 parents 07669be + 56f578f
commit e75cfca
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 52 deletions.
diff --git a/test/integration/client/serverspec/default_spec.rb b/test/integration/client/serverspec/default_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 require 'json'
 
-consul_version = '0.7.0'
-
 if windows?
   consul_executable = "C:\\Program Files\\consul\\#{consul_version}\\consul.exe"
   consul_command    = "& '#{consul_executable}'"

diff --git a/test/integration/default/serverspec/default_spec.rb b/test/integration/default/serverspec/default_spec.rb
@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-consul_version = '0.7.1'
-
 if windows?
   consul_executable = "C:\\Program Files\\consul\\#{consul_version}\\consul.exe"
   consul_command    = "& '#{consul_executable}'"

diff --git a/test/integration/helpers/serverspec/spec_helper.rb b/test/integration/helpers/serverspec/spec_helper.rb
@@ -4,6 +4,10 @@ def windows?
   (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
 end
 
+def consul_version
+  '0.7.1'
+end
+
 if !windows?
   set :backend, :exec
 else

diff --git a/test/integration/zip/serverspec/default_spec.rb b/test/integration/zip/serverspec/default_spec.rb