erb.rb: increase warn level only when non-zero safe_level

is given.

This is merging Eric's patch in [Bug #15479] to Ruby 2.6's behavior in r66631.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 1 deletions

diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb
index 5342df4ae8..9af7e11ef6 100644
--- a/test/erb/test_erb.rb
+++ b/test/erb/test_erb.rb
@@ -663,12 +663,18 @@ EOS
 
   # [deprecated] These interfaces will be removed later
   def test_deprecated_interface_warnings
-    [nil, 0, 1, 2].each do |safe|
+    [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|
+      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
         ERB.new('', nil, trim)