diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2016-03-04 17:31:11 -0800 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2016-03-04 17:31:11 -0800 |
commit | e70f9256af79af6092eae4ce22a61b1b6651f37d (patch) | |
tree | 5d9bdbb84c876d6e6d34fef8348ad4ed282e0336 /ruby/tests | |
parent | 37663e861b3fe0288d10e67d387fdcf0e43a6d72 (diff) | |
parent | f654d49dd61c096c247b87186e59b611490e66e4 (diff) | |
download | protobuf-e70f9256af79af6092eae4ce22a61b1b6651f37d.tar.gz protobuf-e70f9256af79af6092eae4ce22a61b1b6651f37d.tar.bz2 protobuf-e70f9256af79af6092eae4ce22a61b1b6651f37d.zip |
Merge pull request #1139 from haberman/rubyjsoncamel
Changed Ruby to properly camelCase its JSON by default.
Diffstat (limited to 'ruby/tests')
-rw-r--r-- | ruby/tests/basic.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ruby/tests/basic.rb b/ruby/tests/basic.rb index da85520f..86c74c2a 100644 --- a/ruby/tests/basic.rb +++ b/ruby/tests/basic.rb @@ -1160,7 +1160,7 @@ module BasicTest # TODO: Fix JSON in JRuby version. return if RUBY_PLATFORM == "java" m = MapMessage.new(:map_string_int32 => {"a" => 1}) - expected = '{"map_string_int32":{"a":1},"map_string_msg":{}}' + expected = '{"mapStringInt32":{"a":1},"mapStringMsg":{}}' assert MapMessage.encode_json(m) == expected m2 = MapMessage.decode_json(MapMessage.encode_json(m)) assert m == m2 |