summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerdar Sutay <serdar@opscode.com>2014-10-14 14:42:25 -0700
committerSerdar Sutay <serdar@opscode.com>2014-10-16 13:30:24 -0700
commitcfec07cde0d0b42101deb0731c608dfd5c52a1e2 (patch)
tree9146bc8aa416ab552a0214ff397b007a28a99925
parent8be4d2a44858b14d10d0a19484a2d090b0a7a2fb (diff)
downloadchef-cfec07cde0d0b42101deb0731c608dfd5c52a1e2.tar.gz
Error message update from PR comments.
-rw-r--r--lib/chef/guard_interpreter/resource_guard_interpreter.rb2
-rw-r--r--spec/unit/resource_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/guard_interpreter/resource_guard_interpreter.rb b/lib/chef/guard_interpreter/resource_guard_interpreter.rb
index 8eaa82c0a5..346b585d8c 100644
--- a/lib/chef/guard_interpreter/resource_guard_interpreter.rb
+++ b/lib/chef/guard_interpreter/resource_guard_interpreter.rb
@@ -89,7 +89,7 @@ class Chef
end
if ! resource_class.ancestors.include?(Chef::Resource::Execute)
- raise ArgumentError, "Specified guard interpreter class #{resource_class} must be a kind of Chef::Resource::Script resource"
+ raise ArgumentError, "Specified guard interpreter class #{resource_class} must be a kind of Chef::Resource::Execute resource"
end
empty_events = Chef::EventDispatch::Dispatcher.new
diff --git a/spec/unit/resource_spec.rb b/spec/unit/resource_spec.rb
index 692345c943..5dfc17f333 100644
--- a/spec/unit/resource_spec.rb
+++ b/spec/unit/resource_spec.rb
@@ -349,7 +349,7 @@ describe Chef::Resource do
:updated_by_last_action, :before, :supports,
:noop, :ignore_failure, :name, :source_line,
:action, :retries, :retry_delay, :elapsed_time,
- :guard_interpreter, :sensitive ]
+ :default_guard_interpreter, :guard_interpreter, :sensitive ]
(hash.keys - expected_keys).should == []
(expected_keys - hash.keys).should == []
hash[:name].should eql("funk")