summaryrefslogtreecommitdiff
path: root/spec/acceptance/parsejson_spec.rb
diff options
context:
space:
mode:
authorDmitry Ilyin <dilyin@mirantis.com>2015-08-24 22:00:18 +0300
committerDmitry Ilyin <dilyin@mirantis.com>2015-08-25 21:41:03 +0300
commiteb948c4a0dc36790c5444fc236b0154c3d716c58 (patch)
tree02357ac0aaebe45825bf6fffeb8f0cf9e883cab4 /spec/acceptance/parsejson_spec.rb
parentf820bb156038f638d8e488286d0c2b92c5636925 (diff)
[MODULES-2462] Improve parseyaml function
* Add default value support Second argument will be returned if yaml cannot be parsed instead of false value * Update tests
Diffstat (limited to 'spec/acceptance/parsejson_spec.rb')
-rwxr-xr-xspec/acceptance/parsejson_spec.rb17
1 files changed, 13 insertions, 4 deletions
diff --git a/spec/acceptance/parsejson_spec.rb b/spec/acceptance/parsejson_spec.rb
index 5097810..d0feabd 100755
--- a/spec/acceptance/parsejson_spec.rb
+++ b/spec/acceptance/parsejson_spec.rb
@@ -16,19 +16,28 @@ describe 'parsejson function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('o
end
end
end
+
describe 'failure' do
it 'raises error on incorrect json' do
pp = <<-EOS
$a = '{"hunter": "washere", "tests": "passing",}'
- $ao = parsejson($a)
+ $ao = parsejson($a, {'tests' => 'using the default value'})
notice(inline_template('a is <%= @ao.inspect %>'))
EOS
- apply_manifest(pp, :expect_failures => true) do |r|
- expect(r.stderr).to match(/expected next name/)
+ apply_manifest(pp, :catch_failures => true) do |r|
+ expect(r.stdout).to match(/tests are "using the default value"/)
end
end
- it 'raises error on incorrect number of arguments'
+ it 'raises error on incorrect number of arguments' do
+ pp = <<-EOS
+ $o = parsejson()
+ EOS
+
+ apply_manifest(pp, :expect_failures => true) do |r|
+ expect(r.stderr).to match(/wrong number of arguments/i)
+ end
+ end
end
end