Explicitly add org defaults to pedant test

so that it passes, but don't feed the defaults to
the user by default.

4 files changed, 7 insertions, 6 deletions

diff --git a/chef.gemspec b/chef.gemspec
index 04f1a03024..11cb4a8fb7 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -36,8 +36,7 @@ Gem::Specification.new do |s|
   s.add_dependency "erubis", "~> 2.7"
   s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"
 
-  # There's a bug with Chef Zero and IPV6 prior to version 2.0.2
-  s.add_dependency "chef-zero", "~> 2.1"
+  s.add_dependency "chef-zero", "~> 2.1", ">= 2.1.2"
 
   s.add_dependency "pry", "~> 0.9"
 
diff --git a/lib/chef/application.rb b/lib/chef/application.rb
index cc80cef980..12e1546627 100644
--- a/lib/chef/application.rb
+++ b/lib/chef/application.rb
@@ -185,12 +185,13 @@ class Chef::Application
 
       chef_fs = Chef::ChefFS::Config.new.local_fs
       chef_fs.write_pretty_json = true
+      data_store = Chef::ChefFS::ChefFSDataStore.new(chef_fs)
       server_options = {}
-      server_options[:data_store] = Chef::ChefFS::ChefFSDataStore.new(chef_fs)
+      server_options[:data_store] = data_store
       server_options[:log_level] = Chef::Log.level
       server_options[:port] = Chef::Config.chef_zero.port
       server_options[:host] = Chef::Config.chef_zero.host
-      Chef::Log.info("Starting chef-zero on port #{Chef::Config.chef_zero.port} with repository at #{server_options[:data_store].chef_fs.fs_description}")
+      Chef::Log.info("Starting chef-zero on port #{Chef::Config.chef_zero.port} with repository at #{chef_fs.fs_description}")
       @chef_zero_server = ChefZero::Server.new(server_options)
       @chef_zero_server.start_background
       Chef::Config.chef_server_url = @chef_zero_server.url
diff --git a/spec/integration/knife/chef_fs_data_store_spec.rb b/spec/integration/knife/chef_fs_data_store_spec.rb
index 13d413a7c8..e8a3b3dde5 100644
--- a/spec/integration/knife/chef_fs_data_store_spec.rb
+++ b/spec/integration/knife/chef_fs_data_store_spec.rb
@@ -22,7 +22,7 @@ require 'chef/knife/show'
 require 'chef/knife/raw'
 require 'chef/knife/cookbook_upload'
 
-describe 'knife raw -z' do
+describe 'ChefFSDataStore tests' do
   extend IntegrationSupport
   include KnifeSupport
 
@@ -105,7 +105,7 @@ EOM
         knife('show -z /clients/x.json').should_succeed /"x"/
       end
 
-      it 'knife show -z /cookbooks/x/metadata.rb works', :focus do
+      it 'knife show -z /cookbooks/x/metadata.rb works' do
         knife('show -z /cookbooks/x/metadata.rb').should_succeed "/cookbooks/x/metadata.rb:\nversion \"1.0.0\"\n"
       end
 
diff --git a/spec/support/pedant/run_pedant.rb b/spec/support/pedant/run_pedant.rb
index 0c24cf59f8..94c4e5c413 100644
--- a/spec/support/pedant/run_pedant.rb
+++ b/spec/support/pedant/run_pedant.rb
@@ -25,6 +25,7 @@ def start_server(chef_repo_path)
   Chef::Config.versioned_cookbooks = true
   chef_fs = Chef::ChefFS::Config.new.local_fs
   data_store = Chef::ChefFS::ChefFSDataStore.new(chef_fs)
+  data_store = ChefZero::DataStore::V1ToV2Adapter.new(data_store, 'chef', ChefZero::DataStore::V1ToV2Adapter.ORG_DEFAULTS)
   server = ChefZero::Server.new(:port => 8889, :data_store => data_store)#, :log_level => :debug)
   server.start_background
   server