Update to ruby/spec@b65d01f

2 files changed, 7 insertions, 18 deletions

diff --git a/spec/ruby/library/erb/fixtures/classes.rb b/spec/ruby/library/erb/fixtures/classes.rb
index 03da889941..e07a6ed68d 100644
--- a/spec/ruby/library/erb/fixtures/classes.rb
+++ b/spec/ruby/library/erb/fixtures/classes.rb
@@ -1,9 +1,5 @@
 module ERBSpecs
   def self.new_erb(input, trim_mode: nil)
-    if ruby_version_is "2.6"
-      ERB.new(input, trim_mode: trim_mode)
-    else
-      ERB.new(input, nil, trim_mode)
-    end
+    ERB.new(input, trim_mode: trim_mode)
   end
 end
diff --git a/spec/ruby/library/erb/new_spec.rb b/spec/ruby/library/erb/new_spec.rb
index 3bb870dd3f..f18e25939e 100644
--- a/spec/ruby/library/erb/new_spec.rb
+++ b/spec/ruby/library/erb/new_spec.rb
@@ -36,12 +36,10 @@ END
     end
   end
 
-  ruby_version_is "2.6" do
-    it "warns invalid trim_mode" do
-      -> do
-        ERBSpecs.new_erb(@eruby_str, trim_mode: '')
-      end.should complain(/Invalid ERB trim mode/)
-    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
@@ -120,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