diff options
| author | Daniel DeLeo <dan@opscode.com> | 2011-03-23 15:51:45 -0700 |
|---|---|---|
| committer | Daniel DeLeo <dan@opscode.com> | 2011-03-23 15:53:07 -0700 |
| commit | 1ffad6355015a022d6d5a0075e4c7c2367286c69 (patch) | |
| tree | 81cda5f92d1564b065b3d9b6a0ae2cdb4d1769cc /features | |
| parent | f1ddbb238b478c0a54ef1add4a322bfc48814004 (diff) | |
| download | chef-1ffad6355015a022d6d5a0075e4c7c2367286c69.tar.gz | |
use less global state. also, objects.
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/cookbook_steps.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/features/steps/cookbook_steps.rb b/features/steps/cookbook_steps.rb index 7675bd416b..cae8f07b6c 100644 --- a/features/steps/cookbook_steps.rb +++ b/features/steps/cookbook_steps.rb @@ -36,12 +36,10 @@ def compare_manifests(manifest1, manifest2) end Before do - save_cookbook_path = Chef::Config[:cookbook_path] FileUtils.mkdir "#{datadir}/cookbooks_not_uploaded_at_feature_start/testcookbook_invalid_empty" unless File.exist?("#{datadir}/cookbooks_not_uploaded_at_feature_start/testcookbook_invalid_empty") - Chef::Config[:cookbook_path] = File.join(datadir, "cookbooks_not_uploaded_at_feature_start") - Chef::Cookbook::FileVendor.on_create {|manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest) } - @cookbook_loader_not_uploaded_at_feature_start = Chef::CookbookLoader.new - Chef::Config[:cookbook_path] = save_cookbook_path + extra_cookbook_repo = File.join(datadir, "cookbooks_not_uploaded_at_feature_start") + Chef::Cookbook::FileVendor.on_create {|manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest, extra_cookbook_repo) } + @cookbook_loader_not_uploaded_at_feature_start = Chef::CookbookLoader.new(extra_cookbook_repo) end Given /^a local cookbook repository$/ do |