summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-04-06 10:09:47 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-04-06 10:09:47 -0700
commit62476ce4478c791da949917a580dae51dc600dd3 (patch)
tree143632a185dc74d1fe392f6011a3871fc13ac00b /test
parentf0040f683c2de6d2674ad573b7dbd0c22386bc7e (diff)
downloadpsych-62476ce4478c791da949917a580dae51dc600dd3.zip
* 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
Diffstat (limited to 'test')
-rw-r--r--test/psych/test_encoding.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/psych/test_encoding.rb b/test/psych/test_encoding.rb
index 8efb676..1abee0d 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