summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-19 09:44:33 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-19 09:44:33 +0000
commitdef7fab8713a61cb1df92249e59439d79ee63e0a (patch)
treef74c2af9506980c8de33e81084edf9ff26f798b7 /test
parent373babeaac8c3e663e1ded74a9f06ac94a671ed9 (diff)
Merge psych-3.0.2 from ruby/psych.
It version changed fallback option to keywoad argument on `Yaml.load` method. It break backword compatiblity. see detailed discuttion: https://github.com/ruby/psych/issues/340 From: SHIBATA Hiroshi <hsbt@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/psych/test_psych.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/psych/test_psych.rb b/test/psych/test_psych.rb
index 82906f0af6..2812fd1bd8 100644
--- a/test/psych/test_psych.rb
+++ b/test/psych/test_psych.rb
@@ -146,7 +146,7 @@ class TestPsych < Psych::TestCase
def test_load_file_with_fallback
Tempfile.create(['empty', 'yml']) {|t|
- assert_equal Hash.new, Psych.load_file(t.path, Hash.new)
+ assert_equal Hash.new, Psych.load_file(t.path, fallback: Hash.new)
}
end