diff options
| author | tphoney <tp@puppet.com> | 2017-07-14 10:14:04 +0100 |
|---|---|---|
| committer | tphoney <tp@puppet.com> | 2017-07-14 10:42:10 +0100 |
| commit | 33922a4ec7a8c204a17e0c3017eea21faa220f39 (patch) | |
| tree | 069c400254276e50176e5b11140c77f831590879 /spec/functions/deep_merge_spec.rb | |
| parent | 01d3004f0a6a1c662aea90edd5b1524139706c61 (diff) | |
FM-6239 clean up for puppet 5.tests/deprecation
Diffstat (limited to 'spec/functions/deep_merge_spec.rb')
| -rwxr-xr-x | spec/functions/deep_merge_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/functions/deep_merge_spec.rb b/spec/functions/deep_merge_spec.rb index c91a07e..819e025 100755 --- a/spec/functions/deep_merge_spec.rb +++ b/spec/functions/deep_merge_spec.rb @@ -4,7 +4,7 @@ describe 'deep_merge' do it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) } it { is_expected.to run.with_params({ 'key' => 'value' }).and_raise_error(Puppet::ParseError, /wrong number of arguments/i) } it { is_expected.to run.with_params({}, '2').and_raise_error(Puppet::ParseError, /unexpected argument type String/) } - it { is_expected.to run.with_params({}, 2).and_raise_error(Puppet::ParseError, /unexpected argument type Fixnum/) } + it { is_expected.to run.with_params({}, 2).and_raise_error(Puppet::ParseError, /unexpected argument/) } it { is_expected.to run.with_params({}, '').and_return({}) } it { is_expected.to run.with_params({}, {}).and_return({}) } it { is_expected.to run.with_params({}, {}, {}).and_return({}) } |