summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrien Thebo <git@somethingsinistral.net>2013-09-16 13:45:24 -0700
committerAdrien Thebo <git@somethingsinistral.net>2013-09-16 13:45:24 -0700
commitebec9de534bf7ffd32117273002e1508f2726ea9 (patch)
treebe196437285d6846479f3d32883ef5277422208f
parent079afa5b7f62dc9d105adfb816e037840848e6aa (diff)
parent30e994fb6eb91e25a77e60a849f795d60c11af4b (diff)
downloadpuppet-stdlib-ebec9de534bf7ffd32117273002e1508f2726ea9.tar.gz
puppet-stdlib-ebec9de534bf7ffd32117273002e1508f2726ea9.tar.bz2
Merge pull request #179 from lmello/function_pick_error_msg
enhanced the error message of pick function.
-rw-r--r--lib/puppet/parser/functions/pick.rb2
-rw-r--r--spec/unit/puppet/parser/functions/pick_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/functions/pick.rb b/lib/puppet/parser/functions/pick.rb
index cbc0300..e9e5d66 100644
--- a/lib/puppet/parser/functions/pick.rb
+++ b/lib/puppet/parser/functions/pick.rb
@@ -21,7 +21,7 @@ EOS
args.delete(:undefined)
args.delete("")
if args[0].to_s.empty? then
- fail "Must provide non empty value."
+ fail Puppet::ParseError, "pick(): must receive at last one non empty value"
else
return args[0]
end
diff --git a/spec/unit/puppet/parser/functions/pick_spec.rb b/spec/unit/puppet/parser/functions/pick_spec.rb
index 761db6b..d2b275f 100644
--- a/spec/unit/puppet/parser/functions/pick_spec.rb
+++ b/spec/unit/puppet/parser/functions/pick_spec.rb
@@ -29,6 +29,6 @@ describe "the pick function" do
end
it 'should error if no values are passed' do
- expect { scope.function_pick([]) }.to raise_error(Puppet::Error, /Must provide non empty value./)
+ expect { scope.function_pick([]) }.to( raise_error(Puppet::ParseError, "pick(): must receive at last one non empty value"))
end
end