From 922989fa0f1bf1e13b2c9bf1c8d6ad9459c798f6 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 20 Jan 2021 20:45:55 -0800 Subject: [ruby/erb] Warn safe_level and later args even without -w because, when Ruby 3.1 is released, Ruby 2.5, the last version with the old method signature, will have been EOL. Therefore we can safely warn the old interface from Ruby 3.1. https://github.com/ruby/erb/commit/c3a753f49f --- test/erb/test_erb.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'test/erb') diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb index d3e9b6c944..fb5e9b611e 100644 --- a/test/erb/test_erb.rb +++ b/test/erb/test_erb.rb @@ -663,26 +663,20 @@ EOS # [deprecated] These interfaces will be removed later def test_deprecated_interface_warnings - [nil, 0].each do |safe| - assert_warning(/2nd argument of ERB.new is deprecated/) do - ERB.new('', safe) - end - end - - [1, 2].each do |safe| + [nil, 0, 1, 2].each do |safe| assert_warn(/2nd argument of ERB.new is deprecated/) do ERB.new('', safe) end end [nil, '', '%', '%<>'].each do |trim| - assert_warning(/3rd argument of ERB.new is deprecated/) do + assert_warn(/3rd argument of ERB.new is deprecated/) do ERB.new('', nil, trim) end end [nil, '_erbout', '_hamlout'].each do |eoutvar| - assert_warning(/4th argument of ERB.new is deprecated/) do + assert_warn(/4th argument of ERB.new is deprecated/) do ERB.new('', nil, nil, eoutvar) end end -- cgit v1.2.3