summaryrefslogtreecommitdiff
path: root/test/json
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-31 06:56:16 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-31 06:56:16 +0000
commitc06658feba7ae82e175bac72f241029276e715a0 (patch)
tree1f3a28b4db912f15c3b1d5e54f10bec82ee6fe34 /test/json
parent64e0cae2741c501e8558966096b4b139d945ca82 (diff)
* ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/json')
-rwxr-xr-xtest/json/test_json_addition.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/json/test_json_addition.rb b/test/json/test_json_addition.rb
index f28f228c22..6297578f1f 100755
--- a/test/json/test_json_addition.rb
+++ b/test/json/test_json_addition.rb
@@ -3,7 +3,7 @@
require 'test/unit'
require File.join(File.dirname(__FILE__), 'setup_variant')
-load 'json/add/core.rb'
+require 'json/add/core.rb'
require 'date'
class TC_JSONAddition < Test::Unit::TestCase