diff options
| -rw-r--r-- | pedant.gemfile | 2 | ||||
| -rw-r--r-- | spec/support/pedant/run_pedant.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pedant.gemfile b/pedant.gemfile index cb11eb8aec..8f223defde 100644 --- a/pedant.gemfile +++ b/pedant.gemfile @@ -3,7 +3,7 @@ gemspec :name => "chef" gem 'rest-client', :github => 'opscode/rest-client' gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => '4744d7f318b629ff60a0d22cf02296df36936397' -gem 'chef-zero', :github => 'opscode/chef-zero', :ref => 'c0c95d690e1bb7c17c2d141b4937a36c2072d800' + # TODO figure out how to grab this stuff from the main Gemfile gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby" diff --git a/spec/support/pedant/run_pedant.rb b/spec/support/pedant/run_pedant.rb index 94c4e5c413..7764266afe 100644 --- a/spec/support/pedant/run_pedant.rb +++ b/spec/support/pedant/run_pedant.rb @@ -25,7 +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) + 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 |