diff options
| author | Ashley Penney <ashley.penney@puppetlabs.com> | 2014-03-05 15:43:58 -0500 |
|---|---|---|
| committer | Ashley Penney <ashley.penney@puppetlabs.com> | 2014-03-08 00:42:51 +0000 |
| commit | 3854e076ccb75d1bcb1ddd29f5976b194d857765 (patch) | |
| tree | 2624c5c96549324719fbf6eaca781888d6d4646d /spec/unit/puppet/parser/functions/deep_merge_spec.rb | |
| parent | fecb53d46ed9e926973cdf5be1289c1ea71c2f68 (diff) | |
Numerous changes to update testing gems.
This work updates a number of Gems to the latest versions (rspec,
rspec-puppet), and updates and tweaks a bunch of tests to work
with the updated gems.
Diffstat (limited to 'spec/unit/puppet/parser/functions/deep_merge_spec.rb')
| -rw-r--r-- | spec/unit/puppet/parser/functions/deep_merge_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/puppet/parser/functions/deep_merge_spec.rb b/spec/unit/puppet/parser/functions/deep_merge_spec.rb index fffb7f7..1d2c183 100644 --- a/spec/unit/puppet/parser/functions/deep_merge_spec.rb +++ b/spec/unit/puppet/parser/functions/deep_merge_spec.rb @@ -30,7 +30,7 @@ describe Puppet::Parser::Functions.function(:deep_merge) do end it 'should accept empty strings as puppet undef' do - expect { new_hash = scope.function_deep_merge([{}, ''])}.not_to raise_error(Puppet::ParseError, /unexpected argument type String/) + expect { new_hash = scope.function_deep_merge([{}, ''])}.not_to raise_error end it 'should be able to deep_merge two hashes' do |