summaryrefslogtreecommitdiff
path: root/spec/unit/puppet/parser/functions/merge_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/unit/puppet/parser/functions/merge_spec.rb')
-rw-r--r--spec/unit/puppet/parser/functions/merge_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/puppet/parser/functions/merge_spec.rb b/spec/unit/puppet/parser/functions/merge_spec.rb
index 8a170bb..15a5d94 100644
--- a/spec/unit/puppet/parser/functions/merge_spec.rb
+++ b/spec/unit/puppet/parser/functions/merge_spec.rb
@@ -30,7 +30,7 @@ describe Puppet::Parser::Functions.function(:merge) do
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/)
+ expect { new_hash = scope.function_merge([{}, ''])}.not_to raise_error
end
it 'should be able to merge two hashes' do