diff options
| -rw-r--r-- | .rspec | 4 | ||||
| -rw-r--r-- | spec/unit/puppet/parser/functions/merge_spec.rb | 1 |
2 files changed, 4 insertions, 1 deletions
@@ -0,0 +1,4 @@ +--color +--format +progress +--backtrace diff --git a/spec/unit/puppet/parser/functions/merge_spec.rb b/spec/unit/puppet/parser/functions/merge_spec.rb index 9218b9d..db7d837 100644 --- a/spec/unit/puppet/parser/functions/merge_spec.rb +++ b/spec/unit/puppet/parser/functions/merge_spec.rb @@ -26,7 +26,6 @@ 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/) - end it 'should be able to merge two hashes' do |