diff options
author | John Keiser <jkeiser@opscode.com> | 2014-08-29 10:06:05 -0700 |
---|---|---|
committer | John Keiser <jkeiser@opscode.com> | 2014-08-29 10:06:05 -0700 |
commit | f04257b2c9e0fefcd3132483f51b2278eb9836f7 (patch) | |
tree | cf7f98074b658d4623461e28a9a2f25534d04e2c | |
parent | ed903027907a0905ce8c52be4c40153690495574 (diff) | |
download | chef-zero-f04257b2c9e0fefcd3132483f51b2278eb9836f7.tar.gz |
Add default for cookbook()
-rw-r--r-- | lib/chef_zero/rspec.rb | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/chef_zero/rspec.rb b/lib/chef_zero/rspec.rb index 6a3429b..5d702d6 100644 --- a/lib/chef_zero/rspec.rb +++ b/lib/chef_zero/rspec.rb @@ -137,12 +137,21 @@ module ChefZero end end - def self.cookbook(name, version, data, options = {}, &block) - before(:each) { cookbook(name, version, data, &block) } + def self.cookbook(name, version, data = {}, options = {}, &block) + before(:each) do + cookbook(name, version, data, &block) + end end - def cookbook(name, version, data, options = {}, &block) + def cookbook(name, version, data = {}, options = {}, &block) with_object_path("cookbooks/#{name}") do + if data.has_key?('metadata.rb') + if data['metadata.rb'].nil? + data.delete('metadata.rb') + end + else + data['metadata.rb'] = "name #{name.inspect}; version #{version.inspect}" + end ChefZero::RSpec.server.load_data({ 'cookbooks' => { "#{name}-#{version}" => data.merge(options) }}, current_org) instance_eval(&block) if block_given? end |