summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2014-05-26 22:20:49 -0700
committerJohn Keiser <jkeiser@opscode.com>2014-05-26 22:30:57 -0700
commit03c6ab6a20014eec84a10f02792341e84dc78d3a (patch)
treece9e89a63b3abf5e59d8fb4d254fbb1f18026fdb
parentd1c2aa92003aa634af1a23ec3975e1641620b643 (diff)
downloadchef-zero-03c6ab6a20014eec84a10f02792341e84dc78d3a.tar.gz
Pass org defaults when running chef fs tests to pass pedant
-rw-r--r--spec/run.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/run.rb b/spec/run.rb
index 7c25eb7..aec8176 100644
--- a/spec/run.rb
+++ b/spec/run.rb
@@ -23,6 +23,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', :org_defaults => ChefZero::DataStore::V1ToV2Adapter::ORG_DEFAULTS)
server = ChefZero::Server.new(:port => 8889, :data_store => data_store)#, :log_level => :debug)
server.start_background
server
@@ -35,6 +36,7 @@ begin
require 'tmpdir'
require 'fileutils'
require 'chef/version'
+ require 'chef_zero/data_store/v1_to_v2_adapter'
# Create chef repository
tmpdir = Dir.mktmpdir