diff options
author | Alexander Momchilov <alexander.momchilov@shopify.com> | 2022-07-21 15:07:39 -0400 |
---|---|---|
committer | Alexander Momchilov <alexander.momchilov@shopify.com> | 2022-07-27 15:24:24 -0400 |
commit | 0c11ddcf4636cfa415a2d4ff5a5222830605b086 (patch) | |
tree | 72d21f3d0e2755d4a0601fd5f9d69cfb6b2a672c /test | |
parent | b9ab19094f1534c38b724a2ef76c30eb9cf5262f (diff) | |
download | psych-0c11ddcf4636cfa415a2d4ff5a5222830605b086.tar.gz |
Raise specific error when aliases are not enabled
Diffstat (limited to 'test')
-rw-r--r-- | test/psych/helper.rb | 6 | ||||
-rw-r--r-- | test/psych/test_array.rb | 2 | ||||
-rw-r--r-- | test/psych/test_hash.rb | 2 | ||||
-rw-r--r-- | test/psych/test_merge_keys.rb | 2 | ||||
-rw-r--r-- | test/psych/test_object.rb | 2 | ||||
-rw-r--r-- | test/psych/test_safe_load.rb | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/test/psych/helper.rb b/test/psych/helper.rb index 0643139..4e82887 100644 --- a/test/psych/helper.rb +++ b/test/psych/helper.rb @@ -51,7 +51,7 @@ module Psych :UseVersion => true, :UseHeader => true, :SortKeys => true ) )) - rescue Psych::DisallowedClass, Psych::BadAlias + rescue Psych::DisallowedClass, Psych::BadAlias, Psych::AliasesNotEnabled assert_to_yaml obj, yaml, :unsafe_load end @@ -61,7 +61,7 @@ module Psych def assert_parse_only( obj, yaml ) begin assert_equal obj, Psych::load( yaml ) - rescue Psych::DisallowedClass, Psych::BadAlias + rescue Psych::DisallowedClass, Psych::BadAlias, Psych::AliasesNotEnabled assert_equal obj, Psych::unsafe_load( yaml ) end assert_equal obj, Psych::parse( yaml ).transform @@ -79,7 +79,7 @@ module Psych assert_equal(obj, Psych.load(v.tree.yaml)) assert_equal(obj, Psych::load(Psych.dump(obj))) assert_equal(obj, Psych::load(obj.to_yaml)) - rescue Psych::DisallowedClass, Psych::BadAlias + rescue Psych::DisallowedClass, Psych::BadAlias, Psych::AliasesNotEnabled assert_equal(obj, Psych.unsafe_load(v.tree.yaml)) assert_equal(obj, Psych::unsafe_load(Psych.dump(obj))) assert_equal(obj, Psych::unsafe_load(obj.to_yaml)) diff --git a/test/psych/test_array.rb b/test/psych/test_array.rb index 6a9931a..0dc8243 100644 --- a/test/psych/test_array.rb +++ b/test/psych/test_array.rb @@ -68,7 +68,7 @@ module Psych def test_recursive_array_uses_alias @list << @list - assert_raise(BadAlias) do + assert_raise(AliasesNotEnabled) do Psych.load(Psych.dump(@list), aliases: false) end end diff --git a/test/psych/test_hash.rb b/test/psych/test_hash.rb index 0555f6e..0efa211 100644 --- a/test/psych/test_hash.rb +++ b/test/psych/test_hash.rb @@ -125,7 +125,7 @@ eoyml h = { } h["recursive_reference"] = h - assert_raise(BadAlias) do + assert_raise(AliasesNotEnabled) do Psych.load(Psych.dump(h), aliases: false) end end diff --git a/test/psych/test_merge_keys.rb b/test/psych/test_merge_keys.rb index dcf4f1f..8d2fcea 100644 --- a/test/psych/test_merge_keys.rb +++ b/test/psych/test_merge_keys.rb @@ -117,7 +117,7 @@ development: bar: << : *foo eoyml - exp = assert_raise(Psych::BadAlias) { Psych.load yaml } + exp = assert_raise(Psych::BadAlias) { Psych.load(yaml, aliases: true) } assert_match 'foo', exp.message end diff --git a/test/psych/test_object.rb b/test/psych/test_object.rb index 227a1d1..21c2779 100644 --- a/test/psych/test_object.rb +++ b/test/psych/test_object.rb @@ -46,7 +46,7 @@ module Psych foo = Foo.new(nil) foo.parent = foo - assert_raise(BadAlias) do + assert_raise(AliasesNotEnabled) do Psych.load(Psych.dump(foo), permitted_classes: [Foo], aliases: false) end end diff --git a/test/psych/test_safe_load.rb b/test/psych/test_safe_load.rb index e57dbcb..a9ed737 100644 --- a/test/psych/test_safe_load.rb +++ b/test/psych/test_safe_load.rb @@ -28,7 +28,7 @@ module Psych b: *ABC YAML - assert_raise(Psych::BadAlias) do + assert_raise(Psych::AliasesNotEnabled) do Psych.safe_load(yaml_with_aliases) end end |