diff options
author | Eric Putnam <putnam.eric@gmail.com> | 2017-07-11 15:43:37 -0700 |
---|---|---|
committer | Eric Putnam <putnam.eric@gmail.com> | 2017-07-11 16:52:00 -0700 |
commit | 715c40dc9083068598387ab67396136e87eb553d (patch) | |
tree | 353dc4ca3c7290ead7d85299c859882d310cac84 /spec/functions | |
parent | 3eee345aa2cb697e8791069ffe96299db6a28f8e (diff) |
(MODULES-5187) fix spec tests for puppet 5 changes
Diffstat (limited to 'spec/functions')
-rwxr-xr-x | spec/functions/merge_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/functions/merge_spec.rb b/spec/functions/merge_spec.rb index 7b53363..3b2e3ef 100755 --- a/spec/functions/merge_spec.rb +++ b/spec/functions/merge_spec.rb @@ -4,7 +4,7 @@ describe 'merge' do it { is_expected.not_to eq(nil) } it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) } it { is_expected.to run.with_params({}, 'two').and_raise_error(Puppet::ParseError, /unexpected argument type String/) } - it { is_expected.to run.with_params({}, 1).and_raise_error(Puppet::ParseError, /unexpected argument type Fixnum/) } + it { is_expected.to run.with_params({}, 1).and_raise_error(Puppet::ParseError, /unexpected argument type (Fixnum|Integer)/) } it { pending 'should not special case this' is_expected.to run.with_params({}).and_return({}) |