diff options
| author | TP Honey <tphoney@users.noreply.github.com> | 2017-08-11 09:56:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-11 09:56:53 +0100 |
| commit | c7ac34da3a8b70500143e326f8c4fa27ae7da311 (patch) | |
| tree | 26721306dc6501ada77e48111b8e94f9856cf0b8 /spec/functions/merge_spec.rb | |
| parent | b89d5f388ca701e38a0e0337408f5ccb7e68565f (diff) | |
| parent | 016f4dfd7f0c8a6b5b98fa38cf70434603c75883 (diff) | |
Merge branch 'master' into release
Diffstat (limited to 'spec/functions/merge_spec.rb')
| -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({}) |