diff options
| author | Hunter Haugen <hunter@puppetlabs.com> | 2014-03-18 16:18:53 -0700 |
|---|---|---|
| committer | Hunter Haugen <hunter@puppetlabs.com> | 2014-03-18 16:18:53 -0700 |
| commit | aedb89d91fe6737b3ed7acc0aa72c9a2fa56cd45 (patch) | |
| tree | 9cefab4ff6e6a33c84482e11e0fae929018303db /spec/unit/puppet/parser/functions/merge_spec.rb | |
| parent | 085a0564428d49a027af0fc224fb4019fba54862 (diff) | |
| parent | 904f1a003e790ba2afaf3452ecda9805e87d80d0 (diff) | |
| download | puppet-stdlib-aedb89d91fe6737b3ed7acc0aa72c9a2fa56cd45.tar.gz puppet-stdlib-aedb89d91fe6737b3ed7acc0aa72c9a2fa56cd45.tar.bz2 | |
Merge branch '3.x' into 4.x
Diffstat (limited to 'spec/unit/puppet/parser/functions/merge_spec.rb')
| -rw-r--r-- | spec/unit/puppet/parser/functions/merge_spec.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/unit/puppet/parser/functions/merge_spec.rb b/spec/unit/puppet/parser/functions/merge_spec.rb index db7d837..79079b6 100644 --- a/spec/unit/puppet/parser/functions/merge_spec.rb +++ b/spec/unit/puppet/parser/functions/merge_spec.rb @@ -25,7 +25,12 @@ describe Puppet::Parser::Functions.function(:merge) do describe 'when calling merge on the scope instance' do it 'should require all parameters are hashes' do - expect { new_hash = scope.function_merge([{}, '2'])}.should raise_error(Puppet::ParseError, /unexpected argument type String/) + 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([{}, ''])}.to raise_error end it 'should be able to merge two hashes' do |