opuppet/puppetlabs-stdlib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch '3.x'

Browse source 
* 3.x:
  (Maint) Fix mis-use of rvalue functions as statements
  Add .rspec file to repo root
This commit is contained in:
Jeff McCune 2012-08-20 14:05:42 -07:00
commit c0639d06e1
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.rspec Normal file
View file

@ -0,0 +1,4 @@
--color
--format
progress
--backtrace

1
spec/unit/puppet/parser/functions/merge_spec.rb
View file

@ -26,7 +26,6 @@ describe Puppet::Parser::Functions.function(:merge) do
describe 'when calling merge on the scope instance' do describe 'when calling merge on the scope instance' do
it 'should require all parameters are hashes' 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'])}.should raise_error(Puppet::ParseError, /unexpected argument type String/)
end end
it 'should be able to merge two hashes' do it 'should be able to merge two hashes' do