Merge pull request #3873 from chef/jdm/unbreak

Fix the failing tests

2 files changed, 13 insertions, 1 deletions

diff --git a/Gemfile b/Gemfile
index af0bef493c..6660b8c802 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,10 @@ gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby"
 
 gem 'chef-config', path: "chef-config"
 
+# We are pinning chef-zero to 4.2.x until ChefFS can deal
+# with V1 api calls or chef-zero supports both v0 and v1
+gem "chef-zero", "~> 4.2.3"
+
 group(:docgen) do
   gem "tomlrb"
   gem "yard"
@@ -13,7 +17,11 @@ end
 group(:development, :test) do
   gem "simplecov"
   gem 'rack', "~> 1.5.1"
-  gem 'cheffish', "~> 1.3"
+
+  #gem 'cheffish', "~> 1.3"
+  # We are pinning cheffish to 1.3.1 until https://github.com/chef/cheffish/pull/73
+  # is released
+  gem 'cheffish', "~> 1.3.1"
 
   gem 'ruby-shadow', :platforms => :ruby unless RUBY_PLATFORM.downcase.match(/(aix|cygwin)/)
 end
diff --git a/pedant.gemfile b/pedant.gemfile
index 8e64fc039c..888e6b83f3 100644
--- a/pedant.gemfile
+++ b/pedant.gemfile
@@ -9,6 +9,10 @@ gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby"
 gem "mixlib-shellout", github: "opscode/mixlib-shellout", branch: "master"
 gem "ohai", github: "opscode/ohai", branch: "master"
 
+# We are pinning chef-zero to 4.2.x until ChefFS can deal
+# with V1 api calls or chef-zero supports both v0 and v1
+gem "chef-zero", "~> 4.2.3"
+
 group(:docgen) do
   gem "tomlrb"
   gem "yard"