summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2016-07-26 12:13:02 +0200
committerFlorian Frank <flori@ping.de>2016-07-26 12:13:02 +0200
commit899f4969496ea74ef82121df6c8affdf163eb623 (patch)
treeb8ee7e0146943749b18a3ba088ffd05545523a91 /tests
parent047814c7a6916bde393e6080c98385c8170d3f98 (diff)
parent15e550ceafc3c7609bc47997a6f0013ec6959827 (diff)
downloadjson-899f4969496ea74ef82121df6c8affdf163eb623.tar.gz
Merge branch 'master' of github.com:flori/json
Diffstat (limited to 'tests')
-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