summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorNuo Yan <nuo@opscode.com>2010-10-06 18:27:11 -0700
committerSeth Falcon <seth@opscode.com>2010-11-01 10:47:00 -0700
commitab9060dba0767e5d46631d9f88637bb3c25276ea (patch)
tree121b82b3d2acde7ed9fa1c0886666a6c208ce848 /features
parent56ff759e842948ec01b7d69d33fc08accfda80c6 (diff)
downloadchef-ab9060dba0767e5d46631d9f88637bb3c25276ea.tar.gz
revise per environment data structure
Diffstat (limited to 'features')
-rw-r--r--features/data/roles/role_env_test.json4
-rw-r--r--features/steps/fixture_steps.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/features/data/roles/role_env_test.json b/features/data/roles/role_env_test.json
index 1165b1128c..afd7e6daf7 100644
--- a/features/data/roles/role_env_test.json
+++ b/features/data/roles/role_env_test.json
@@ -10,8 +10,8 @@
"run_list": [
],
"env_run_lists": {
- "cucumber" : {"default_attributes":{}, "override_attributes":{}, "run_list":"recipe[roles]"},
- "_default" : {}
+ "cucumber" : "recipe[roles]",
+ "_default" : ""
},
"override_attributes": {
"ossining": "whatever",
diff --git a/features/steps/fixture_steps.rb b/features/steps/fixture_steps.rb
index 46222e9c63..3bfe0446e4 100644
--- a/features/steps/fixture_steps.rb
+++ b/features/steps/fixture_steps.rb
@@ -97,7 +97,7 @@ Before do
r = Chef::Role.new
r.name "webserver"
r.description "monkey"
- r.env_run_lists({"cucumber" => {"default_attributes" => {}, "override_attributes" => {}, "run_list" => "role[db]"}})
+ r.env_run_lists({"cucumber" =>"role[db]"})
r.run_list("role[webserver]", "role[base]")
r.default_attributes({ 'a' => 'b' })
r.override_attributes({ 'c' => 'd' })