diff options
author | Adam Jacob <adam@opscode.com> | 2009-09-14 17:09:10 -0700 |
---|---|---|
committer | Adam Jacob <adam@opscode.com> | 2009-09-14 17:09:10 -0700 |
commit | 5cb52d9c0daba80de15c4cfa56dee2613be2da9c (patch) | |
tree | 8e06a6f5c349956e60e5ec3be870d4fe2fe61c30 /cucumber.yml | |
parent | c59a0f6f021cfe01a5c596d446fee46c40afd85f (diff) | |
parent | 31456f5b12e540d504c981fc9cbe34bd9cb0788a (diff) | |
download | chef-5cb52d9c0daba80de15c4cfa56dee2613be2da9c.tar.gz |
Merge branch 'master' of git@github.com:opscode/chef into 0.8-alpha-merge
Conflicts:
Rakefile
chef-server-slice/Rakefile
chef-server/Rakefile
chef/Rakefile
chef/lib/chef.rb
chef/lib/chef/config.rb
chef/lib/chef/couchdb.rb
chef/lib/chef/node/attribute.rb
cucumber.yml
Diffstat (limited to 'cucumber.yml')
-rw-r--r-- | cucumber.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cucumber.yml b/cucumber.yml index e06743b0b1..18c0e97328 100644 --- a/cucumber.yml +++ b/cucumber.yml @@ -32,8 +32,9 @@ provider: --tags @provider --format pretty -r features/steps -r features/support provider_directory: --tags @provider_directory --format pretty -r features/steps -r features/support features provider_execute: --tags @provider_execute --format pretty -r features/steps -r features/support features provider_file: --tags @provider_file --format pretty -r features/steps -r features/support features +provider_template: --tags template --format pretty -r features/steps -r features/support features provider_remote_file: --tags @remote_file --format pretty -r features/steps -r features/support features provider_package_macports: --tags @macports --format pretty -r features/steps -r features/support features language: --tags @language --format pretty -r features/steps -r features/support features +recipe_inclusion: --tags recipe_inclusion --format pretty -r features/steps -r features/support features cookbooks: --tags @cookbooks --format pretty -r features/steps -r features/support features - |