diff options
author | Morgan Haskel <morgan@puppetlabs.com> | 2015-09-21 10:56:08 -0700 |
---|---|---|
committer | Morgan Haskel <morgan@puppetlabs.com> | 2015-09-21 11:11:21 -0700 |
commit | 799c38e14e1583e676e2b25a9c1782fd40e29fff (patch) | |
tree | ca2f93dd6d459eac114f1e0b5cac05ac02d519cd /spec/functions/parseyaml_spec.rb | |
parent | 9b1932c538354c1b360838c8cf7b942af314c99d (diff) |
Fix backwards compatibility from #511
Maintain the old behavior in the case where the optional second
parameter isn't passed. Also, adding arity is backwards incompatible since
stdlib still supports 2.7, so remove that.
Diffstat (limited to 'spec/functions/parseyaml_spec.rb')
-rwxr-xr-x | spec/functions/parseyaml_spec.rb | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/spec/functions/parseyaml_spec.rb b/spec/functions/parseyaml_spec.rb index 492a1c9..fa947ca 100755 --- a/spec/functions/parseyaml_spec.rb +++ b/spec/functions/parseyaml_spec.rb @@ -40,12 +40,21 @@ describe 'parseyaml' do end - context 'with incorrect YAML data' do - it 'should return "nil" if a default value should be returned but is not provided' do - is_expected.to run.with_params(''). - and_return(nil) + context 'on a modern ruby', :unless => RUBY_VERSION == '1.8.7' do + it 'should raise an error with invalid YAML and no default' do + is_expected.to run.with_params('["one"'). + and_raise_error(Psych::SyntaxError) + end + end + + context 'when running on ruby 1.8.7, which does not have Psych', :if => RUBY_VERSION == '1.8.7' do + it 'should raise an error with invalid YAML and no default' do + is_expected.to run.with_params('["one"'). + and_raise_error(ArgumentError) + end end + context 'with incorrect YAML data' do it 'should support a structure for a default value' do is_expected.to run.with_params('', {'a' => '1'}). and_return({'a' => '1'}) |