diff options
author | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-09 15:22:13 -0700 |
---|---|---|
committer | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-09 15:22:13 -0700 |
commit | 659704831ee9a4d3c83410010884405bdfde7e89 (patch) | |
tree | 0f9ba027b4f363b23ac3178120b40db567619ec8 /spec/unit/puppet/parser/functions/merge_spec.rb | |
parent | 15e13fb6b93347003aa3d3666baf531be0472418 (diff) | |
parent | cdd45298337df80aad757e81eb7457317219c1b7 (diff) |
Merge branch '2.4.x'
* 2.4.x:
Make sure functions are loaded for each test
Use rvalue functions correctly
(#2157) Make facts_dot_d compatible with external facts
Conflicts:
lib/facter/facter_dot_d.rb
Diffstat (limited to 'spec/unit/puppet/parser/functions/merge_spec.rb')
-rw-r--r-- | spec/unit/puppet/parser/functions/merge_spec.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/spec/unit/puppet/parser/functions/merge_spec.rb b/spec/unit/puppet/parser/functions/merge_spec.rb index 9e8a619..192da4c 100644 --- a/spec/unit/puppet/parser/functions/merge_spec.rb +++ b/spec/unit/puppet/parser/functions/merge_spec.rb @@ -7,12 +7,16 @@ 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()' - expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/) + Puppet[:code] = '$x = merge()' + expect { + scope.compiler.compile + }.to 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)" - expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/) + Puppet[:code] = "$my_hash={'one' => 1}\n$x = merge($my_hash)" + expect { + scope.compiler.compile + }.to raise_error(Puppet::ParseError, /wrong number of arguments/) end end describe 'when calling merge on the scope instance' do |