Update to ruby/spec@a6b8805

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

3 files changed, 49 insertions, 0 deletions

diff --git a/spec/ruby/library/csv/liberal_parsing_spec.rb b/spec/ruby/library/csv/liberal_parsing_spec.rb
new file mode 100644
index 0000000000..99cedbcd22
--- /dev/null
+++ b/spec/ruby/library/csv/liberal_parsing_spec.rb
@@ -0,0 +1,21 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+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
+
+    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 by default" do
+      csv = CSV.new("")
+      csv.liberal_parsing?.should == false
+    end
+  end
+end
diff --git a/spec/ruby/library/csv/parse_spec.rb b/spec/ruby/library/csv/parse_spec.rb
index 41d37ca9a4..47d7ebbde1 100644
--- a/spec/ruby/library/csv/parse_spec.rb
+++ b/spec/ruby/library/csv/parse_spec.rb
@@ -78,4 +78,18 @@ describe "CSV.parse" do
     result = CSV.parse "foo;bar\nbaz;quz", col_sep: ?;
     result.should == [['foo','bar'],['baz','quz']]
   end
+
+  it "raises CSV::MalformedCSVError exception if input is illegal" do
+    -> {
+      CSV.parse('"quoted" field')
+    }.should raise_error(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
+  end
 end
diff --git a/spec/ruby/library/csv/readlines_spec.rb b/spec/ruby/library/csv/readlines_spec.rb
index 387730db16..452effd343 100644
--- a/spec/ruby/library/csv/readlines_spec.rb
+++ b/spec/ruby/library/csv/readlines_spec.rb
@@ -20,4 +20,18 @@ describe "CSV#readlines" do
     file = CSV.new "a,, b, c"
     file.readlines.should == [["a", nil, " b", " c"]]
   end
+
+  it "raises CSV::MalformedCSVError exception if input is illegal" do
+    csv = CSV.new('"quoted" field')
+    -> { csv.readlines }.should raise_error(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
+  end
 end