1 files changed, 26 insertions, 22 deletions
diff --git a/spec/ruby/library/erb/new_spec.rb b/spec/ruby/library/erb/new_spec.rb
index 3f6ae93f9f..35ac0dfdfe 100644
--- a/spec/ruby/library/erb/new_spec.rb
+++ b/spec/ruby/library/erb/new_spec.rb
@@ -36,17 +36,10 @@ END
     end
   end
 
-  ruby_version_is "2.6" do
-    it "warns invalid trim_mode" do
-      begin
-        $VERBOSE, verbose = false, $VERBOSE # Some other specs make $VERBOSE `nil`.
-        lambda do
-          ERBSpecs.new_erb(@eruby_str, trim_mode: '')
-        end.should output(nil, /Invalid ERB trim mode/)
-      ensure
-        $VERBOSE = verbose
-      end
-    end
+  it "warns invalid trim_mode" do
+    -> do
+      ERBSpecs.new_erb(@eruby_str, trim_mode: '')
+    end.should complain(/Invalid ERB trim mode/)
   end
 
   it "removes '\n' when trim_mode is 1 or '>'" do
@@ -88,9 +81,9 @@ END
 </p>
 END
 
-    lambda {
+    -> {
       ERBSpecs.new_erb(input, trim_mode: '-').result
-    }.should raise_error(SyntaxError)
+    }.should.raise(SyntaxError)
   end
 
   it "regards lines starting with '%' as '<% ... %>' when trim_mode is '%'" do
@@ -125,13 +118,8 @@ END
 
   it "changes '_erbout' variable name in the produced source" do
     input = @eruby_str
-    if RUBY_VERSION >= '2.6'
-      match_erbout = ERB.new(input, trim_mode: nil).src
-      match_buf = ERB.new(input, trim_mode: nil, eoutvar: 'buf').src
-    else
-      match_erbout = ERB.new(input, nil, nil).src
-      match_buf = ERB.new(input, nil, nil, 'buf').src
-    end
+    match_erbout = ERB.new(input, trim_mode: nil).src
+    match_buf = ERB.new(input, trim_mode: nil, eoutvar: 'buf').src
     match_erbout.gsub("_erbout", "buf").should == match_buf
   end
 
@@ -142,12 +130,28 @@ END
 <b><%#= item %></b>
 <%# end %>
 END
-  ERBSpecs.new_erb(input).result.should == "\n<b></b>\n\n"
+    ERBSpecs.new_erb(input).result.should == "\n<b></b>\n\n"
     ERBSpecs.new_erb(input, trim_mode: '<>').result.should == "<b></b>\n"
   end
 
   it "forget local variables defined previous one" do
     ERB.new(@eruby_str).result
-    lambda{ ERB.new("<%= list %>").result }.should raise_error(NameError)
+    ->{ ERB.new("<%= list %>").result }.should.raise(NameError)
+  end
+
+  version_is ERB.const_get(:VERSION, false), ""..."6.0.0" do
+    describe "warning about arguments" do
+      it "warns when passed safe_level and later arguments" do
+        -> {
+          ERB.new(@eruby_str, nil, '%')
+        }.should complain(/warning: Passing safe_level with the 2nd argument of ERB.new is deprecated. Do not use it, and specify other arguments as keyword arguments./)
+      end
+
+      it "does not warn when passed arguments as keyword argument" do
+        -> {
+          ERB.new(@eruby_str, trim_mode: '%')
+        }.should_not complain(/warning: Passing safe_level with the 2nd argument of ERB.new is deprecated. Do not use it, and specify other arguments as keyword arguments./)
+      end
+    end
   end
 end