diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-09 20:04:25 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-09 20:04:25 +0000 |
commit | 05215d0d80bc389a8efe8c9a6a7f0fa01671cda1 (patch) | |
tree | 744bec065367844b64f8883b57d1ce1f34792d11 /test | |
parent | f5b840074d56c45acb5ab4ab1d662501528490a9 (diff) |
merge revision(s) 58823: [Backport #11464]
erb.rb: Allow trimming carriage return
when trim_mode is "<>", for Windows environments.
[Bug #11464]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/erb/test_erb.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb index 6a07f9c5cb..70713e6384 100644 --- a/test/erb/test_erb.rb +++ b/test/erb/test_erb.rb @@ -197,6 +197,11 @@ EOS assert_equal(ans, erb.result) end + def test_trim_line2_with_carriage_return + erb = @erb.new("<% 3.times do %>\r\nline\r\n<% end %>\r\n", nil, '<>') + assert_equal("line\r\n" * 3, erb.result) + end + class Foo; end def test_def_class |