From 62476ce4478c791da949917a580dae51dc600dd3 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 6 Apr 2012 10:09:47 -0700 Subject: * 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 --- test/psych/test_encoding.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') 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 -- cgit v1.2.3