diff options
| author | Chris Fallin <cfallin@c1f.net> | 2015-05-13 15:39:45 -0700 |
|---|---|---|
| committer | Chris Fallin <cfallin@c1f.net> | 2015-05-13 15:39:45 -0700 |
| commit | 2fe0483848b3e7da36a6f29099c71553a4af3adc (patch) | |
| tree | 87a1d982445a86526e0a1903b156ddaaeeba790a /ruby/tests | |
| parent | 23bb79d4a32a77e8349d6c49052be1e56a8b8153 (diff) | |
| parent | eb37551ae4fbb491f7670bf4175cb43bbc649fe0 (diff) | |
| download | protobuf-2fe0483848b3e7da36a6f29099c71553a4af3adc.tar.gz protobuf-2fe0483848b3e7da36a6f29099c71553a4af3adc.tar.bz2 protobuf-2fe0483848b3e7da36a6f29099c71553a4af3adc.zip | |
Merge pull request #383 from cfallin/ruby-travis
Add Ruby to Travis testing
Diffstat (limited to 'ruby/tests')
| -rw-r--r-- | ruby/tests/basic.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ruby/tests/basic.rb b/ruby/tests/basic.rb index 1c2a03dc..a00f0b05 100644 --- a/ruby/tests/basic.rb +++ b/ruby/tests/basic.rb @@ -1035,7 +1035,8 @@ module BasicTest end def test_json - skip("Unimplemented") if RUBY_PLATFORM == "java" + # TODO: Fix JSON in JRuby version. + return if RUBY_PLATFORM == "java" m = TestMessage.new(:optional_int32 => 1234, :optional_int64 => -0x1_0000_0000, :optional_uint32 => 0x8000_0000, @@ -1066,7 +1067,8 @@ module BasicTest end def test_json_maps - skip("Unimplemented") if RUBY_PLATFORM == "java" + # 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":{}}' assert MapMessage.encode_json(m) == expected |