summaryrefslogtreecommitdiff
path: root/test/psych
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-18 04:38:37 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-18 04:38:37 +0000
commitdc22968239d57dddbfb5ef33ff07d013e7518611 (patch)
tree2da9454b6890037a3ca05abbb7e297a12417d05d /test/psych
parentd95cb162340c4b769397569b1e0760d226c054f6 (diff)
* ext/psych/lib/psych.rb: define a new BadAlias error class.
* ext/psych/lib/psych/visitors/to_ruby.rb: raise an exception when deserializing an alias that does not exist. * test/psych/test_merge_keys.rb: corresponding test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/psych')
-rw-r--r--test/psych/test_merge_keys.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/test/psych/test_merge_keys.rb b/test/psych/test_merge_keys.rb
index b3ebe9b463..bf5968ff86 100644
--- a/test/psych/test_merge_keys.rb
+++ b/test/psych/test_merge_keys.rb
@@ -2,6 +2,15 @@ require 'psych/helper'
module Psych
class TestMergeKeys < TestCase
+ def test_missing_merge_key
+ yaml = <<-eoyml
+bar:
+ << : *foo
+ eoyml
+ exp = assert_raises(Psych::BadAlias) { Psych.load yaml }
+ assert_match 'foo', exp.message
+ end
+
# [ruby-core:34679]
def test_merge_key
yaml = <<-eoyml