diff options
| author | stephen <stephen@puppetlabs.com> | 2012-10-16 11:54:14 +0100 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2013-02-06 08:12:42 -0800 |
| commit | 5f22933e75058310af06a993d663be2da7759c3d (patch) | |
| tree | f630123d27c32d4947e853b82bc39a2909c6195a /spec/unit/puppet/parser/functions/merge_spec.rb | |
| parent | 4d24bd33b038aaf261342641e14fdced1371fe8d (diff) | |
ammend .should raise_error to .to raise_error
Diffstat (limited to 'spec/unit/puppet/parser/functions/merge_spec.rb')
| -rw-r--r-- | spec/unit/puppet/parser/functions/merge_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/puppet/parser/functions/merge_spec.rb b/spec/unit/puppet/parser/functions/merge_spec.rb index db7d837..04169e7 100644 --- a/spec/unit/puppet/parser/functions/merge_spec.rb +++ b/spec/unit/puppet/parser/functions/merge_spec.rb @@ -25,7 +25,7 @@ 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/) + expect { new_hash = scope.function_merge([{}, '2'])}.to raise_error(Puppet::ParseError, /unexpected argument type String/) end it 'should be able to merge two hashes' do |