diff options
| author | Varac <varac@leap.se> | 2017-10-13 14:22:08 +0200 |
|---|---|---|
| committer | Varac <varac@leap.se> | 2017-10-13 14:22:08 +0200 |
| commit | f7779ce2eacaca51790d4e8d7756442b02612d30 (patch) | |
| tree | 56871c123e1c964fc26e36bb86831a4a3511bd4f /spec/functions/merge_spec.rb | |
| parent | 066c08f8362d53f0f30897cb8710d11260c726ea (diff) | |
| parent | 2339ea8db67ac7ef02d707c2a6011ae50f5d82b5 (diff) | |
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({}) |