diff options
| author | TP Honey <tphoney@users.noreply.github.com> | 2017-07-13 17:37:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-13 17:37:47 +0100 |
| commit | 54d4937c5b2d8918ee9f89f728c0c29e0d9e774f (patch) | |
| tree | 353dc4ca3c7290ead7d85299c859882d310cac84 /spec/functions | |
| parent | 5a17bf1c338c74bd6c8dbacc9a05b4cd501ecc23 (diff) | |
| parent | 715c40dc9083068598387ab67396136e87eb553d (diff) | |
Merge pull request #790 from puppetlabs/msync_modules5187
(MODULES-5187) mysnc puppet 5 and ruby 2.4
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({}) |