delta/ruby.git/test/json, branch ruby_2_2

merge revision(s) 50339,50340,50342,50343: [Backport #10705]

2015-08-14T06:20:41+00:00

	parser.rl: use StringValue

	* ext/json/parser/parser.rl (cParser_initialize): use StringValue
  instead of direct rb_convert_type and remove duplicate
  conversion.
	* ext/json/parser/parser.rl: raise with messages in UTF-8
	  encoding.  [ruby-core:67386] [Bug #10705]


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

* test/lib/envutil.rb: Moved from test/ruby/.

2014-11-13T16:05:37+00:00

* test/lib/find_executable.rb: Ditto.

* test/lib/memory_status.rb: Ditto.

* test/lib/test/unit.rb: require envutil.

* test/: Don't require envutil in test files.



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

Remove tempfiles.

2014-05-25T14:32:03+00:00

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

* ext/json: merge JSON 1.8.1.

2013-11-20T02:55:08+00:00

  https://github.com/nurse/json/compare/002ac2771ce32776b32ccd2d06e5604de6c36dcd...e09ffc0d7da25d0393873936c118c188c78dbac3
* Remove Rubinius exception since transcoding should be working now.
* Fix https://github.com/flori/json/issues/162 reported by Marc-Andre
  Lafortune . Thanks!
* Applied patches by Yui NARUSE  to suppress
  warning with -Wchar-subscripts and better validate UTF-8 strings.
* Applied patch by ginriki@github to remove unnecessary if.
* Add load/dump interface to JSON::GenericObject to make
  serialize :some_attribute, JSON::GenericObject
  work in Rails active models for convenient
  SomeModel#some_attribute.foo.bar access to serialised JSON data.

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

Use assert_separately to inspect test failure of TestJSONGenerate#test_broken_bignum

2013-06-17T07:08:00+00:00

http://fbsd.rubyci.org/~chkbuild/ruby-trunk/log/20130617T010202Z.log.html.gz#test%2F-ext-

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

* ext/json: merge JSON 1.7.7.

2013-02-12T03:05:45+00:00

  This includes security fix. [CVE-2013-0269]
  https://github.com/flori/json/commit/d0a62f3ced7560daba2ad546d83f0479a5ae2cf2
  https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion

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

* ext/json: merge JSON 1.7.5.

2012-12-12T10:51:49+00:00

  fix tests and other fixes.

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

revert r37326 "remove string literal concatenation"

2012-10-25T14:06:31+00:00

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

remove string literal concatenation

2012-10-25T10:07:22+00:00

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

* ext/json: Merge JSON 1.7.1.

2012-05-07T16:00:49+00:00

  https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac

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