Explicitly add org defaults to pedant test

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

2 files changed, 3 insertions, 2 deletions

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