From b975bd66aa7345a5eeb54eb79dd0f708934609f8 Mon Sep 17 00:00:00 2001 From: Martin Hellmich Date: Wed, 8 May 2013 18:20:56 +0200 Subject: Added rspec tests for the new behaviour of merge accepting empty strings added test that '' is accepted changed a test that a number is correctly rejected with a type error --- spec/unit/puppet/parser/functions/merge_spec.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'spec/unit/puppet/parser/functions/merge_spec.rb') diff --git a/spec/unit/puppet/parser/functions/merge_spec.rb b/spec/unit/puppet/parser/functions/merge_spec.rb index 04169e7..8a170bb 100644 --- a/spec/unit/puppet/parser/functions/merge_spec.rb +++ b/spec/unit/puppet/parser/functions/merge_spec.rb @@ -26,6 +26,11 @@ 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'])}.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 -- cgit v1.2.3