4 files changed, 26 insertions, 32 deletions
diff --git a/spec/ruby/library/csv/generate_spec.rb b/spec/ruby/library/csv/generate_spec.rb
index 0a1e3d9604..62e19aa6e4 100644
--- a/spec/ruby/library/csv/generate_spec.rb
+++ b/spec/ruby/library/csv/generate_spec.rb
@@ -21,12 +21,12 @@ describe "CSV.generate" do
   end
 
   it "appends and returns the argument itself" do
-    str = ""
+    str = +""
     csv_str = CSV.generate(str) do |csv|
       csv.add_row [1, 2, 3]
       csv << [4, 5, 6]
     end
-    csv_str.should equal str
+    csv_str.should.equal? str
     str.should == "1,2,3\n4,5,6\n"
   end
 end
diff --git a/spec/ruby/library/csv/liberal_parsing_spec.rb b/spec/ruby/library/csv/liberal_parsing_spec.rb
index a2dda36c99..9878658027 100644
--- a/spec/ruby/library/csv/liberal_parsing_spec.rb
+++ b/spec/ruby/library/csv/liberal_parsing_spec.rb
@@ -1,21 +1,19 @@
 require_relative '../../spec_helper'
 require 'csv'
 
-ruby_version_is '2.4' do
-  describe "CSV#liberal_parsing?" do
-    it "returns true if illegal input is handled" do
-      csv = CSV.new("", liberal_parsing: true)
-      csv.liberal_parsing?.should == true
-    end
+describe "CSV#liberal_parsing?" do
+  it "returns true if illegal input is handled" do
+    csv = CSV.new("", liberal_parsing: true)
+    csv.should.liberal_parsing?
+  end
 
-    it "returns false if illegal input is not handled" do
-      csv = CSV.new("", liberal_parsing: false)
-      csv.liberal_parsing?.should == false
-    end
+  it "returns false if illegal input is not handled" do
+    csv = CSV.new("", liberal_parsing: false)
+    csv.should_not.liberal_parsing?
+  end
 
-    it "returns false by default" do
-      csv = CSV.new("")
-      csv.liberal_parsing?.should == false
-    end
+  it "returns false by default" do
+    csv = CSV.new("")
+    csv.should_not.liberal_parsing?
   end
 end
diff --git a/spec/ruby/library/csv/parse_spec.rb b/spec/ruby/library/csv/parse_spec.rb
index fc3f04378b..7000f03cda 100644
--- a/spec/ruby/library/csv/parse_spec.rb
+++ b/spec/ruby/library/csv/parse_spec.rb
@@ -5,7 +5,7 @@ describe "CSV.parse" do
 
   it "parses '' into []" do
     result = CSV.parse ''
-    result.should be_kind_of(Array)
+    result.should.is_a?(Array)
     result.should == []
   end
 
@@ -82,14 +82,12 @@ describe "CSV.parse" do
   it "raises CSV::MalformedCSVError exception if input is illegal" do
     -> {
       CSV.parse('"quoted" field')
-    }.should raise_error(CSV::MalformedCSVError)
+    }.should.raise(CSV::MalformedCSVError)
   end
 
-  ruby_version_is '2.4' do
-    it "handles illegal input with the liberal_parsing option" do
-      illegal_input = '"Johnson, Dwayne",Dwayne "The Rock" Johnson'
-      result = CSV.parse(illegal_input, liberal_parsing: true)
-      result.should == [["Johnson, Dwayne", 'Dwayne "The Rock" Johnson']]
-    end
+  it "handles illegal input with the liberal_parsing option" do
+    illegal_input = '"Johnson, Dwayne",Dwayne "The Rock" Johnson'
+    result = CSV.parse(illegal_input, liberal_parsing: true)
+    result.should == [["Johnson, Dwayne", 'Dwayne "The Rock" Johnson']]
   end
 end
diff --git a/spec/ruby/library/csv/readlines_spec.rb b/spec/ruby/library/csv/readlines_spec.rb
index 882266657e..624f906489 100644
--- a/spec/ruby/library/csv/readlines_spec.rb
+++ b/spec/ruby/library/csv/readlines_spec.rb
@@ -23,15 +23,13 @@ describe "CSV#readlines" do
 
   it "raises CSV::MalformedCSVError exception if input is illegal" do
     csv = CSV.new('"quoted" field')
-    -> { csv.readlines }.should raise_error(CSV::MalformedCSVError)
+    -> { csv.readlines }.should.raise(CSV::MalformedCSVError)
   end
 
-  ruby_version_is '2.4' do
-    it "handles illegal input with the liberal_parsing option" do
-      illegal_input = '"Johnson, Dwayne",Dwayne "The Rock" Johnson'
-      csv = CSV.new(illegal_input, liberal_parsing: true)
-      result = csv.readlines
-      result.should == [["Johnson, Dwayne", 'Dwayne "The Rock" Johnson']]
-    end
+  it "handles illegal input with the liberal_parsing option" do
+    illegal_input = '"Johnson, Dwayne",Dwayne "The Rock" Johnson'
+    csv = CSV.new(illegal_input, liberal_parsing: true)
+    result = csv.readlines
+    result.should == [["Johnson, Dwayne", 'Dwayne "The Rock" Johnson']]
   end
 end