diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:05:35 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:05:35 -0700 |
| commit | 7a0e4be2e773c1aa6450fc8e8f043ae161590f0d (patch) | |
| tree | 2b6d7643daed47da2a1d4ad150238ec8b08d6296 /spec/unit/puppet/parser/functions | |
| parent | c121e45e03c5857fec9c3f19203f9cb9c942570f (diff) | |
| parent | 22935580be94a9f0645c47826edbd77e3a1187a4 (diff) | |
| download | puppet-stdlib-7a0e4be2e773c1aa6450fc8e8f043ae161590f0d.tar.gz puppet-stdlib-7a0e4be2e773c1aa6450fc8e8f043ae161590f0d.tar.bz2 | |
Merge branch '3.0.x' into 3.x
* 3.0.x:
(Maint) Fix mis-use of rvalue functions as statements
Add .rspec file to repo root
Diffstat (limited to 'spec/unit/puppet/parser/functions')
| -rw-r--r-- | spec/unit/puppet/parser/functions/merge_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
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 |