diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-07 21:31:43 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-07 21:31:43 +0000 |
| commit | a9649469b5de1ae185bde4c5dbece6f16e89c85d (patch) | |
| tree | fb5b830b4f66880b610fd0bcf547f49df4cc5b9b /test | |
| parent | 79086bb454f604cc993f57b270333d409eb8d900 (diff) | |
merge revision(s) 35245,35248:
* ext/psych/lib/psych.rb: bumping up psych version to match release.
* ext/psych/psych.gemspec: ditto
* ext/psych/parser.c: fall back to any encoding if the external
encoding is wrong. [ruby-core:44163]
* test/psych/test_encoding.rb: fix test
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35251 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/psych/test_encoding.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/psych/test_encoding.rb b/test/psych/test_encoding.rb index 8efb676d9a..1abee0df16 100644 --- a/test/psych/test_encoding.rb +++ b/test/psych/test_encoding.rb @@ -57,7 +57,7 @@ module Psych # If the external encoding isn't utf8, utf16le, or utf16be, we cannot # process the file. File.open(t.path, 'r', :encoding => 'SHIFT_JIS') do |f| - assert_raises ArgumentError do + assert_raises Psych::SyntaxError do Psych.load(f) end end |