diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-01-08 14:21:34 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-01-08 14:21:34 -0800 |
| commit | e3b2c1c9f5c3a6144a4b02d46a3677df9826a1ab (patch) | |
| tree | 8976c31dc44648187f2bcceec3c69297df658d67 /test/psych/test_string.rb | |
| parent | 010d0c37bde30c5f347ebfd69087a487ff8b8bbb (diff) | |
| parent | af308f8307899cb9e1c0fffea4bce3110a1c3926 (diff) | |
| download | psych-e3b2c1c9f5c3a6144a4b02d46a3677df9826a1ab.zip | |
Merge branch 'master' into jirutka-patch-1
* master: (21 commits)
* ext/psych/lib/psych/visitors/to_ruby.rb: call `allocate` on hash subclasses. Fixes github.com/tenderlove/psych/issues/196
* ext/psych/lib/psych/visitors/to_ruby.rb: revive hashes with ivars
removed isolate task
removed isolate plugin
added minitest dependency into gemspec
added install task into travis
added ruby-head env
bumping version to 2.0.8
fixed build error caused by trunk changes
bumping version to 2.0.7
merging from ruby trunk
backport r48512 from ruby/ruby trunk.
Add changelog for 2a4d9568f7d5d19c00231cf48eb855cc45ec3394
backport r48214 from ruby/ruby trunk.
Allow dumping any BasicObject that defines #marshal_dump or #marshal_load
bumping version
* ext/psych/lib/psych/visitors/yaml_tree.rb: fix NameError dumping and loading. Fixes GH #85. Thanks @brentdax for the patch! * test/psych/test_exception.rb: test for fix
* ext/psych/lib/psych/scalar_scanner.rb: fix loading strings that look like integers but have a newline. Fixes GH #189 * test/psych/test_string.rb: test for fix
* ext/psych/lib/psych/visitors/to_ruby.rb: merge keys with a hash should merge the hash in to the parent. * test/psych/test_merge_keys.rb: test for change. Fixes GH #202
* ext/psych/lib/psych/visitors/to_ruby.rb: quoted "<<" strings should not be treated as merge keys. * ext/psych/lib/psych/visitors/yaml_tree.rb: hashes with keys containing "<<" should roundtrip. * test/psych/test_merge_keys.rb: test for change. Fixes GH #203
...
Conflicts:
lib/psych/visitors/yaml_tree.rb
Diffstat (limited to 'test/psych/test_string.rb')
| -rw-r--r-- | test/psych/test_string.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/psych/test_string.rb b/test/psych/test_string.rb index 68917c8..26a4e20 100644 --- a/test/psych/test_string.rb +++ b/test/psych/test_string.rb @@ -16,6 +16,10 @@ module Psych end end + def test_string_with_newline + assert_equal "1\n2", Psych.load("--- ! '1\n\n 2'\n") + end + def test_no_doublequotes_with_special_characters assert_equal 2, Psych.dump(%Q{<%= ENV["PATH"] %>}).count('"') end |