opuppet/puppetlabs-stdlib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix number of arguments check in flatten()

Browse source 
The function only uses the first argument, so raise an error with
too few arguments *and* with too many arguments.
This commit is contained in:
Uwe Stuehler 2012-10-23 16:43:03 +02:00 committed by Adrien Thebo
parent 1e2ee5bd01
commit e80207bede
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/puppet/parser/functions/flatten.rb
View file

@ -16,7 +16,7 @@ Would return: ['a','b','c']
) do |arguments|
raise(Puppet::ParseError, "flatten(): Wrong number of arguments " +
"given (#{arguments.size} for 1)") if arguments.size < 1
"given (#{arguments.size} for 1)") if arguments.size != 1
array = arguments[0]

4
spec/unit/puppet/parser/functions/flatten_spec.rb
View file

@ -11,6 +11,10 @@ describe "the flatten function" do
lambda { scope.function_flatten([]) }.should( raise_error(Puppet::ParseError))
end
it "should raise a ParseError if there is more than 1 argument" do
lambda { scope.function_flatten([[], []]) }.should( raise_error(Puppet::ParseError))
end
it "should flatten a complex data structure" do
result = scope.function_flatten([["a","b",["c",["d","e"],"f","g"]]])
result.should(eq(["a","b","c","d","e","f","g"]))