Skip to content

don't fail on undef variable in merge #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 15, 2013
Merged

don't fail on undef variable in merge #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c622b2
changed .count to .size to support legacy ruby
Feb 18, 2013
89bceb2
Merge branch 'master' of git://github.com/puppetlabs/puppetlabs-stdlib
mhellmic Apr 22, 2013
3077d26
check if an argument supposed to be merged is empty to
mhellmic Apr 22, 2013
f496005
fix in merge.rb: refine the checking if an argument is an empty string
mhellmic May 8, 2013
b975bd6
Added rspec tests for the new behaviour of merge accepting empty strings
mhellmic May 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/puppet/parser/functions/merge.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ module Puppet::Parser::Functions
accumulator = Hash.new
# Merge into the accumulator hash
args.each do |arg|
next if arg.is_a? String and arg.empty? # empty string is synonym for puppet's undef
unless arg.is_a?(Hash)
raise Puppet::ParseError, "merge: unexpected argument type #{arg.class}, only expects hash arguments"
end
Expand Down
5 changes: 5 additions & 0 deletions spec/unit/puppet/parser/functions/merge_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
describe 'when calling merge on the scope instance' do
it 'should require all parameters are hashes' do
expect { new_hash = scope.function_merge([{}, '2'])}.to raise_error(Puppet::ParseError, /unexpected argument type String/)
expect { new_hash = scope.function_merge([{}, 2])}.to raise_error(Puppet::ParseError, /unexpected argument type Fixnum/)
end

it 'should accept empty strings as puppet undef' do
expect { new_hash = scope.function_merge([{}, ''])}.not_to raise_error(Puppet::ParseError, /unexpected argument type String/)
end

it 'should be able to merge two hashes' do
Expand Down