summaryrefslogtreecommitdiff
path: root/spec/integration/recipes
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-10-31 15:45:21 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2016-10-31 15:45:21 -0700
commitb6f81d6f6702f5f13e3e0307c8253d1ef949645b (patch)
treeac7d95b3c5d5321932ab8485d5d765500b139501 /spec/integration/recipes
parentfc30a44a383f5742236110002580d0c40380718c (diff)
downloadchef-b6f81d6f6702f5f13e3e0307c8253d1ef949645b.tar.gz
improve property-resource namespace collision exception
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'spec/integration/recipes')
-rw-r--r--spec/integration/recipes/resource_action_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/integration/recipes/resource_action_spec.rb b/spec/integration/recipes/resource_action_spec.rb
index 60d5831a50..f11696bae4 100644
--- a/spec/integration/recipes/resource_action_spec.rb
+++ b/spec/integration/recipes/resource_action_spec.rb
@@ -498,7 +498,7 @@ module ResourceActionSpec
it "Raises an error when attempting to use a template in the action" do
expect_converge do
has_property_named_template "hi"
- end.to raise_error(/Property template of has_property_named_template\[hi\] cannot be passed a block! If you meant to create a resource named template instead, you'll need to first rename the property./)
+ end.to raise_error(/Property `template` of `has_property_named_template\[hi\]` was incorrectly passed a block. Possible property-resource collision. To call a resource named `template` either rename the property or else use `declare_resource\(:template, ...\)`/)
end
end