summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2016-07-14 16:42:52 +0200
committerGitHub <noreply@github.com>2016-07-14 16:42:52 +0200
commit15e550ceafc3c7609bc47997a6f0013ec6959827 (patch)
tree7de5928a01e50b380d2842347a310cfb54c1e273
parentb9b0f40a7d3d086e8a5707709f2e667711b46634 (diff)
parent17b28a2ffd65f428159d5479c804f48075c2dccf (diff)
downloadjson-15e550ceafc3c7609bc47997a6f0013ec6959827.tar.gz
Merge pull request #294 from hsbt/use-assert-raise
Fix inconsistency usage for assertion methods
-rw-r--r--tests/json_common_interface_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/json_common_interface_test.rb b/tests/json_common_interface_test.rb
index b2051d4..29b4a5b 100644
--- a/tests/json_common_interface_test.rb
+++ b/tests/json_common_interface_test.rb
@@ -47,7 +47,7 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
end
def test_deep_const_get
- assert_raises(ArgumentError) { JSON.deep_const_get('Nix::Da') }
+ assert_raise(ArgumentError) { JSON.deep_const_get('Nix::Da') }
assert_equal File::SEPARATOR, JSON.deep_const_get('File::SEPARATOR')
end
@@ -93,8 +93,8 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
def test_load_null
assert_equal nil, JSON.load(nil, nil, :allow_blank => true)
- assert_raises(TypeError) { JSON.load(nil, nil, :allow_blank => false) }
- assert_raises(JSON::ParserError) { JSON.load('', nil, :allow_blank => false) }
+ assert_raise(TypeError) { JSON.load(nil, nil, :allow_blank => false) }
+ assert_raise(JSON::ParserError) { JSON.load('', nil, :allow_blank => false) }
end
def test_dump