diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:05:16 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:05:16 -0700 |
| commit | 22935580be94a9f0645c47826edbd77e3a1187a4 (patch) | |
| tree | 2b6d7643daed47da2a1d4ad150238ec8b08d6296 | |
| parent | 039ea5ed83c0f4b4b1114bf7ce04f8d26642f7d9 (diff) | |
| parent | 0f45feb31b0100c8f56ad9fff4542296cf51478f (diff) | |
Merge branch '2.4.x' into 3.0.x
* 2.4.x:
(Maint) Fix mis-use of rvalue functions as statements
Add .rspec file to repo root
| -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 |