summaryrefslogtreecommitdiff
path: root/test/csv
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-26 02:58:15 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-26 02:58:15 +0000
commitae3022e434b125275d6be6a2b90c13e6f4c127d7 (patch)
tree45f0f67282d61f0be13fb647f1bfaac63b949ca5 /test/csv
parent1902f5fa2565d206ce17c4fc87f190dae20a36d0 (diff)
test_features.rb: fix up r46123
* test/csv/test_features.rb: no longer `nil` is valid data source for `CSV.new`. [GH-580] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/csv')
-rwxr-xr-xtest/csv/test_features.rb14
1 files changed, 8 insertions, 6 deletions
diff --git a/test/csv/test_features.rb b/test/csv/test_features.rb
index ad7e44d..e9700c4 100755
--- a/test/csv/test_features.rb
+++ b/test/csv/test_features.rb
@@ -123,7 +123,9 @@ class TestCSV::Features < TestCSV
end
def test_unknown_options
- assert_raise(ArgumentError) { CSV.new(String.new, unknown: :error) }
+ assert_raise_with_message(ArgumentError, /unknown/) {
+ CSV.new(@sample_data, unknown: :error)
+ }
end
def test_skip_blanks
@@ -283,13 +285,13 @@ class TestCSV::Features < TestCSV
def test_accepts_comment_skip_lines_option
assert_nothing_raised(ArgumentError) do
- CSV.new nil, :skip_lines => /\A\s*#/
+ CSV.new(@sample_data, :skip_lines => /\A\s*#/)
end
end
def test_accepts_comment_defaults_to_nil
- c = CSV.new nil
- assert_equal c.skip_lines, nil
+ c = CSV.new(@sample_data)
+ assert_nil(c.skip_lines)
end
class RegexStub
@@ -297,8 +299,8 @@ class TestCSV::Features < TestCSV
def test_requires_skip_lines_to_call_match
regex_stub = RegexStub.new
- assert_raise(ArgumentError) do
- CSV.new nil, :skip_lines => regex_stub
+ assert_raise_with_message(ArgumentError, /skip_lines/) do
+ CSV.new(@sample_data, :skip_lines => regex_stub)
end
end