6 files changed, 32 insertions, 61 deletions
diff --git a/spec/ruby/library/csv/generate_spec.rb b/spec/ruby/library/csv/generate_spec.rb
index f583b5f536..b264decb0e 100644
--- a/spec/ruby/library/csv/generate_spec.rb
+++ b/spec/ruby/library/csv/generate_spec.rb
@@ -26,7 +26,7 @@ describe "CSV.generate" do
       csv.add_row [1, 2, 3]
       csv << [4, 5, 6]
     end
-    csv_str.object_id.should == str.object_id
+    csv_str.should equal str
     str.should == "1,2,3\n4,5,6\n"
   end
 end
diff --git a/spec/ruby/library/erb/defmethod/def_erb_method_spec.rb b/spec/ruby/library/erb/defmethod/def_erb_method_spec.rb
index 6c465936c1..574a2d7911 100644
--- a/spec/ruby/library/erb/defmethod/def_erb_method_spec.rb
+++ b/spec/ruby/library/erb/defmethod/def_erb_method_spec.rb
@@ -1,5 +1,6 @@
 require 'erb'
 require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "ERB::DefMethod.def_erb_method" do
 
@@ -50,11 +51,7 @@ END
     MY_INPUT4_FOR_ERB = input
     class MyClass4ForErb
       extend ERB::DefMethod
-      if RUBY_VERSION >= '2.6'
-        erb = ERB.new(MY_INPUT4_FOR_ERB, trim_mode: '<>')
-      else
-        erb = ERB.new(MY_INPUT4_FOR_ERB, nil, '<>')
-      end
+      erb = ERBSpecs.new_erb(MY_INPUT4_FOR_ERB, trim_mode: '<>')
       def_erb_method('render()', erb)
       def initialize(items)
         @items = items
diff --git a/spec/ruby/library/erb/fixtures/classes.rb b/spec/ruby/library/erb/fixtures/classes.rb
new file mode 100644
index 0000000000..03da889941
--- /dev/null
+++ b/spec/ruby/library/erb/fixtures/classes.rb
@@ -0,0 +1,9 @@
+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
+  end
+end
diff --git a/spec/ruby/library/erb/new_spec.rb b/spec/ruby/library/erb/new_spec.rb
index 156873a598..274c11d9b5 100644
--- a/spec/ruby/library/erb/new_spec.rb
+++ b/spec/ruby/library/erb/new_spec.rb
@@ -1,5 +1,6 @@
 require 'erb'
 require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "ERB.new" do
   before :all do
@@ -31,33 +32,21 @@ END
   it "compiles eRuby script into ruby code when trim mode is 0 or not specified" do
     expected = "<ul>\n\n\n\n<li>1</li>\n\n\n\n<li>2</li>\n\n\n\n<li>3</li>\n\n\n</ul>\n"
     [0, '', nil].each do |trim_mode|
-      if RUBY_VERSION >= '2.6'
-        ERB.new(@eruby_str, trim_mode: trim_mode).result.should == expected
-      else
-        ERB.new(@eruby_str, nil, trim_mode).result.should == expected
-      end
+      ERBSpecs.new_erb(@eruby_str, trim_mode: trim_mode).result.should == expected
     end
   end
 
   it "removes '\n' when trim_mode is 1 or '>'" do
     expected = "<ul>\n<li>1</li>\n<li>2</li>\n<li>3</li>\n</ul>\n"
     [1, '>'].each do |trim_mode|
-      if RUBY_VERSION >= '2.6'
-        ERB.new(@eruby_str, trim_mode: trim_mode).result.should == expected
-      else
-        ERB.new(@eruby_str, nil, trim_mode).result.should == expected
-      end
+      ERBSpecs.new_erb(@eruby_str, trim_mode: trim_mode).result.should == expected
     end
   end
 
   it "removes spaces at beginning of line and '\n' when trim_mode is 2 or '<>'" do
     expected = "<ul>\n<li>1</li>\n<li>2</li>\n<li>3</li>\n</ul>\n"
     [2, '<>'].each do |trim_mode|
-      if RUBY_VERSION >= '2.6'
-        ERB.new(@eruby_str, trim_mode: trim_mode).result.should == expected
-      else
-        ERB.new(@eruby_str, nil, trim_mode).result.should == expected
-      end
+      ERBSpecs.new_erb(@eruby_str, trim_mode: trim_mode).result.should == expected
     end
   end
 
@@ -73,11 +62,7 @@ END
 </ul>
 END
 
-    if RUBY_VERSION >= '2.6'
-      ERB.new(input, trim_mode: '-').result.should == expected
-    else
-      ERB.new(input, nil, '-').result.should == expected
-    end
+    ERBSpecs.new_erb(input, trim_mode: '-').result.should == expected
   end
 
 
@@ -91,39 +76,23 @@ END
 END
 
     lambda {
-      if RUBY_VERSION >= '2.6'
-        ERB.new(input, trim_mode: '-').result
-      else
-        ERB.new(input, nil, '-').result
-      end
+      ERBSpecs.new_erb(input, trim_mode: '-').result
     }.should raise_error(SyntaxError)
   end
 
   it "regards lines starting with '%' as '<% ... %>' when trim_mode is '%'" do
     expected = "<ul>\n  <li>1\n  \n  <li>2\n  \n  <li>3\n  \n\n</ul>\n%%\n"
-    if RUBY_VERSION >= '2.6'
-      ERB.new(@eruby_str2, trim_mode: "%").result.should == expected
-    else
-      ERB.new(@eruby_str2, nil, "%").result.should == expected
-    end
+    ERBSpecs.new_erb(@eruby_str2, trim_mode: "%").result.should == expected
   end
   it "regards lines starting with '%' as '<% ... %>' and remove \"\\n\" when trim_mode is '%>'" do
     expected = "<ul>\n  <li>1    <li>2    <li>3  </ul>\n%%\n"
-    if RUBY_VERSION >= '2.6'
-      ERB.new(@eruby_str2, trim_mode: '%>').result.should == expected
-    else
-      ERB.new(@eruby_str2, nil, '%>').result.should == expected
-    end
+    ERBSpecs.new_erb(@eruby_str2, trim_mode: '%>').result.should == expected
   end
 
 
   it "regard lines starting with '%' as '<% ... %>' and remove \"\\n\" when trim_mode is '%<>'" do
     expected = "<ul>\n  <li>1\n  \n  <li>2\n  \n  <li>3\n  \n</ul>\n%%\n"
-    if RUBY_VERSION >= '2.6'
-      ERB.new(@eruby_str2, trim_mode: '%<>').result.should == expected
-    else
-      ERB.new(@eruby_str2, nil, '%<>').result.should == expected
-    end
+    ERBSpecs.new_erb(@eruby_str2, trim_mode: '%<>').result.should == expected
   end
 
 
@@ -138,11 +107,7 @@ END
 %%%
 END
 
-    if RUBY_VERSION >= '2.6'
-      ERB.new(input, trim_mode: '%-').result.should == expected
-    else
-      ERB.new(input, nil, '%-').result.should == expected
-    end
+    ERBSpecs.new_erb(input, trim_mode: '%-').result.should == expected
   end
 
   it "changes '_erbout' variable name in the produced source" do
@@ -164,12 +129,8 @@ END
 <b><%#= item %></b>
 <%# end %>
 END
-    ERB.new(input).result.should == "\n<b></b>\n\n"
-    if RUBY_VERSION >= '2.6'
-      ERB.new(input, trim_mode: '<>').result.should == "<b></b>\n"
-    else
-      ERB.new(input, nil, '<>').result.should == "<b></b>\n"
-    end
+  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
diff --git a/spec/ruby/library/set/filter_spec.rb b/spec/ruby/library/set/filter_spec.rb
index 3ac0c660b2..ada261421a 100644
--- a/spec/ruby/library/set/filter_spec.rb
+++ b/spec/ruby/library/set/filter_spec.rb
@@ -1,6 +1,8 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require File.expand_path('../shared/select', __FILE__)
 
-describe "Set#filter!" do
-  it_behaves_like :set_select_bang, :filter!
+ruby_version_is "2.6" do
+  describe "Set#filter!" do
+    it_behaves_like :set_select_bang, :filter!
+  end
 end
diff --git a/spec/ruby/library/set/sortedset/filter_spec.rb b/spec/ruby/library/set/sortedset/filter_spec.rb
index 59e264ed84..16346a5b76 100644
--- a/spec/ruby/library/set/sortedset/filter_spec.rb
+++ b/spec/ruby/library/set/sortedset/filter_spec.rb
@@ -2,6 +2,8 @@ require File.expand_path('../../../../spec_helper', __FILE__)
 require File.expand_path('../shared/select', __FILE__)
 require 'set'
 
-describe "SortedSet#filter!" do
-  it_behaves_like :sorted_set_select_bang, :filter!
+ruby_version_is "2.6" do
+  describe "SortedSet#filter!" do
+    it_behaves_like :sorted_set_select_bang, :filter!
+  end
 end