diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:01:56 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:01:56 -0700 |
| commit | 3f44686f1c0112cc0febaaa8ad844f02d85562cf (patch) | |
| tree | 240490fc8ce2089c4e9ba5d01e6c15da0e3b06ef /spec/unit/puppet/parser/functions/merge_spec.rb | |
| parent | a033450ab32e8963d3124068b442bef636e25b5c (diff) | |
| parent | 44929130f9c65a3bfd702bb95cb8c7e636c845d1 (diff) | |
| download | puppet-stdlib-3f44686f1c0112cc0febaaa8ad844f02d85562cf.tar.gz puppet-stdlib-3f44686f1c0112cc0febaaa8ad844f02d85562cf.tar.bz2 | |
Merge branch 'fix/2.1.x/spec_failures' into 2.1.x
* fix/2.1.x/spec_failures:
(Maint) Fix mis-use of rvalue functions as statements
Add .rspec file to repo root
Diffstat (limited to 'spec/unit/puppet/parser/functions/merge_spec.rb')
| -rw-r--r-- | spec/unit/puppet/parser/functions/merge_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/puppet/parser/functions/merge_spec.rb b/spec/unit/puppet/parser/functions/merge_spec.rb index 71e1869..a91dca7 100644 --- a/spec/unit/puppet/parser/functions/merge_spec.rb +++ b/spec/unit/puppet/parser/functions/merge_spec.rb @@ -22,11 +22,11 @@ describe Puppet::Parser::Functions.function(:merge) do describe 'when calling merge from puppet' do it "should not compile when no arguments are passed" do - Puppet[:code] = 'merge()' + Puppet[:code] = '$rval = merge()' expect { compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/) end it "should not compile when 1 argument is passed" do - Puppet[:code] = "$my_hash={'one' => 1}\nmerge($my_hash)" + Puppet[:code] = "$my_hash={'one' => 1}\n$rval = merge($my_hash)" expect { compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/) end end |